mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-11-10 01:09:50 +00:00
Changed: Display line numbers instead of a pointer
This commit is contained in:
parent
05a91ecd97
commit
d58b347a99
5 changed files with 36 additions and 36 deletions
|
@ -188,8 +188,8 @@ void CForm::read (xmlNodePtr node, CFormLoader &loader, CFormDfn *dfn, const std
|
||||||
if ( ((const char*)node->name == NULL) || (strcmp ((const char*)node->name, "FORM") != 0) )
|
if ( ((const char*)node->name == NULL) || (strcmp ((const char*)node->name, "FORM") != 0) )
|
||||||
{
|
{
|
||||||
// Make an error message
|
// Make an error message
|
||||||
warning (true, "read", "XML Syntax error in block line %p, node (%s) should be FORM.",
|
warning (true, "read", "XML Syntax error in block line %d, node (%s) should be FORM.",
|
||||||
node->content, node->name);
|
(sint)node->line, node->name);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Get first struct node
|
// Get first struct node
|
||||||
|
@ -197,8 +197,8 @@ void CForm::read (xmlNodePtr node, CFormLoader &loader, CFormDfn *dfn, const std
|
||||||
if (child == NULL)
|
if (child == NULL)
|
||||||
{
|
{
|
||||||
// Throw exception
|
// Throw exception
|
||||||
warning (true, "read", "Syntax error in block line %p, node (%s) should have a STRUCT child node.",
|
warning (true, "read", "Syntax error in block line %d, node (%s) should have a STRUCT child node.",
|
||||||
node->content, node->name);
|
(sint)node->line, node->name);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Read the struct
|
// Read the struct
|
||||||
|
|
|
@ -130,7 +130,7 @@ void CFormDfn::read (xmlNodePtr root, CFormLoader &loader, bool forceLoad, const
|
||||||
if ( ((const char*)root->name == NULL) || (strcmp ((const char*)root->name, "DFN") != 0) )
|
if ( ((const char*)root->name == NULL) || (strcmp ((const char*)root->name, "DFN") != 0) )
|
||||||
{
|
{
|
||||||
// Throw exception
|
// Throw exception
|
||||||
warning (true, "read", "XML Syntax error in block line %p, node (%s) should be DFN.", root->content, root->name);
|
warning (true, "read", "XML Syntax error in block line %d, node (%s) should be DFN.", (sint)root->line, root->name);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Count the parent
|
// Count the parent
|
||||||
|
@ -162,8 +162,8 @@ void CFormDfn::read (xmlNodePtr root, CFormLoader &loader, bool forceLoad, const
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Throw exception
|
// Throw exception
|
||||||
warning (true, "read", "XML Syntax error in block (%s) line %p, aguments Name not found.",
|
warning (true, "read", "XML Syntax error in block (%s) line %d, aguments Name not found.",
|
||||||
parent->name, parent->content);
|
parent->name, (sint)parent->line);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Next parent
|
// Next parent
|
||||||
|
@ -245,8 +245,8 @@ void CFormDfn::read (xmlNodePtr root, CFormLoader &loader, bool forceLoad, const
|
||||||
if ((Entries[childNumber].Type == NULL) && !forceLoad)
|
if ((Entries[childNumber].Type == NULL) && !forceLoad)
|
||||||
{
|
{
|
||||||
// Throw exception
|
// Throw exception
|
||||||
warning (true, "read", "In XML block (%s) line %p, file not found %s.",
|
warning (true, "read", "In XML block (%s) line %d, file not found %s.",
|
||||||
child->name, child->content, Entries[childNumber].Filename.c_str ());
|
child->name, (sint)child->line, Entries[childNumber].Filename.c_str ());
|
||||||
}
|
}
|
||||||
|
|
||||||
// Read the default value
|
// Read the default value
|
||||||
|
@ -262,8 +262,8 @@ void CFormDfn::read (xmlNodePtr root, CFormLoader &loader, bool forceLoad, const
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Throw exception
|
// Throw exception
|
||||||
warning (true, "read", "XML In block (%s) line %p, no filename found for the .typ file.",
|
warning (true, "read", "XML In block (%s) line %d, no filename found for the .typ file.",
|
||||||
child->name, child->content);
|
child->name, (sint)child->line);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (stricmp (typeName, "Dfn") == 0)
|
else if (stricmp (typeName, "Dfn") == 0)
|
||||||
|
@ -279,15 +279,15 @@ void CFormDfn::read (xmlNodePtr root, CFormLoader &loader, bool forceLoad, const
|
||||||
if ((Entries[childNumber].Dfn == NULL) && !forceLoad)
|
if ((Entries[childNumber].Dfn == NULL) && !forceLoad)
|
||||||
{
|
{
|
||||||
// Throw exception
|
// Throw exception
|
||||||
warning (true, "read", "XML In block (%s) line %p, file not found %s.",
|
warning (true, "read", "XML In block (%s) line %d, file not found %s.",
|
||||||
child->name, child->content, Entries[childNumber].Filename.c_str ());
|
child->name, (sint)child->line, Entries[childNumber].Filename.c_str ());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Throw exception
|
// Throw exception
|
||||||
warning (true, "read", "XML In block (%s) line %p, no filename found for the .typ file.",
|
warning (true, "read", "XML In block (%s) line %d, no filename found for the .typ file.",
|
||||||
child->name, child->content);
|
child->name, (sint)child->line);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (stricmp (typeName, "DfnPointer") == 0)
|
else if (stricmp (typeName, "DfnPointer") == 0)
|
||||||
|
@ -297,8 +297,8 @@ void CFormDfn::read (xmlNodePtr root, CFormLoader &loader, bool forceLoad, const
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Throw exception
|
// Throw exception
|
||||||
warning (true, "read", "XML Syntax error in block (%s) line %p, element has not a valid type name attribut \"Type = %s\".",
|
warning (true, "read", "XML Syntax error in block (%s) line %d, element has not a valid type name attribut \"Type = %s\".",
|
||||||
child->name, child->content, typeName);
|
child->name, (sint)child->line, typeName);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Delete the value
|
// Delete the value
|
||||||
|
@ -307,8 +307,8 @@ void CFormDfn::read (xmlNodePtr root, CFormLoader &loader, bool forceLoad, const
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Throw exception
|
// Throw exception
|
||||||
warning (true, "read", "XML Syntax error in block (%s) line %p, element has no type name attribut \"Type = [Type][Dfn][DfnPointer]\".",
|
warning (true, "read", "XML Syntax error in block (%s) line %d, element has no type name attribut \"Type = [Type][Dfn][DfnPointer]\".",
|
||||||
child->name, child->content);
|
child->name, (sint)child->line);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Get the array attrib
|
// Get the array attrib
|
||||||
|
@ -325,8 +325,8 @@ void CFormDfn::read (xmlNodePtr root, CFormLoader &loader, bool forceLoad, const
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Throw exception
|
// Throw exception
|
||||||
warning (true, "read", "XML Syntax error in block (%s) line %p, aguments Name not found.",
|
warning (true, "read", "XML Syntax error in block (%s) line %d, aguments Name not found.",
|
||||||
root->name, root->content);
|
root->name, (sint)root->line);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Next child
|
// Next child
|
||||||
|
|
|
@ -112,8 +112,8 @@ void CFileHeader::read (xmlNodePtr root)
|
||||||
xmlFree ((void*)value);
|
xmlFree ((void*)value);
|
||||||
|
|
||||||
// Throw exception
|
// Throw exception
|
||||||
warning (true, "read", "XML Syntax error in TYPE block line %p, the Version argument is invalid.",
|
warning (true, "read", "XML Syntax error in TYPE block line %d, the Version argument is invalid.",
|
||||||
root->content);
|
(sint)root->line);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Delete the value
|
// Delete the value
|
||||||
|
@ -145,8 +145,8 @@ void CFileHeader::read (xmlNodePtr root)
|
||||||
xmlFree ((void*)value);
|
xmlFree ((void*)value);
|
||||||
|
|
||||||
// Throw exception
|
// Throw exception
|
||||||
warning (true, "read", "XML Syntax error in TYPE block line %p, the State argument is invalid.",
|
warning (true, "read", "XML Syntax error in TYPE block line %d, the State argument is invalid.",
|
||||||
root->content);
|
(sint)root->line);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Delete the value
|
// Delete the value
|
||||||
|
|
|
@ -109,8 +109,8 @@ void CType::read (xmlNodePtr root)
|
||||||
if ( ((const char*)root->name == NULL) || (strcmp ((const char*)root->name, "TYPE") != 0) )
|
if ( ((const char*)root->name == NULL) || (strcmp ((const char*)root->name, "TYPE") != 0) )
|
||||||
{
|
{
|
||||||
// Throw exception
|
// Throw exception
|
||||||
warning2 (true, "read", "XML Syntax error in block line %p, node (%s) should be TYPE.",
|
warning2 (true, "read", "XML Syntax error in block line %d, node (%s) should be TYPE.",
|
||||||
root->content, root->name);
|
(sint)root->line, root->name);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Read the type
|
// Read the type
|
||||||
|
@ -137,8 +137,8 @@ void CType::read (xmlNodePtr root)
|
||||||
xmlFree ((void*)value);
|
xmlFree ((void*)value);
|
||||||
|
|
||||||
// Throw exception
|
// Throw exception
|
||||||
warning2 (true, "read", "XML Syntax error in TYPE block line %p, the Type value is unknown (%s).",
|
warning2 (true, "read", "XML Syntax error in TYPE block line %d, the Type value is unknown (%s).",
|
||||||
root->content, valueStr.c_str ());
|
(sint)root->line, valueStr.c_str ());
|
||||||
}
|
}
|
||||||
|
|
||||||
// Delete the value
|
// Delete the value
|
||||||
|
@ -147,8 +147,8 @@ void CType::read (xmlNodePtr root)
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Throw exception
|
// Throw exception
|
||||||
warning2 (true, "read", "XML Syntax error in TYPE block line %p, the Type argument was not found.",
|
warning2 (true, "read", "XML Syntax error in TYPE block line %d, the Type argument was not found.",
|
||||||
root->content);
|
(sint)root->line);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Read the UI
|
// Read the UI
|
||||||
|
@ -255,8 +255,8 @@ void CType::read (xmlNodePtr root)
|
||||||
xmlFree ((void*)label);
|
xmlFree ((void*)label);
|
||||||
|
|
||||||
// Throw exception
|
// Throw exception
|
||||||
warning2 (true, "read", "XML Syntax error in DEFINITION block line %p, the Value argument was not found.",
|
warning2 (true, "read", "XML Syntax error in DEFINITION block line %d, the Value argument was not found.",
|
||||||
childPtr->content);
|
(sint)childPtr->line);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Delete the value
|
// Delete the value
|
||||||
|
@ -265,8 +265,8 @@ void CType::read (xmlNodePtr root)
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Throw exception
|
// Throw exception
|
||||||
warning2 (true, "read", "XML Syntax error in DEFINITION block line %p, the Label argument was not found.",
|
warning2 (true, "read", "XML Syntax error in DEFINITION block line %d, the Label argument was not found.",
|
||||||
childPtr->content);
|
(sint)childPtr->line);
|
||||||
}
|
}
|
||||||
|
|
||||||
// One more
|
// One more
|
||||||
|
|
|
@ -530,7 +530,7 @@ void CLigoConfig::syntaxError (const std::string &filename, xmlNodePtr xmlNode,
|
||||||
vsnprintf( buffer, 1024, format, args );
|
vsnprintf( buffer, 1024, format, args );
|
||||||
va_end( args );
|
va_end( args );
|
||||||
|
|
||||||
errorMessage ("(%s), node (%s), line (%p) :\n%s", filename.c_str(), xmlNode->name, xmlNode->content, buffer);
|
errorMessage ("(%s), node (%s), line (%d) :\n%s", filename.c_str(), xmlNode->name, (sint)xmlNode->line, buffer);
|
||||||
}
|
}
|
||||||
|
|
||||||
// ***************************************************************************
|
// ***************************************************************************
|
||||||
|
|
Loading…
Reference in a new issue