Changeset 32cab5b for src/Parser/ExpressionNode.cc

Timestamp:

Apr 17, 2018, 12:01:09 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

3265399

Parents:

b2fe1c9 (diff), 81bb114 (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:software/cfa/cfa-cc

File:

• src/Parser/ExpressionNode.cc (modified) (6 diffs)

src/Parser/ExpressionNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 13:17:07 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Mar  3 18:22:33 2018
-// Update Count     : 796
+// Last Modified On : Thu Mar 22 11:57:39 2018
+// Update Count     : 801
 //
 
@@ -94 +94 @@
 } // checkLNInt
 
-static void sepNumeric( string & str, string & units ) {
-        string::size_type posn = str.find_first_of( "`" );
-        if ( posn != string::npos ) {
-                units = "?" + str.substr( posn );                               // extract units
-                str.erase( posn );                                                              // remove units
-        } // if
-} // sepNumeric
-
 Expression * build_constantInteger( string & str ) {
         static const BasicType::Kind kind[2][6] = {
@@ -108 +100 @@
                 { BasicType::ShortUnsignedInt, BasicType::UnsignedChar, BasicType::UnsignedInt, BasicType::LongUnsignedInt, BasicType::LongLongUnsignedInt, BasicType::UnsignedInt128, },
         };
-
-        string units;
-        sepNumeric( str, units );                                                       // separate constant from units
 
         bool dec = true, Unsigned = false;                                      // decimal, unsigned constant
@@ -232 +221 @@
         } // if
   CLEANUP:
-        if ( units.length() != 0 ) {
-                ret = new UntypedExpr( new NameExpr( units ), { ret } );
-        } // if
 
         delete &str;                                                                            // created by lex
@@ -268 +254 @@
         };
 
-        string units;
-        sepNumeric( str, units );                                                       // separate constant from units
-
         bool complx = false;                                                            // real, complex
         int size = 1;                                                                           // 0 => float, 1 => double, 2 => long double
@@ -303 +286 @@
         if ( lnth != -1 ) {                                                                     // explicit length ?
                 ret = new CastExpr( ret, new BasicType( Type::Qualifiers(), kind[complx][size] ) );
-        } // if
-        if ( units.length() != 0 ) {
-                ret = new UntypedExpr( new NameExpr( units ), { ret } );
         } // if