mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-16 15:29:55 +00:00
Code Issues Releases Wiki Activity

some argument parsing cleanup

Browse source
This commit is contained in:
Marc Zinnschlag 2014-07-21 12:50:29 +02:00
parent a9f9dec923
commit 11a2c767cc
2 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
components/compiler/exprparser.cpp
View file

@ -777,11 +777,22 @@ namespace Compiler
++optionalCount;
}
}
else if (*iter=='X')
{
parser.reset();
parser.setOptional (true);
scanner.scan (parser);
if (optional && parser.isEmpty())
break;
}
else
{
parser.reset();
if (optional || *iter == 'X')
if (optional)
parser.setOptional (true);
scanner.scan (parser);
@ -789,20 +800,17 @@ namespace Compiler
if (optional && parser.isEmpty())
break;
if (*iter != 'X')
{
std::vector<Interpreter::Type_Code> tmp;
std::vector<Interpreter::Type_Code> tmp;
char type = parser.append (tmp);
char type = parser.append (tmp);
if (type!=*iter)
Generator::convert (tmp, type, *iter);
if (type!=*iter)
Generator::convert (tmp, type, *iter);
stack.push (tmp);
stack.push (tmp);
if (optional)
++optionalCount;
}
if (optional)
++optionalCount;
}
}

2
components/compiler/extensions.hpp
View file

@ -21,7 +21,7 @@ namespace Compiler
s - Short <BR>
S - String, case preserved <BR>
x - Optional, ignored string argument
X - Optional, ignored integer argument
X - Optional, ignored float argument
**/
typedef std::string ScriptArgs;