Changeset 02153feb for src

Timestamp:

May 18, 2017, 11:36:51 AM (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:

c7a3081

Parents:

4203f71 (diff), ba2356b (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

Location:

src

Files:

• Parser/ExpressionNode.cc (modified) (3 diffs)
• Parser/lex.ll (modified) (3 diffs)
• tests/.expect/64/gmp.txt (moved) (moved from src/tests/.expect/gmp.txt)
• tests/.expect/complex.txt (added)
• tests/complex.c (added)

src/Parser/ExpressionNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 13:17:07 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Mar 30 17:02:46 2017
-// Update Count     : 515
+// Last Modified On : Wed May 17 21:31:01 2017
+// Update Count     : 527
 //
 
@@ -207 +207 @@
 } // build_field_name_fraction_constants
 
+
+
 Expression * build_field_name_REALFRACTIONconstant( const std::string & str ) {
-        assert( str[0] == '.' );
+        if ( str.find_first_not_of( "0123456789", 1 ) != string::npos ) throw SemanticError( "invalid tuple index " + str );
         Expression * ret = build_constantInteger( *new std::string( str.substr(1) ) );
         delete &str;
@@ -215 +217 @@
 
 Expression * build_field_name_REALDECIMALconstant( const std::string & str ) {
-        assert( str[str.size()-1] == '.' );
+        if ( str[str.size()-1] != '.' ) throw SemanticError( "invalid tuple index " + str );
         Expression * ret = build_constantInteger( *new std::string( str.substr( 0, str.size()-1 ) ) );
         delete &str;

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 13 08:36:17 2017
- * Update Count     : 506
+ * Last Modified On : Thu May 18 09:03:49 2017
+ * Update Count     : 513
  */
 
@@ -77 +77 @@
                                 // numeric constants, CFA: '_' in constant
 hex_quad {hex}("_"?{hex}){3}
-integer_suffix "_"?(([uU][lL]?)|([uU]("ll"|"LL")?)|([lL][uU]?)|("ll"|"LL")[uU]?)
+integer_suffix "_"?(([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]?)))
 
 octal_digits ({octal})|({octal}({octal}|"_")*{octal})
@@ -91 +91 @@
 
 decimal_digits ({decimal})|({decimal}({decimal}|"_")*{decimal})
-real_decimal {decimal_digits}"."
-real_fraction "."{decimal_digits}
-real_constant {decimal_digits}?{real_fraction}
+real_decimal {decimal_digits}"."{exponent}?{floating_suffix}?
+real_fraction "."{decimal_digits}{exponent}?{floating_suffix}?
+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]))
+                                // GCC: D (double) and iI (imaginary) suffixes, and DL (long double)
+floating_suffix "_"?([fFdDlL][iI]?|[iI][lLfFdD]?|"DL")
 floating_constant (({real_constant}{exponent}?)|({decimal_digits}{exponent})){floating_suffix}?