mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-04 02:41:19 +00:00
Code Issues Projects Releases Wiki Activity

improved the remaining handling of extra arguments

Browse Source
This commit is contained in:
Marc Zinnschlag 2016-01-07 16:07:49 +01:00
parent 46e32de350
commit ece40b1e96
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
components/compiler/exprparser.cpp
View File

@ -639,7 +639,8 @@ namespace Compiler
if (code==Scanner::S_newline)
{
// end marker
mTokenLoc = loc;
if (mTokenLoc.mLiteral.empty())
mTokenLoc = loc;
scanner.putbackSpecial (code, loc);
return false;
}
@ -820,7 +821,7 @@ namespace Compiler
if (parser.isEmpty())
break;
else
getErrorHandler().warning("Ignoring extra argument", mTokenLoc);
getErrorHandler().warning("Ignoring extra argument", parser.getTokenLoc());
}
else if (*iter=='z')
{
@ -878,4 +879,9 @@ namespace Compiler
return optionalCount;
}
const TokenLoc& ExprParser::getTokenLoc() const
{
return mTokenLoc;
}
}

2
components/compiler/exprparser.hpp
View File

@ -103,6 +103,8 @@ namespace Compiler
/// \param invert Store arguments in reverted order.
/// \param ignoreKeyword A keyword that is seen as junk
/// \return number of optional arguments
const TokenLoc& getTokenLoc() const;
};
}