Changeset f80e0218 for src/Parser/lex.ll

Timestamp:

Jun 30, 2016, 4:32:56 PM (10 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

ea29e73

Parents:

1b5c81ed (diff), 84d4d6f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into gc_noraii

Conflicts:

Jenkinsfile
src/SymTab/Validate.cc

File:

• src/Parser/lex.ll (modified) (5 diffs)

src/Parser/lex.ll

@@ -10 +10 @@
  * Created On       : Sat Sep 22 08:58:10 2001
  * Last Modified By : Peter A. Buhr
- * Last Modified On : Mon Mar 21 23:33:46 2016
- * Update Count     : 450
+ * Last Modified On : Thu Jun 23 07:29:30 2016
+ * Update Count     : 457
  */
 
@@ -49 +49 @@
 
 void rm_underscore() {
-        // remove underscores in numeric constant
-        int j = 0;
+        // Remove underscores in numeric constant by copying the non-underscore characters to the front of the string.
+        yyleng = 0;
         for ( int i = 0; yytext[i] != '\0'; i += 1 ) {
                 if ( yytext[i] != '_' ) {
-                        yytext[j] = yytext[i];
-                        j += 1;
+                        yytext[yyleng] = yytext[i];
+                        yyleng += 1;
                 } // if
         } // for
-        yyleng = j;
         yytext[yyleng] = '\0';
 }
@@ -121 +120 @@
 h_white [ ]|{h_tab}
 
-                                // operators
+                                // overloadable operators
 op_unary_only "~"|"!"
 op_unary_binary "+"|"-"|"*"
@@ -129 +128 @@
 op_binary_only "/"|"%"|"^"|"&"|"|"|"<"|">"|"="|"=="|"!="|"<<"|">>"|"<="|">="|"+="|"-="|"*="|"/="|"%="|"&="|"|="|"^="|"<<="|">>="
 op_binary_over {op_unary_binary}|{op_binary_only}
-op_binary_not_over "?"|"->"|"&&"|"||"
-operator {op_unary_pre_post}|{op_binary_over}|{op_binary_not_over}
+                                // op_binary_not_over "?"|"->"|"."|"&&"|"||"|"@="
+                                // operator {op_unary_pre_post}|{op_binary_over}|{op_binary_not_over}
 
 %x COMMENT
@@ -274 +273 @@
 {identifier}    { IDENTIFIER_RETURN(); }
 {attr_identifier} { ATTRIBUTE_RETURN(); }
-"`"                     { BEGIN BKQUOTE; }
+"`"                             { BEGIN BKQUOTE; }
 <BKQUOTE>{identifier} { IDENTIFIER_RETURN(); }
 <BKQUOTE>"`"    { BEGIN 0; }