Changes in src/Parser/ExpressionNode.cc [5809461:ba2a68b]

File:

• src/Parser/ExpressionNode.cc (modified) (8 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 : Fri Sep  1 21:49:16 2017
+// Update Count     : 622
 //
 
@@ -66 +66 @@
 } // sepNumeric
 
-Expression * build_constantInteger( std::string & str ) {
+Expression * build_constantInteger( string & str ) {
         static const BasicType::Kind kind[2][3] = {
                 { BasicType::SignedInt, BasicType::LongSignedInt, BasicType::LongLongSignedInt },
@@ -148 +148 @@
   CLEANUP:
         if ( units.length() != 0 ) {
-                ret = new UntypedExpr( new NameExpr( units, ret ) );
+                ret = new UntypedExpr( new NameExpr( units ), { ret } );
         } // if
 
@@ -190 +190 @@
         Expression * ret = new ConstantExpr( Constant( new BasicType( noQualifiers, kind[complx][size] ), str, v ) );
         if ( units.length() != 0 ) {
-                ret = new UntypedExpr( new NameExpr( units, ret ) );
+                ret = new UntypedExpr( new NameExpr( units ), { ret } );
         } // if
 
@@ -211 +211 @@
         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 ) );
+                ret = new UntypedExpr( new NameExpr( units ), { ret } );
         } // if
 
@@ -228 +228 @@
 // ROB: type mismatch
         // if ( units.length() != 0 ) {
-        //      ret = new UntypedExpr( new NameExpr( units, ret ) );
+        //      ret = new UntypedExpr( new NameExpr( units ), { ret } );
         // } // if
-
+                
         delete &str;                                                                            // created by lex
         return ret;
@@ -282 +282 @@
 } // build_varref
 
-// TODO: get rid of this and OperKinds and reuse code from OperatorTable
+
 static const char * OperName[] = {                                              // must harmonize with OperKinds
         // diadic
@@ -290 +290 @@
         "?[?]", "...",
         // monadic
-        "+?", "-?", "AddressOf", "*?", "!?", "~?", "++?", "?++", "--?", "?--",
+        "+?", "-?", "AddressOf", "*?", "!?", "~?", "++?", "?++", "--?", "?--", "&&"
 }; // OperName