diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2015-06-26 15:27:34 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2015-06-26 15:27:34 -0400 |
commit | 3f52cefcc4b4cc00caef56a40e0da1ea981a3073 (patch) | |
tree | 7697fdea468261e1cd266eed1ba37ecab08c1e16 /indra/lscript/lscript_compile/indra.l | |
parent | 33c88a1c6037290924691db59c6538a370946ea4 (diff) | |
parent | 687efd84eabc524e339e61458b0cbf53f9a38f8a (diff) |
MAINT-5232: merge LLError::Log::demangle() to tip
Diffstat (limited to 'indra/lscript/lscript_compile/indra.l')
-rwxr-xr-x | indra/lscript/lscript_compile/indra.l | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/lscript/lscript_compile/indra.l b/indra/lscript/lscript_compile/indra.l index 7772c95609..d5c71d9987 100755 --- a/indra/lscript/lscript_compile/indra.l +++ b/indra/lscript/lscript_compile/indra.l @@ -102,7 +102,7 @@ int yyerror(const char *fmt, ...); "event" { count(); return(EVENT); } "jump" { count(); return(JUMP); } "return" { count(); return(RETURN); } -"if" { count(); return(IF); } +"if" { count(); return(IFF); } "else" { count(); return(ELSE); } "for" { count(); return(FOR); } "do" { count(); return(DO); } |