mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-20 07:53:51 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2178 from Capostrophic/declaration

Browse source 
Ignore extra text after a local variable declaration (bug #4867)
This commit is contained in:
Bret Curtis 2019-03-24 16:33:21 +01:00 committed by GitHub
commit 8f8bba66d9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -38,6 +38,7 @@
Bug #4828: Potion looping effects VFX are not shown for NPCs Bug #4828: Potion looping effects VFX are not shown for NPCs
Bug #4837: CTD when a mesh with NiLODNode root node with particles is loaded Bug #4837: CTD when a mesh with NiLODNode root node with particles is loaded
Bug #4860: Actors outside of processing range visible for one frame after spawning Bug #4860: Actors outside of processing range visible for one frame after spawning
Bug #4867: Arbitrary text after local variable declarations breaks script compilation
Bug #4876: AI ratings handling inconsistencies Bug #4876: AI ratings handling inconsistencies
Bug #4877: Startup script executes only on a new game start Bug #4877: Startup script executes only on a new game start
Bug #4888: Global variable stray explicit reference calls break script compilation Bug #4888: Global variable stray explicit reference calls break script compilation

36
components/compiler/declarationparser.cpp
View file

@ -22,20 +22,20 @@ bool Compiler::DeclarationParser::parseName (const std::string& name, const Toke
char type = mLocals.getType (name2); char type = mLocals.getType (name2);
if (type!=' ') if (type!=' ')
{ getErrorHandler().warning ("ignoring local variable re-declaration", loc);
/// \todo add option to make re-declared local variables an error else
getErrorHandler().warning ("ignoring local variable re-declaration",
loc);
mState = State_End;
return true;
}
mLocals.declare (mType, name2); mLocals.declare (mType, name2);
mState = State_End; mState = State_End;
return true; return true;
} }
else if (mState==State_End)
{
getErrorHandler().warning ("Ignoring extra text after local variable declaration", loc);
SkipParser skip (getErrorHandler(), getContext());
scanner.scan (skip);
return false;
}
return Parser::parseName (name, loc, scanner); return Parser::parseName (name, loc, scanner);
} }
@ -61,17 +61,31 @@ bool Compiler::DeclarationParser::parseKeyword (int keyword, const TokenLoc& loc
else if (mState==State_Name) else if (mState==State_Name)
{ {
// allow keywords to be used as local variable names. MW script compiler, you suck! // allow keywords to be used as local variable names. MW script compiler, you suck!
/// \todo option to disable this atrocity.
return parseName (loc.mLiteral, loc, scanner); return parseName (loc.mLiteral, loc, scanner);
} }
else if (mState==State_End)
{
getErrorHandler().warning ("Ignoring extra text after local variable declaration", loc);
SkipParser skip (getErrorHandler(), getContext());
scanner.scan (skip);
return false;
}
return Parser::parseKeyword (keyword, loc, scanner); return Parser::parseKeyword (keyword, loc, scanner);
} }
bool Compiler::DeclarationParser::parseSpecial (int code, const TokenLoc& loc, Scanner& scanner) bool Compiler::DeclarationParser::parseSpecial (int code, const TokenLoc& loc, Scanner& scanner)
{ {
if (code==Scanner::S_newline && mState==State_End) if (mState==State_End)
{
if (code!=Scanner::S_newline)
{
getErrorHandler().warning ("Ignoring extra text after local variable declaration", loc);
SkipParser skip (getErrorHandler(), getContext());
scanner.scan (skip);
}
return false; return false;
}
return Parser::parseSpecial (code, loc, scanner); return Parser::parseSpecial (code, loc, scanner);
} }