Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-29 05:17:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 48

modified comma handling to be morse consistent with original script language

Browse source
This commit is contained in:
Marc Zinnschlag 2010-06-30 11:03:08 +02:00
parent 5fb4abae4f
commit 8bb2a6039d
4 changed files with 50 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

28
components/compiler/exprparser.cpp
View file

@ -177,11 +177,13 @@ namespace Compiler
ExprParser::ExprParser (ErrorHandler& errorHandler, Context& context, Locals& locals,
Literals& literals)
: Parser (errorHandler, context), mLocals (locals), mLiterals (literals),
mNextOperand (true)
mNextOperand (true), mFirst (true)
{}
bool ExprParser::parseInt (int value, const TokenLoc& loc, Scanner& scanner)
{
mFirst = false;
if (mNextOperand)
{
pushIntegerLiteral (value);
@ -194,6 +196,8 @@ namespace Compiler
bool ExprParser::parseFloat (float value, const TokenLoc& loc, Scanner& scanner)
{
mFirst = false;
if (mNextOperand)
{
pushFloatLiteral (value);
@ -207,11 +211,15 @@ namespace Compiler
bool ExprParser::parseName (const std::string& name, const TokenLoc& loc,
Scanner& scanner)
{
mFirst = false;
return Parser::parseName (name, loc, scanner);
}
bool ExprParser::parseKeyword (int keyword, const TokenLoc& loc, Scanner& scanner)
{
mFirst = false;
if (keyword==Scanner::K_getsquareroot && mNextOperand)
{
mTokenLoc = loc;
@ -230,16 +238,27 @@ namespace Compiler
{
if (code==Scanner::S_comma)
{
// end marker
mTokenLoc = loc;
if (mFirst)
{
// leading comma
mFirst = false;
return true;
}
// end marker
scanner.putbackSpecial (code, loc);
return false;
}
mFirst = false;
if (code==Scanner::S_newline)
{
// end marker
mTokenLoc = loc;
scanner.putbackNewline (loc);
scanner.putbackSpecial (code, loc);
return false;
}
@ -286,6 +305,7 @@ namespace Compiler
mOperators.clear();
mNextOperand = true;
mCode.clear();
mFirst = true;
}
char ExprParser::append (std::vector<Interpreter::Type_Code>& code)