summaryrefslogtreecommitdiff
path: root/indra/lscript/lscript_compile/indra.y
diff options
context:
space:
mode:
Diffstat (limited to 'indra/lscript/lscript_compile/indra.y')
-rwxr-xr-xindra/lscript/lscript_compile/indra.y6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/lscript/lscript_compile/indra.y b/indra/lscript/lscript_compile/indra.y
index a0a034d21c..604b5b6b92 100755
--- a/indra/lscript/lscript_compile/indra.y
+++ b/indra/lscript/lscript_compile/indra.y
@@ -117,7 +117,7 @@
%token SHIFT_LEFT
%token SHIFT_RIGHT
-%token IF
+%token IFF /* IF used by a helper library */
%token ELSE
%token FOR
%token DO
@@ -1312,13 +1312,13 @@ statement
{
$$ = $1;
}
- | IF '(' expression ')' statement %prec LOWER_THAN_ELSE
+ | IFF '(' expression ')' statement %prec LOWER_THAN_ELSE
{
$$ = new LLScriptIf(gLine, gColumn, $3, $5);
$5->mAllowDeclarations = FALSE;
gAllocationManager->addAllocation($$);
}
- | IF '(' expression ')' statement ELSE statement
+ | IFF '(' expression ')' statement ELSE statement
{
$$ = new LLScriptIfElse(gLine, gColumn, $3, $5, $7);
$5->mAllowDeclarations = FALSE;