Changes in src/Parser/ExpressionNode.cc [cccc534:e8ccca3]

File:

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

src/Parser/ExpressionNode.cc

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 13:17:07 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Wed Aug  2 11:12:00 2017
-// Update Count     : 568
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Sep  1 15:07:09 2017
+// Update Count     : 618
 //
 
@@ -58 +58 @@
 static inline bool checkX( char c ) { return c == 'x' || c == 'X'; }
 
-Expression * build_constantInteger( const std::string & str ) {
+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( std::string & str ) {
         static const BasicType::Kind kind[2][3] = {
                 { BasicType::SignedInt, BasicType::LongSignedInt, BasicType::LongLongSignedInt },
                 { BasicType::UnsignedInt, BasicType::LongUnsignedInt, BasicType::LongLongUnsignedInt },
         };
+
+        string units;                                                                           // units
+        sepNumeric( str, units );                                                       // separate constant from units
+
         bool dec = true, Unsigned = false;                                      // decimal, unsigned constant
         int size;                                                                                       // 0 => int, 1 => long, 2 => long long
@@ -69 +81 @@
         Expression * ret;
 
+        // ROB: what do we do with units on 0 and 1?
         // special constants
         if ( str == "0" ) {
@@ -134 +147 @@
         ret = new ConstantExpr( Constant( new BasicType( noQualifiers, kind[Unsigned][size] ), str, v ) );
   CLEANUP:
+        if ( units.length() != 0 ) {
+                ret = new UntypedExpr( new NameExpr( units, ret ) );
+        } // if
+
         delete &str;                                                                            // created by lex
         return ret;
 } // build_constantInteger
 
-Expression * build_constantFloat( const std::string & str ) {
+Expression * build_constantFloat( std::string & str ) {
         static const BasicType::Kind kind[2][3] = {
                 { BasicType::Float, BasicType::Double, BasicType::LongDouble },
                 { BasicType::FloatComplex, BasicType::DoubleComplex, BasicType::LongDoubleComplex },
         };
+
+        string units;                                                                           // units
+        sepNumeric( str, units );                                                       // separate constant from units
 
         bool complx = false;                                                            // real, complex
@@ -169 +189 @@
 
         Expression * ret = new ConstantExpr( Constant( new BasicType( noQualifiers, kind[complx][size] ), str, v ) );
+        if ( units.length() != 0 ) {
+                ret = new UntypedExpr( new NameExpr( units, ret ) );
+        } // if
+
         delete &str;                                                                            // created by lex
         return ret;
 } // build_constantFloat
 
-Expression * build_constantChar( const std::string & str ) {
+static void sepString( string & str, string & units, char delimit ) {
+        string::size_type posn = str.find_last_of( delimit ) + 1;
+        if ( posn != str.length() ) {
+                units = "?" + str.substr( posn );                               // extract units
+                str.erase( posn );                                                              // remove units
+        } // if
+} // sepString
+
+Expression * build_constantChar( std::string & str ) {
+        string units;                                                                           // units
+        sepString( str, units, '\'' );                                          // separate constant from units
+
         Expression * ret = new ConstantExpr( Constant( new BasicType( noQualifiers, BasicType::Char ), str, (unsigned long long int)(unsigned char)str[1] ) );
+        if ( units.length() != 0 ) {
+                ret = new UntypedExpr( new NameExpr( units, ret ) );
+        } // if
+
         delete &str;                                                                            // created by lex
         return ret;
 } // build_constantChar
 
-ConstantExpr * build_constantStr( const std::string & str ) {
-        // string should probably be a primitive type
+ConstantExpr * build_constantStr( std::string & str ) {
+        string units;                                                                           // units
+        sepString( str, units, '"' );                                           // separate constant from units
+
         ArrayType * at = new ArrayType( noQualifiers, new BasicType( Type::Qualifiers( Type::Const ), BasicType::Char ),
-                                                                   new ConstantExpr( Constant::from_ulong( str.size() + 1 - 2 ) ), // +1 for '\0' and -2 for '"'
-                                                                   false, false );
+                                                                        new ConstantExpr( Constant::from_ulong( str.size() + 1 - 2 ) ), // +1 for '\0' and -2 for '"'
+                                                                        false, false );
         ConstantExpr * ret = new ConstantExpr( Constant( at, str, (unsigned long long int)0 ) ); // constant 0 is ignored for pure string value
+// ROB: type mismatch
+        // if ( units.length() != 0 ) {
+        //      ret = new UntypedExpr( new NameExpr( units, ret ) );
+        // } // if
+                
         delete &str;                                                                            // created by lex
         return ret;
@@ -314 +360 @@
 Expression * build_unary_ptr( OperKinds op, ExpressionNode * expr_node ) {
         std::list< Expression * > args;
-        args.push_back(  maybeMoveBuild< Expression >(expr_node) ); // xxx -- this is exactly the same as the val case now, refactor this code.
+        args.push_back(  maybeMoveBuild< Expression >(expr_node) ); // xxx
         return new UntypedExpr( new NameExpr( OperName[ (int)op ] ), args );
 } // build_unary_ptr