1 files changed, 38 insertions, 13 deletions

diff --git a/linden/indra/lscript/lscript_compile/indra.l b/linden/indra/lscript/lscript_compile/indra.l
index 3e62195..ac52432 100644
--- a/linden/indra/lscript/lscript_compile/indra.l
+++ b/linden/indra/lscript/lscript_compile/indra.l
@@ -36,7 +36,8 @@ FS			(f|F)
 #include "llclickaction.h"
 
 void count();
-void comment();
+void line_comment();
+void block_comment();
 void parse_string();
 
 #define YYLMAX 16384
@@ -60,7 +61,8 @@ extern "C" { int yyerror(const char *fmt, ...); }
 %}
 
 %%
-"//"                                    { gInternalLine++; gInternalColumn = 0; comment(); }
+"//"                                    { gInternalLine++; gInternalColumn = 0; line_comment(); }
+"/*"                                    { block_comment(); }
 
 "integer"                       { count(); return(INTEGER); }
 "float"                         { count(); return(FLOAT_TYPE); }
@@ -116,6 +118,7 @@ extern "C" { int yyerror(const char *fmt, ...); }
 "object_rez"                    { count(); return(OBJECT_REZ); }
 "remote_data"                   { count(); return(REMOTE_DATA); }
 "http_response"                 { count(); return(HTTP_RESPONSE); }
+"http_request"                  { count(); return(HTTP_REQUEST); }
 "."                                             { count(); return(PERIOD); }
 
 
@@ -219,16 +222,17 @@ extern "C" { int yyerror(const char *fmt, ...); }
 "INVENTORY_ALL"                                         { count(); yylval.ival = LLAssetType::AT_NONE; return(INTEGER_CONSTANT); }
 "INVENTORY_NONE"                                        { count(); yylval.ival = LLAssetType::AT_NONE; return(INTEGER_CONSTANT); }
 
-"CHANGED_INVENTORY"             { count(); yylval.ival = 0x1; return(INTEGER_CONSTANT); }       
-"CHANGED_COLOR"                 { count(); yylval.ival = 0x2; return(INTEGER_CONSTANT); }       
-"CHANGED_SHAPE"                 { count(); yylval.ival = 0x4; return(INTEGER_CONSTANT); }       
-"CHANGED_SCALE"                 { count(); yylval.ival = 0x8; return(INTEGER_CONSTANT); }       
-"CHANGED_TEXTURE"               { count(); yylval.ival = 0x10; return(INTEGER_CONSTANT); }      
-"CHANGED_LINK"                  { count(); yylval.ival = 0x20; return(INTEGER_CONSTANT); }      
-"CHANGED_ALLOWED_DROP"  { count(); yylval.ival = 0x40; return(INTEGER_CONSTANT); }      
-"CHANGED_OWNER"                 { count(); yylval.ival = 0x80; return(INTEGER_CONSTANT); }      
-"CHANGED_REGION"                { count(); yylval.ival = 0x100; return(INTEGER_CONSTANT); }     
-"CHANGED_TELEPORT"              { count(); yylval.ival = 0x200; return(INTEGER_CONSTANT); }     
+"CHANGED_INVENTORY"             { count(); yylval.ival = CHANGED_INVENTORY; return(INTEGER_CONSTANT); } 
+"CHANGED_COLOR"                 { count(); yylval.ival = CHANGED_COLOR; return(INTEGER_CONSTANT); }     
+"CHANGED_SHAPE"                 { count(); yylval.ival = CHANGED_SHAPE; return(INTEGER_CONSTANT); }     
+"CHANGED_SCALE"                 { count(); yylval.ival = CHANGED_SCALE; return(INTEGER_CONSTANT); }     
+"CHANGED_TEXTURE"               { count(); yylval.ival = CHANGED_TEXTURE; return(INTEGER_CONSTANT); }   
+"CHANGED_LINK"                  { count(); yylval.ival = CHANGED_LINK; return(INTEGER_CONSTANT); }      
+"CHANGED_ALLOWED_DROP"  { count(); yylval.ival = CHANGED_ALLOWED_DROP; return(INTEGER_CONSTANT); }      
+"CHANGED_OWNER"                 { count(); yylval.ival = CHANGED_OWNER; return(INTEGER_CONSTANT); }     
+"CHANGED_REGION"                { count(); yylval.ival = CHANGED_REGION; return(INTEGER_CONSTANT); }    
+"CHANGED_TELEPORT"              { count(); yylval.ival = CHANGED_TELEPORT; return(INTEGER_CONSTANT); }  
+"CHANGED_REGION_START"          { count(); yylval.ival = CHANGED_REGION_START; return(INTEGER_CONSTANT); }      
 
 "OBJECT_UNKNOWN_DETAIL" { count(); yylval.ival = OBJECT_UNKNOWN_DETAIL; return(INTEGER_CONSTANT); }
 "OBJECT_NAME"                   { count(); yylval.ival = OBJECT_NAME; return(INTEGER_CONSTANT); }
@@ -250,6 +254,8 @@ extern "C" { int yyerror(const char *fmt, ...); }
 
 "NULL_KEY"                              { yylval.sval = new char[UUID_STR_LENGTH]; strcpy(yylval.sval, "00000000-0000-0000-0000-000000000000"); return(STRING_CONSTANT); }
 "EOF"                                   { yylval.sval = new char[UUID_STR_LENGTH]; strcpy(yylval.sval, "\n\n\n"); return(STRING_CONSTANT); }
+"URL_REQUEST_GRANTED"   { yylval.sval = new char[UUID_STR_LENGTH]; strcpy(yylval.sval, URL_REQUEST_GRANTED); return(STRING_CONSTANT); }
+"URL_REQUEST_DENIED"    { yylval.sval = new char[UUID_STR_LENGTH]; strcpy(yylval.sval, URL_REQUEST_DENIED); return(STRING_CONSTANT); }
 
 "PI"                                    { count(); yylval.fval = F_PI; return(FP_CONSTANT); }
 "TWO_PI"                                { count(); yylval.fval = F_TWO_PI; return(FP_CONSTANT); }
@@ -790,7 +796,7 @@ S32 yywrap()
         return(1);
 }
 
-void comment()
+void line_comment()
 {
         char c;
 
@@ -798,6 +804,25 @@ void comment()
                 ;
 }
 
+void block_comment()
+{
+        char c1 = 0;
+        char c2 = yyinput();
+        while (c2 != 0 && c2 != EOF && !(c1 == '*' && c2 == '/')) {
+                if (c2 == '\n')
+                {
+                        gInternalLine++;
+                        gInternalColumn = 0;
+                }
+                else if (c2 == '\t')
+                        gInternalColumn += 4 - (gInternalColumn % 8);
+                else
+                        gInternalColumn++;
+                c1 = c2;
+                c2 = yyinput();
+        }
+}
+
 void count()
 {
         S32 i;