ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-31 05:45:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue 1860; exception thrown in the parser on if/if-else/for/while/do-while

Browse Source 
statements with no body.
This commit is contained in:
Mike Mazur
2008-07-31 01:27:33 +00:00
parent 1c8f490573
commit eef3864278
5 changed files with 153 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs
View File

@@ -388,14 +388,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
private string GenerateStatement(Statement s)
{
string retstr = String.Empty;
// Jump label prints its own colon, we don't need a semicolon.
bool printSemicolon = !(s.kids.Top is JumpLabel);
bool printSemicolon = true;
retstr += Indent();
foreach (SYMBOL kid in s.kids)
retstr += GenerateNode(kid);
if (0 < s.kids.Count)
{
// Jump label prints its own colon, we don't need a semicolon.
printSemicolon = !(s.kids.Top is JumpLabel);
foreach (SYMBOL kid in s.kids)
retstr += GenerateNode(kid);
}
if (printSemicolon)
retstr += GenerateLine(";");

10
OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.parser.cs
View File

@@ -359,7 +359,7 @@ public override int yynum { get { return 114; }}
public StateChange(Parser yyp):base(yyp){}}
//%+IfStatement+115
public class IfStatement : SYMBOL{
private void AddStatement ( Statement s ){ if ( s . kids . Top is CompoundStatement ) kids . Add ( s . kids . Pop ());
private void AddStatement ( Statement s ){ if (0< s . kids . Count && s . kids . Top is CompoundStatement ) kids . Add ( s . kids . Pop ());
else kids . Add ( s );
}
public IfStatement (Parser yyp, Expression e , Statement ifs ):base(((LSLSyntax
@@ -369,7 +369,7 @@ public class IfStatement : SYMBOL{
public IfStatement (Parser yyp, Expression e , Statement ifs , Statement es ):base(((LSLSyntax
)yyp)){ kids . Add ( e );
AddStatement ( ifs );
if ( es . kids . Top is IfStatement ) kids . Add ( es . kids . Pop ());
if (0< es . kids . Count && es . kids . Top is IfStatement ) kids . Add ( es . kids . Pop ());
else AddStatement ( es );
}
@@ -380,7 +380,7 @@ public IfStatement(Parser yyp):base(yyp){}}
public class WhileStatement : SYMBOL{
public WhileStatement (Parser yyp, Expression e , Statement s ):base(((LSLSyntax
)yyp)){ kids . Add ( e );
if ( s . kids . Top is CompoundStatement ) kids . Add ( s . kids . Pop ());
if (0< s . kids . Count && s . kids . Top is CompoundStatement ) kids . Add ( s . kids . Pop ());
else kids . Add ( s );
}
@@ -390,7 +390,7 @@ public WhileStatement(Parser yyp):base(yyp){}}
//%+DoWhileStatement+117
public class DoWhileStatement : SYMBOL{
public DoWhileStatement (Parser yyp, Expression e , Statement s ):base(((LSLSyntax
)yyp)){ if ( s . kids . Top is CompoundStatement ) kids . Add ( s . kids . Pop ());
)yyp)){ if (0< s . kids . Count && s . kids . Top is CompoundStatement ) kids . Add ( s . kids . Pop ());
else kids . Add ( s );
kids . Add ( e );
}
@@ -404,7 +404,7 @@ public class ForLoop : SYMBOL{
)yyp)){ kids . Add ( flsa );
kids . Add ( e );
kids . Add ( flsb );
if ( s . kids . Top is CompoundStatement ) kids . Add ( s . kids . Pop ());
if (0< s . kids . Count && s . kids . Top is CompoundStatement ) kids . Add ( s . kids . Pop ());
else kids . Add ( s );
}