Changeset e869d663

Timestamp:

Aug 12, 2015, 2:26:44 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc

Children:

43ee2a8, d60ccbf

Parents:

d58ebf3

Message:

designator parsing and AST building

Location:

src/Parser

Files:

• ExpressionNode.cc (modified) (4 diffs)
• ParseNode.cc (modified) (2 diffs)
• ParseNode.h (modified) (4 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 : Tue Aug 11 15:13:48 2015
-// Update Count     : 200
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed Aug 12 13:51:11 2015
+// Update Count     : 254
 // 
 
@@ -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
 }
 
@@ -295 +312 @@
 }
 
+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 ) {
-                return new NameExpr( get_name(), maybeBuild< Expression >( get_argName() ) );
-        } else {
-                return new NameExpr( get_name(), maybeBuild< Expression >( get_argName() ) );
-        } // if
+                // need to traverse entire structure and change any instances of 0 or 1 to 
+                // ConstantExpr
+                DesignatorFixer fixer;
+                ret = ret->acceptMutator( fixer );
+        } // if
+
+        return ret;
 }
 

src/Parser/ParseNode.cc

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 13:26:29 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul 30 14:55:54 2015
-// Update Count     : 26
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed Aug 12 13:26:00 2015
+// Update Count     : 36
 // 
 
@@ -20 +20 @@
 int ParseNode::indent_by = 4;
 
-ParseNode::ParseNode() : name( 0 ), next( 0 ) {};
-ParseNode::ParseNode( const string *name_ ) : name( name_ ), next( 0 ) {}
+ParseNode::ParseNode() : next( 0 ) {};
+ParseNode::ParseNode( const string *name ) : name( *name ), next( 0 ) { delete name; }
+ParseNode::ParseNode( const string &name ) : name( name ), next( 0 ) { }
 
 ParseNode::~ParseNode() {
-        delete next; delete name;
+        delete next;
 };
 

src/Parser/ParseNode.h

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 13:28:16 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Aug 11 15:11:29 2015
-// Update Count     : 145
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed Aug 12 13:27:11 2015
+// Update Count     : 172
 //
 
@@ -40 +40 @@
         ParseNode();
         ParseNode( const std::string * );
+        ParseNode( const std::string & );  // for copy constructing subclasses
         virtual ~ParseNode();
 
@@ -49 +50 @@
         virtual ParseNode *clone() const { return 0; };
 
-        const std::string &get_name() const { return *name; }
+        const std::string &get_name() const { return name; }
+        void set_name( const std::string &newValue ) { name = newValue; }
+
         virtual void print( std::ostream &, int indent = 0 ) const;
         virtual void printList( std::ostream &, int indent = 0 ) const;
@@ -55 +58 @@
         ParseNode &operator,( ParseNode &);
   protected:
-        const std::string *name;
+        std::string name;
         ParseNode *next;
         static int indent_by;