Changes in src/Parser/ExpressionNode.cc [6165ce7:ac10576]

File:

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

src/Parser/ExpressionNode.cc

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 13:17:07 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul 27 12:10:10 2017
-// Update Count     : 556
+// Last Modified By : Andrew Beach
+// Last Modified On : Tus Jul 18 10:08:00 2017
+// Update Count     : 550
 //
 
@@ -62 +62 @@
         bool dec = true, Unsigned = false;                                      // decimal, unsigned constant
         int size;                                                                                       // 0 => int, 1 => long, 2 => long long
-        unsigned long long int v;                                                       // converted integral value
+        unsigned long long int v;                                                               // converted integral value
         size_t last = str.length() - 1;                                         // last character of constant
-        Expression * ret;
-
-        // special constants
-        if ( str == "0" ) {
-                ret = new ConstantExpr( Constant( (Type *)new ZeroType( noQualifiers ), str, (unsigned long long int)0 ) );
-                goto CLEANUP;
-        } // if
-        if ( str == "1" ) {
-                ret = new ConstantExpr( Constant( (Type *)new OneType( noQualifiers ), str, (unsigned long long int)1 ) );
-                goto CLEANUP;
-        } // if
-        
+
         if ( str[0] == '0' ) {                                                          // octal/hex constant ?
                 dec = false;
@@ -129 +118 @@
         } // if
 
-        ret = new ConstantExpr( Constant( new BasicType( noQualifiers, kind[Unsigned][size] ), str, v ) );
-  CLEANUP:
+        Expression * ret = new ConstantExpr( Constant( new BasicType( noQualifiers, kind[Unsigned][size] ), str, v ) );
         delete &str;                                                                            // created by lex
         return ret;
@@ -186 +174 @@
         return ret;
 } // build_constantStr
+
+Expression *build_constantZeroOne( const std::string & str ) {
+        Expression * ret = new ConstantExpr( Constant( str == "0" ? (Type *)new ZeroType( noQualifiers ) : (Type*)new OneType( noQualifiers ), str,
+                                                                                                   str == "0" ? (unsigned long long int)0 : (unsigned long long int)1 ) );
+        delete &str;                                                                            // created by lex
+        return ret;
+} // build_constantChar
 
 Expression * build_field_name_FLOATINGconstant( const std::string & str ) {
@@ -257 +252 @@
 }
 
-
-Expression *build_virtual_cast( DeclarationNode *decl_node, ExpressionNode *expr_node ) {
-        Type *targetType = maybeMoveBuildType( decl_node );
-        Expression *castArg = maybeMoveBuild< Expression >( expr_node );
-        return new VirtualCastExpr( castArg, targetType );
-}
-
 Expression *build_fieldSel( ExpressionNode *expr_node, Expression *member ) {
         UntypedMemberExpr *ret = new UntypedMemberExpr( member, maybeMoveBuild< Expression >(expr_node) );