Changeset dc7db63 for src/Parser/lex.ll

Timestamp:

Mar 22, 2018, 4:41:01 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

6ecc079

Parents:

41624f92

Message:

extend postfix routine-call to variables/expressions

File:

• src/Parser/lex.ll (modified) (9 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 : Sat Mar  3 18:38:16 2018
- * Update Count     : 640
+ * Last Modified On : Thu Mar 22 14:14:46 2018
+ * Update Count     : 667
  */
 
@@ -57 +57 @@
         yyleng = 0;
         for ( int i = 0; yytext[i] != '\0'; i += 1 ) {
-                if ( yytext[i] == '`' ) {
-                        // copy user suffix
-                        for ( ; yytext[i] != '\0'; i += 1 ) {
-                                yytext[yyleng] = yytext[i];
-                                yyleng += 1;
-                        } // for
-                        break;
-                } // if
                 if ( yytext[i] != '_' ) {
                         yytext[yyleng] = yytext[i];
@@ -90 +82 @@
 attr_identifier "@"{identifier}
 
-user_suffix_opt ("`"{identifier})?
-
                                 // numeric constants, CFA: '_' in constant
 hex_quad {hex}("_"?{hex}){3}
 size_opt (8|16|32|64|128)?
 length ("ll"|"LL"|[lL]{size_opt})|("hh"|"HH"|[hH])
-integer_suffix_opt ("_"?(([uU]({length}?[iI]?)|([iI]{length}))|([iI]({length}?[uU]?)|([uU]{length}))|({length}([iI]?[uU]?)|([uU][iI]))|[zZ]))?{user_suffix_opt}
+integer_suffix_opt ("_"?(([uU]({length}?[iI]?)|([iI]{length}))|([iI]({length}?[uU]?)|([uU]{length}))|({length}([iI]?[uU]?)|([uU][iI]))|[zZ]))?
 
 octal_digits ({octal})|({octal}({octal}|"_")*{octal})
@@ -118 +108 @@
 floating_length ([fFdDlL]|[lL]{floating_size})
 floating_suffix ({floating_length}?[iI]?)|([iI]{floating_length})
-floating_suffix_opt ("_"?({floating_suffix}|"DL"))?{user_suffix_opt}
+floating_suffix_opt ("_"?({floating_suffix}|"DL"))?
 decimal_digits ({decimal})|({decimal}({decimal}|"_")*{decimal})
 floating_decimal {decimal_digits}"."{exponent}?{floating_suffix_opt}
@@ -125 +115 @@
 
 binary_exponent "_"?[pP]"_"?[+-]?{decimal_digits}
-hex_floating_suffix_opt ("_"?({floating_suffix}))?{user_suffix_opt}
+hex_floating_suffix_opt ("_"?({floating_suffix}))?
 hex_floating_fraction ({hex_digits}?"."{hex_digits})|({hex_digits}".")
 hex_floating_constant {hex_prefix}(({hex_floating_fraction}{binary_exponent})|({hex_digits}{binary_exponent})){hex_floating_suffix_opt}
@@ -314 +304 @@
                                 /* identifier */
 {identifier}    { IDENTIFIER_RETURN(); }
+"`"{identifier}"`" {
+        yytext[yyleng - 1] = '\0'; yytext += 1;                         // remove backquotes (ok to shorten)
+        IDENTIFIER_RETURN();
+}
 {attr_identifier} { ATTRIBUTE_RETURN(); }
-"`"                             { BEGIN BKQUOTE; }
-<BKQUOTE>{identifier} { IDENTIFIER_RETURN(); }
-<BKQUOTE>"`"    { BEGIN 0; }
 
                                 /* numeric constants */
@@ -332 +323 @@
 ({cwide_prefix}[_]?)?['] { BEGIN QUOTE; rm_underscore(); strtext = new string( yytext, yyleng ); }
 <QUOTE>[^'\\\n]* { strtext->append( yytext, yyleng ); }
-<QUOTE>['\n]{user_suffix_opt}   { BEGIN 0; strtext->append( yytext, yyleng ); RETURN_STR(CHARACTERconstant); }
+<QUOTE>['\n]    { BEGIN 0; strtext->append( yytext, yyleng ); RETURN_STR(CHARACTERconstant); }
                                 /* ' stop editor highlighting */
 
@@ -338 +329 @@
 ({swide_prefix}[_]?)?["] { BEGIN STRING; rm_underscore(); strtext = new string( yytext, yyleng ); }
 <STRING>[^"\\\n]* { strtext->append( yytext, yyleng ); }
-<STRING>["\n]{user_suffix_opt}  { BEGIN 0; strtext->append( yytext, yyleng ); RETURN_STR(STRINGliteral); }
+<STRING>["\n]   { BEGIN 0; strtext->append( yytext, yyleng ); RETURN_STR(STRINGliteral); }
                                 /* " stop editor highlighting */
 
@@ -348 +339 @@
                                 /* punctuation */
 "@"                             { ASCIIOP_RETURN(); }
+"`"                             { ASCIIOP_RETURN(); }
 "["                             { ASCIIOP_RETURN(); }
 "]"                             { ASCIIOP_RETURN(); }