Changes in src/Parser/lex.ll [7e419e7:0a2168f]

File:

• src/Parser/lex.ll (modified) (11 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 : Thu Mar 22 16:47:06 2018
- * Update Count     : 668
+ * Last Modified On : Sat Mar  3 18:38:16 2018
+ * Update Count     : 640
  */
 
@@ -54 +54 @@
 
 void rm_underscore() {
-        // SKULLDUGGERY: remove underscores (ok to shorten?)
+        // 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 ) {          // copying non-underscore characters to front of string
+        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];
@@ -63 +71 @@
         } // for
         yytext[yyleng] = '\0';
-} // rm_underscore
+}
 
 // Stop warning due to incorrectly generated flex code.
@@ -82 +90 @@
 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]))?
+integer_suffix_opt ("_"?(([uU]({length}?[iI]?)|([iI]{length}))|([iI]({length}?[uU]?)|([uU]{length}))|({length}([iI]?[uU]?)|([uU][iI]))|[zZ]))?{user_suffix_opt}
 
 octal_digits ({octal})|({octal}({octal}|"_")*{octal})
@@ -108 +118 @@
 floating_length ([fFdDlL]|[lL]{floating_size})
 floating_suffix ({floating_length}?[iI]?)|([iI]{floating_length})
-floating_suffix_opt ("_"?({floating_suffix}|"DL"))?
+floating_suffix_opt ("_"?({floating_suffix}|"DL"))?{user_suffix_opt}
 decimal_digits ({decimal})|({decimal}({decimal}|"_")*{decimal})
 floating_decimal {decimal_digits}"."{exponent}?{floating_suffix_opt}
@@ -115 +125 @@
 
 binary_exponent "_"?[pP]"_"?[+-]?{decimal_digits}
-hex_floating_suffix_opt ("_"?({floating_suffix}))?
+hex_floating_suffix_opt ("_"?({floating_suffix}))?{user_suffix_opt}
 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}
@@ -304 +314 @@
                                 /* identifier */
 {identifier}    { IDENTIFIER_RETURN(); }
-"`"{identifier}"`" {                                                                    // CFA
-        yytext[yyleng - 1] = '\0'; yytext += 1;                         // SKULLDUGGERY: remove backquotes (ok to shorten?)
-        IDENTIFIER_RETURN();
-}
 {attr_identifier} { ATTRIBUTE_RETURN(); }
+"`"                             { BEGIN BKQUOTE; }
+<BKQUOTE>{identifier} { IDENTIFIER_RETURN(); }
+<BKQUOTE>"`"    { BEGIN 0; }
 
                                 /* numeric constants */
@@ -323 +332 @@
 ({cwide_prefix}[_]?)?['] { BEGIN QUOTE; rm_underscore(); strtext = new string( yytext, yyleng ); }
 <QUOTE>[^'\\\n]* { strtext->append( yytext, yyleng ); }
-<QUOTE>['\n]    { BEGIN 0; strtext->append( yytext, yyleng ); RETURN_STR(CHARACTERconstant); }
+<QUOTE>['\n]{user_suffix_opt}   { BEGIN 0; strtext->append( yytext, yyleng ); RETURN_STR(CHARACTERconstant); }
                                 /* ' stop editor highlighting */
 
@@ -329 +338 @@
 ({swide_prefix}[_]?)?["] { BEGIN STRING; rm_underscore(); strtext = new string( yytext, yyleng ); }
 <STRING>[^"\\\n]* { strtext->append( yytext, yyleng ); }
-<STRING>["\n]   { BEGIN 0; strtext->append( yytext, yyleng ); RETURN_STR(STRINGliteral); }
+<STRING>["\n]{user_suffix_opt}  { BEGIN 0; strtext->append( yytext, yyleng ); RETURN_STR(STRINGliteral); }
                                 /* " stop editor highlighting */
 
@@ -339 +348 @@
                                 /* punctuation */
 "@"                             { ASCIIOP_RETURN(); }
-"`"                             { ASCIIOP_RETURN(); }
 "["                             { ASCIIOP_RETURN(); }
 "]"                             { ASCIIOP_RETURN(); }
@@ -404 +412 @@
 "?"({op_unary_pre_post}|"()"|"[?]"|"{}") { IDENTIFIER_RETURN(); }
 "^?{}"                  { IDENTIFIER_RETURN(); }
-"?`"{identifier} { IDENTIFIER_RETURN(); }                               // postfix operator
+"?`"{identifier} { IDENTIFIER_RETURN(); }                               // unit operator
 "?"{op_binary_over}"?"  { IDENTIFIER_RETURN(); }                // binary
         /*