mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-19 02:11:33 +00:00
Code Issues Releases Wiki Activity

fixed problem with parsing optional string arguments

Browse source
This commit is contained in:
Marc Zinnschlag 2012-03-18 14:27:49 +01:00
parent 100c6a42a5
commit d9677cb33e
3 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/openmw/mwdialogue/dialoguemanager.cpp
View file

@ -650,7 +650,7 @@ namespace MWDialogue
locals = mEnvironment.mScriptManager->getLocals (actorScript); locals = mEnvironment.mScriptManager->getLocals (actorScript);
} }
Compiler::ScriptParser parser(mErrorHandler,mCompilerContext, locals); Compiler::ScriptParser parser(mErrorHandler,mCompilerContext, locals, false);
scanner.scan (parser); scanner.scan (parser);
if(mErrorHandler.isGood()) if(mErrorHandler.isGood())
@ -712,7 +712,7 @@ namespace MWDialogue
win->addText(it->response); win->addText(it->response);
executeScript(script); executeScript(script);
mLastTopic = keyword; mLastTopic = keyword;
mLastDialogue = dial; mLastDialogue = dial;
break; break;
@ -756,7 +756,7 @@ namespace MWDialogue
mLastDialogue = *it; mLastDialogue = *it;
break; break;
} }
} }
} }
} }

19
components/compiler/scriptparser.cpp
View file

@ -24,7 +24,7 @@ namespace Compiler
mLineParser.reset(); mLineParser.reset();
if (mLineParser.parseName (name, loc, scanner)) if (mLineParser.parseName (name, loc, scanner))
scanner.scan (mLineParser); scanner.scan (mLineParser);
return true; return true;
} }
@ -34,22 +34,22 @@ namespace Compiler
{ {
mControlParser.reset(); mControlParser.reset();
if (mControlParser.parseKeyword (keyword, loc, scanner)) if (mControlParser.parseKeyword (keyword, loc, scanner))
scanner.scan (mControlParser); scanner.scan (mControlParser);
mControlParser.appendCode (mOutput.getCode()); mControlParser.appendCode (mOutput.getCode());
return true; return true;
} }
if (keyword==Scanner::K_end && mEnd) if (keyword==Scanner::K_end && mEnd)
{ {
return false; return false;
} }
mLineParser.reset(); mLineParser.reset();
if (mLineParser.parseKeyword (keyword, loc, scanner)) if (mLineParser.parseKeyword (keyword, loc, scanner))
scanner.scan (mLineParser); scanner.scan (mLineParser);
return true; return true;
} }
@ -57,11 +57,11 @@ namespace Compiler
{ {
if (code==Scanner::S_newline) // empty line if (code==Scanner::S_newline) // empty line
return true; return true;
mLineParser.reset(); mLineParser.reset();
if (mLineParser.parseSpecial (code, loc, scanner)) if (mLineParser.parseSpecial (code, loc, scanner))
scanner.scan (mLineParser); scanner.scan (mLineParser);
return true; return true;
} }
@ -77,4 +77,3 @@ namespace Compiler
mOutput.clear(); mOutput.clear();
} }
} }

5
components/compiler/stringparser.cpp
View file

@ -39,6 +39,11 @@ namespace Compiler
mState = CommaState; mState = CommaState;
return true; return true;
} }
else if (code==Scanner::S_newline && mState==StartState)
{
scanner.putbackSpecial (code, loc);
return false;
}
return Parser::parseSpecial (code, loc, scanner); return Parser::parseSpecial (code, loc, scanner);
} }