Changeset 3f0c6a5 for src/Parser/lex.ll

Timestamp:

Oct 28, 2016, 1:40: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:

066d77a

Parents:

77971f6 (diff), 47a8d17 (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 tuples

Conflicts:

src/Parser/parser.cc
src/Parser/parser.yy

File:

• src/Parser/lex.ll (modified) (3 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 : Tue Oct 18 22:19:37 2016
- * Update Count     : 488
+ * Last Modified On : Wed Oct 26 17:32:30 2016
+ * Update Count     : 499
  */
 
@@ -91 +91 @@
 
 decimal_digits ({decimal})|({decimal}({decimal}|"_")*{decimal})
-fractional_constant ({decimal_digits}?"."{decimal_digits})|({decimal_digits}".")
+real_decimal {decimal_digits}"."
+real_fraction "."{decimal_digits}
+real_constant {decimal_digits}?{real_fraction}
 exponent "_"?[eE]"_"?[+-]?{decimal_digits}
                                 // GCC: D (double), DL (long double) and iI (imaginary) suffixes
 floating_suffix "_"?([fFdDlL][iI]?|"DL"|[iI][lLfFdD]?)
                                 //floating_suffix "_"?([fFdD]|[lL]|[D][L])|([iI][lLfFdD])|([lLfFdD][iI]))
-floating_constant (({fractional_constant}{exponent}?)|({decimal_digits}{exponent})){floating_suffix}?
+floating_constant (({real_constant}{exponent}?)|({decimal_digits}{exponent})){floating_suffix}?
 
 binary_exponent "_"?[pP]"_"?[+-]?{decimal_digits}
@@ -281 +283 @@
 {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_constant}     { NUMERIC_RETURN(FLOATINGconstant); }
 {hex_floating_constant} { NUMERIC_RETURN(FLOATINGconstant); }