Changeset b3c7963 for src/Parser/lex.ll

Timestamp:

Sep 12, 2017, 5:55:31 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

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, resolv-new, with_gc

Children:

4639b0d

Parents:

a506df4 (diff), a46478a (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' of plg.uwaterloo.ca:/u/cforall/software/cfa/cfa-cc

File:

• src/Parser/lex.ll (modified) (6 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 Aug 31 21:30:10 2017
- * Update Count     : 598
+ * Last Modified On : Sun Sep 10 22:29:15 2017
+ * Update Count     : 620
  */
 
@@ -93 +93 @@
                                 // numeric constants, CFA: '_' in constant
 hex_quad {hex}("_"?{hex}){3}
-integer_suffix_opt ("_"?(([uU](("ll"|"LL"|[lL])[iI]|[iI]?("ll"|"LL"|[lL])?))|([iI](("ll"|"LL"|[lL])[uU]|[uU]?("ll"|"LL"|[lL])?))|(("ll"|"LL"|[lL])([iI][uU]|[uU]?[iI]?))))?
+length ("ll"|"LL"|[lL])|("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}
 
 octal_digits ({octal})|({octal}({octal}|"_")*{octal})
 octal_prefix "0""_"?
-octal_constant (("0")|({octal_prefix}{octal_digits})){integer_suffix_opt}{user_suffix_opt}
+octal_constant (("0")|({octal_prefix}{octal_digits})){integer_suffix_opt}
 
 nonzero_digits ({nonzero})|({nonzero}({decimal}|"_")*{decimal})
-decimal_constant {nonzero_digits}{integer_suffix_opt}{user_suffix_opt}
+decimal_constant {nonzero_digits}{integer_suffix_opt}
 
 hex_digits ({hex})|({hex}({hex}|"_")*{hex})
 hex_prefix "0"[xX]"_"?
-hex_constant {hex_prefix}{hex_digits}{integer_suffix_opt}{user_suffix_opt}
+hex_constant {hex_prefix}{hex_digits}{integer_suffix_opt}
 
                                 // GCC: D (double) and iI (imaginary) suffixes, and DL (long double)
-floating_suffix_opt ("_"?([fFdDlL][iI]?|[iI][lLfFdD]?|"DL"))?
+exponent "_"?[eE]"_"?[+-]?{decimal_digits}
+floating_suffix ([fFdDlL]?[iI]?)|([iI][lLfFdD])
+floating_suffix_opt ("_"?({floating_suffix}|"DL"))?{user_suffix_opt}
 decimal_digits ({decimal})|({decimal}({decimal}|"_")*{decimal})
-real_decimal {decimal_digits}"."{exponent}?{floating_suffix_opt}{user_suffix_opt}
-real_fraction "."{decimal_digits}{exponent}?{floating_suffix_opt}{user_suffix_opt}
-real_constant {decimal_digits}{real_fraction}
-exponent "_"?[eE]"_"?[+-]?{decimal_digits}
-floating_constant (({real_constant}{exponent}?)|({decimal_digits}{exponent})){floating_suffix_opt}{user_suffix_opt}
+floating_decimal {decimal_digits}"."{exponent}?{floating_suffix_opt}
+floating_fraction "."{decimal_digits}{exponent}?{floating_suffix_opt}
+floating_constant ({decimal_digits}{exponent}{floating_suffix_opt})|({decimal_digits}{floating_fraction})
 
 binary_exponent "_"?[pP]"_"?[+-]?{decimal_digits}
-hex_fractional_constant ({hex_digits}?"."{hex_digits})|({hex_digits}".")
-hex_floating_constant {hex_prefix}(({hex_fractional_constant}{binary_exponent})|({hex_digits}{binary_exponent})){floating_suffix_opt}
+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}
 
                                 // character escape sequence, GCC: \e => esc character
 simple_escape "\\"[abefnrtv'"?\\]
-                                // ' stop highlighting
+                                // ' stop editor highlighting
 octal_escape "\\"{octal}("_"?{octal}){0,2}
 hex_escape "\\""x""_"?{hex_digits}
@@ -154 +156 @@
                                 /* line directives */
 ^{h_white}*"#"{h_white}*[0-9]+{h_white}*["][^"\n]+["].*"\n" {
-        /* " stop highlighting */
+        /* " stop editor highlighting */
         static char filename[FILENAME_MAX];                                     // temporarily store current source-file name
         char *end_num;
@@ -310 +312 @@
 {octal_constant} { NUMERIC_RETURN(INTEGERconstant); }
 {hex_constant}  { NUMERIC_RETURN(INTEGERconstant); }
-{real_decimal}  { NUMERIC_RETURN(REALDECIMALconstant); } // must appear before floating_constant
-{real_fraction} { NUMERIC_RETURN(REALFRACTIONconstant); } // must appear before floating_constant
+{floating_decimal}      { NUMERIC_RETURN(FLOATING_DECIMALconstant); } // must appear before floating_constant
+{floating_fraction}     { NUMERIC_RETURN(FLOATING_FRACTIONconstant); } // must appear before floating_constant
 {floating_constant}     { NUMERIC_RETURN(FLOATINGconstant); }
 {hex_floating_constant} { NUMERIC_RETURN(FLOATINGconstant); }
@@ -319 +321 @@
 <QUOTE>[^'\\\n]* { strtext->append( yytext, yyleng ); }
 <QUOTE>['\n]{user_suffix_opt}   { BEGIN 0; strtext->append( yytext, yyleng ); RETURN_STR(CHARACTERconstant); }
-                                /* ' stop highlighting */
+                                /* ' stop editor highlighting */
 
                                 /* string constant */
@@ -325 +327 @@
 <STRING>[^"\\\n]* { strtext->append( yytext, yyleng ); }
 <STRING>["\n]{user_suffix_opt}  { BEGIN 0; strtext->append( yytext, yyleng ); RETURN_STR(STRINGliteral); }
-                                /* " stop highlighting */
+                                /* " stop editor highlighting */
 
                                 /* common character/string constant */