Changes in / [43ee2a8:543159b]

Location:

src

Files:

• Parser/ExpressionNode.cc (modified) (4 diffs)
• Parser/ParseNode.cc (modified) (2 diffs)
• Parser/ParseNode.h (modified) (4 diffs)
• SynTree/ArrayType.cc (modified) (2 diffs)
• SynTree/BasicType.cc (modified) (2 diffs)
• SynTree/Expression.cc (modified) (2 diffs)
• SynTree/Initializer.cc (modified) (2 diffs)

src/Parser/ExpressionNode.cc

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 13:17:07 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed Aug 12 13:51:11 2015
-// Update Count     : 254
+// Last Modified By : Peter A. Buhr
+// 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
 }
 

src/Parser/ParseNode.cc

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

src/Parser/ParseNode.h

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

src/SynTree/ArrayType.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed Aug 12 14:19:07 2015
-// Update Count     : 11
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Jun  6 14:11:48 2015
+// Update Count     : 9
 //
 
@@ -50 +50 @@
         } // if
         if ( dimension ) {
-                os << " with dimension of ";
-                dimension->print( os, 0 );
+                os << "with dimension of ";
+                dimension->print( os, indent );
         } // if
 }

src/SynTree/BasicType.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed Aug 12 14:15:45 2015
-// Update Count     : 6
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sun Jun  7 08:44:36 2015
+// Update Count     : 5
 //
 
@@ -28 +28 @@
 
         Type::print( os, indent );
-        os << kindNames[ kind ];
+        os << kindNames[ kind ] << ' ';
 }
 

src/SynTree/Expression.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed Aug 12 14:02:45 2015
-// Update Count     : 30
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul 28 16:27:17 2015
+// Update Count     : 22
 //
 
@@ -72 +72 @@
 
 void ConstantExpr::print( std::ostream &os, int indent ) const {
-        os << std::string( indent, ' ' ) << "constant expression " ;
+        os << "constant expression " ;
         constant.print( os );
         Expression::print( os, indent );
-        os << std::endl;
 }
 

src/SynTree/Initializer.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed Aug 12 14:05:25 2015
-// Update Count     : 14
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Mon May 18 09:02:45 2015
+// Update Count     : 2
 //
 
@@ -43 +43 @@
 
 void SingleInit::print( std::ostream &os, int indent ) {
-        os << std::endl << std::string(indent, ' ' ) << "Simple Initializer: " << std::endl;
-        value->print( os, indent+4 );
+        os << std::endl << std::string(indent, ' ' ) << "Simple Initializer: ";
+        value->print( os, indent+2 );
 
         if ( ! designators.empty() ) {
-                os << std::endl << std::string(indent + 2, ' ' ) << "designated by: "   << std::endl;
-                for ( std::list < Expression * >::iterator i = designators.begin(); i != designators.end(); i++ ) {
+                os << std::endl << std::string(indent + 2, ' ' ) << "designated by: "  ;
+                for ( std::list < Expression * >::iterator i = designators.begin(); i != designators.end(); i++ )
                         ( *i )->print(os, indent + 4 );
-                }
         } // if
 }