Changeset 71a3593 for src/Parser

Timestamp:

Aug 5, 2016, 12:06:29 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

d9e2280

Parents:

9706554 (diff), a2f920f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg2:software/cfa/cfa-cc

Location:

src/Parser

Files:

• ExpressionNode.cc (modified) (1 diff)
• ParseNode.h (modified) (2 diffs)
• StatementNode.cc (modified) (1 diff)
• TypeData.cc (modified) (1 diff)

src/Parser/ExpressionNode.cc

@@ -529 +529 @@
 //##############################################################################
 
-CommaExprNode::CommaExprNode(): CompositeExprNode( new OperatorNode( OperatorNode::Comma )) {}
-
-CommaExprNode::CommaExprNode( ExpressionNode *exp ) : CompositeExprNode( new OperatorNode( OperatorNode::Comma ), exp ) {
-}
-
-CommaExprNode::CommaExprNode( ExpressionNode *exp1, ExpressionNode *exp2) : CompositeExprNode( new OperatorNode( OperatorNode::Comma ), exp1, exp2) {
-}
-
-// CommaExprNode *CommaExprNode::add_to_list( ExpressionNode *exp ) {
-//      add_arg( exp );
-//
-//      return this;
-// }
-
-CommaExprNode::CommaExprNode( const CommaExprNode &other ) : CompositeExprNode( other ) {
-}
-
-//##############################################################################
-
 ValofExprNode::ValofExprNode( StatementNode *s ): body( s ) {}
 

src/Parser/ParseNode.h

@@ -324 +324 @@
   private:
         std::list< Label > labels;
-};
-
-class CommaExprNode : public CompositeExprNode {
-  public:
-        CommaExprNode();
-        CommaExprNode( ExpressionNode * );
-        CommaExprNode( ExpressionNode *, ExpressionNode * );
-        CommaExprNode( const CommaExprNode &other );
-
-        // virtual CommaExprNode *add_to_list( ExpressionNode * );
-        virtual CommaExprNode *clone() const { return new CommaExprNode( *this ); }
 };
 
@@ -567 +556 @@
 };
 
-class NullStmtNode : public CompoundStmtNode {
-  public:
-        Statement *build() const;
-        void print( std::ostream &, int indent = 0 ) const;
-};
-
 class InitializerNode : public ParseNode {
   public:

src/Parser/StatementNode.cc

@@ -417 +417 @@
 }
 
-
-void NullStmtNode::print( ostream &os, int indent ) const {
-        os << string( indent, ' ' ) << "Null Statement:" << endl;
-}
-
-Statement *NullStmtNode::build() const {
-        return new NullStmt;
-}
-
 // Local Variables: //
 // tab-width: 4 //

src/Parser/TypeData.cc

@@ -510 +510 @@
                 return buildVariable();
         } else {
-                return new ObjectDecl( name, sc, linkage, bitfieldWidth, build(), init, isInline, isNoreturn );
+                return new ObjectDecl( name, sc, linkage, bitfieldWidth, build(), init, std::list< Attribute * >(),  isInline, isNoreturn );
         } // if
         return 0;