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

Merge pull request #2341 from Capostrophic/scripting

Browse source 
Allow using functions in non-conditional expressions (bug #3725)
This commit is contained in:
Bret Curtis 2019-04-24 12:05:07 +02:00 committed by GitHub
commit e0edecf1f2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -7,6 +7,7 @@
Bug #3109: SetPos/Position handles actors differently Bug #3109: SetPos/Position handles actors differently
Bug #3282: Unintended behaviour when assigning F3 and Windows keys Bug #3282: Unintended behaviour when assigning F3 and Windows keys
Bug #3623: Display scaling breaks mouse recognition Bug #3623: Display scaling breaks mouse recognition
Bug #3725: Using script function in a non-conditional expression breaks script compilation
Bug #3733: Normal maps are inverted on mirrored UVs Bug #3733: Normal maps are inverted on mirrored UVs
Bug #3765: DisableTeleporting makes Mark/Recall/Intervention effects undetectable Bug #3765: DisableTeleporting makes Mark/Recall/Intervention effects undetectable
Bug #3778: [Mod] Improved Thrown Weapon Projectiles - weapons have wrong transformation during throw animation Bug #3778: [Mod] Improved Thrown Weapon Projectiles - weapons have wrong transformation during throw animation

48
components/compiler/lineparser.cpp
View file

@ -323,36 +323,50 @@ namespace Compiler
} }
} }
if (mAllowExpression) if (keyword==Scanner::K_getdisabled || keyword==Scanner::K_getdistance)
{ {
if (keyword==Scanner::K_getdisabled || keyword==Scanner::K_getdistance) if (mAllowExpression)
{ {
scanner.putbackKeyword (keyword, loc); scanner.putbackKeyword (keyword, loc);
parseExpression (scanner, loc); parseExpression (scanner, loc);
mState = EndState;
return true;
} }
else
if (const Extensions *extensions = getContext().getExtensions())
{ {
char returnType; getErrorHandler().warning ("Unexpected naked expression", loc);
std::string argumentType; }
mState = EndState;
return true;
}
bool hasExplicit = !mExplicit.empty(); if (const Extensions *extensions = getContext().getExtensions())
{
char returnType;
std::string argumentType;
if (extensions->isFunction (keyword, returnType, argumentType, hasExplicit)) bool hasExplicit = mState==ExplicitState;
if (extensions->isFunction (keyword, returnType, argumentType, hasExplicit))
{
if (!hasExplicit && mState==ExplicitState)
{ {
if (!hasExplicit && !mExplicit.empty()) getErrorHandler().warning ("Stray explicit reference", loc);
{ mExplicit.clear();
getErrorHandler().warning ("Stray explicit reference", loc); }
mExplicit.clear();
}
if (mAllowExpression)
{
scanner.putbackKeyword (keyword, loc); scanner.putbackKeyword (keyword, loc);
parseExpression (scanner, loc); parseExpression (scanner, loc);
mState = EndState;
return true;
} }
else
{
std::vector<Interpreter::Type_Code> code;
int optionals = mExprParser.parseArguments (argumentType, scanner, code, keyword);
mCode.insert(mCode.end(), code.begin(), code.end());
extensions->generateFunctionCode (keyword, mCode, mLiterals, mExplicit, optionals);
}
mState = EndState;
return true;
} }
} }
} }