sms/ssc
1
0
Fork 0
Code Issues Pull requests Releases 2 Activity

Made ResolveVariableOrConstant less hacky.

Browse source
This commit is contained in:
arookas 2015-12-23 20:28:03 -05:00
parent c4532d85e7
commit 102f623cd1
1 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
ssc/context.cs
View file

@ -212,23 +212,24 @@ namespace arookas
} }
public void ResolveVariableOrConstant(sunIdentifier node, out sunVariableSymbol variableInfo, out sunConstInfo constInfo) public void ResolveVariableOrConstant(sunIdentifier node, out sunVariableSymbol variableInfo, out sunConstInfo constInfo)
{
try
{
variableInfo = ResolveVariable(node);
}
catch
{ {
variableInfo = null; variableInfo = null;
}
try
{
constInfo = ResolveConstant(node);
}
catch
{
constInfo = null; constInfo = null;
// walk the stack backwards to resolve to the latest declaration
for (int i = Scopes.Count - 1; i >= 0; --i)
{
var variable = Scopes[i].ResolveVariable(node.Value);
if (variable != null)
{
variableInfo = variable;
} }
var constant = Scopes[i].ResolveConstant(node.Value);
if (constant != null)
{
constInfo = constant;
}
}
throw new sunUndeclaredVariableException(node);
} }
void WriteHeader() void WriteHeader()