Changes in src/Parser/ExpressionNode.cc [097e2b0:51b1202]

File:

• src/Parser/ExpressionNode.cc (modified) (5 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 : Mon Oct  5 16:37:24 2015
-// Update Count     : 255
+// Last Modified On : Tue Aug 11 15:13:48 2015
+// Update Count     : 200
 // 
 
@@ -32 +32 @@
 ExpressionNode::ExpressionNode() : ParseNode(), argName( 0 ) {}
 
-ExpressionNode::ExpressionNode( const string *name ) : ParseNode( name ), argName( 0 ) {}
+ExpressionNode::ExpressionNode( const string *name_ ) : ParseNode( name_ ), argName( 0 ) {}
 
 ExpressionNode::ExpressionNode( const ExpressionNode &other ) : ParseNode( other.name ) {
@@ -290 +290 @@
 DesignatorNode::DesignatorNode( ExpressionNode *expr, bool isArrayIndex ) : isArrayIndex( isArrayIndex ) {
         set_argName( expr );
-        assert( get_argName() );
-
-        if ( ! isArrayIndex ) {
-                if ( VarRefNode * var = dynamic_cast< VarRefNode * >( expr ) ) {
-
-                        stringstream ss( var->get_name() );
-                        double value;
-                        if ( ss >> value ) {
-                                // this is a floating point constant. It MUST be
-                                // ".0" or ".1", otherwise the program is invalid
-                                if ( ! (var->get_name() == ".0" || var->get_name() == ".1") ) {
-                                        throw SemanticError( "invalid designator name: " + var->get_name() );
-                                } // if
-                                var->set_name( var->get_name().substr(1) );
-                        } // if
-                } // if
-        } // if
 }
 
@@ -312 +295 @@
 }
 
-class DesignatorFixer : public Mutator {
-public:
-        virtual Expression* mutate( NameExpr *nameExpr ) {
-                if ( nameExpr->get_name() == "0" || nameExpr->get_name() == "1" ) {
-                        Constant val( new BasicType( Type::Qualifiers(), BasicType::SignedInt ), nameExpr->get_name() );
-                        delete nameExpr;
-                        return new ConstantExpr( val );
-                }
-                return nameExpr;
-        }
-};
-
 Expression *DesignatorNode::build() const {
-        Expression * ret = get_argName()->build();
-
         if ( isArrayIndex ) {
-                // need to traverse entire structure and change any instances of 0 or 1 to 
-                // ConstantExpr
-                DesignatorFixer fixer;
-                ret = ret->acceptMutator( fixer );
-        } // if
-
-        return ret;
+                return new NameExpr( get_name(), maybeBuild< Expression >( get_argName() ) );
+        } else {
+                return new NameExpr( get_name(), maybeBuild< Expression >( get_argName() ) );
+        } // if
 }
 
@@ -418 +384 @@
 
 CompositeExprNode::CompositeExprNode( ExpressionNode *f, ExpressionNode *arg1, ExpressionNode *arg2):
-        function( f ), arguments( arg1 ) {
-        arguments->set_link( arg2 );
+        function( f ), arguments( arg1) {
+        arguments->set_link( arg2);
 }