Changes in / [78a0b88:a01f7c94]

File:

• src/Parser/ExpressionNode.cc (modified) (7 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 : Fri Sep  1 15:07:09 2017
-// Update Count     : 618
+// Last Modified On : Thu Aug 31 21:05:04 2017
+// Update Count     : 605
 //
 
@@ -61 +61 @@
         string::size_type posn = str.find_first_of( "`" );
         if ( posn != string::npos ) {
-                units = "?" + str.substr( posn );                               // extract units
+                units = str.substr( posn );                                             // extract units
                 str.erase( posn );                                                              // remove units
         } // if
@@ -145 +145 @@
         } // if
 
-        ret = new ConstantExpr( Constant( new BasicType( noQualifiers, kind[Unsigned][size] ), str, v ) );
+//      if ( units.length() == 0 ) {
+                ret = new ConstantExpr( Constant( new BasicType( noQualifiers, kind[Unsigned][size] ), str, v ) );
+//      } else {
+//              // ROB: generate call to units routine
+//              ret = nullptr;
+//      } // if
   CLEANUP:
-        if ( units.length() != 0 ) {
-                ret = new UntypedExpr( new NameExpr( units, ret ) );
-        } // if
-
         delete &str;                                                                            // created by lex
         return ret;
@@ -188 +189 @@
         } // if
 
-        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
+        Expression * ret;
+//      if ( units.length() == 0 ) {
+                ret = new ConstantExpr( Constant( new BasicType( noQualifiers, kind[complx][size] ), str, v ) );
+//      } else {
+//              ret = nullptr;
+//              // ROB: generate call to units routine
+//      } // if
 
         delete &str;                                                                            // created by lex
@@ -200 +204 @@
         string::size_type posn = str.find_last_of( delimit ) + 1;
         if ( posn != str.length() ) {
-                units = "?" + str.substr( posn );                               // extract units
+                units = str.substr( posn );                                             // extract units
                 str.erase( posn );                                                              // remove units
         } // if
@@ -209 +213 @@
         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
+        Expression * ret;
+//      if ( units.length() == 0 ) {
+                ret = new ConstantExpr( Constant( new BasicType( noQualifiers, BasicType::Char ), str, (unsigned long long int)(unsigned char)str[1] ) );
+//      } else {
+//              ret = nullptr;
+//              // ROB: generate call to units routine
+//      } // if
 
         delete &str;                                                                            // created by lex
@@ -222 +229 @@
         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 );
-        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
+        ConstantExpr * ret;
+//      if ( units.length() == 0 ) {
+                // string should probably be a primitive type
+                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 );
+                ret = new ConstantExpr( Constant( at, str, (unsigned long long int)0 ) ); // constant 0 is ignored for pure string value
+//      } else {
+//              ret = nullptr;
+//              // ROB: generate call to units routine
+//      } // if
                 
         delete &str;                                                                            // created by lex