Changeset b87e2b60

Timestamp:

Aug 4, 2016, 5:26:20 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:

51e076e

Parents:

064e3ff (diff), cf37a8e (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) (2 diffs)
• ParseNode.h (modified) (3 diffs)
• StatementNode.cc (modified) (1 diff)

src/Parser/ExpressionNode.cc ¶

@@ -83 +83 @@
 }
 
-CommaExprNode *ExpressionNode::add_to_list( ExpressionNode *exp ) {
-        return new CommaExprNode( this, exp );
-}
+// CommaExprNode *ExpressionNode::add_to_list( ExpressionNode *exp ) {
+//      return new CommaExprNode( this, exp );
+// }
 
 //##############################################################################
@@ -593 +593 @@
 }
 
-CommaExprNode *CommaExprNode::add_to_list( ExpressionNode *exp ) {
-        add_arg( exp );
-
-        return this;
-}
+// CommaExprNode *CommaExprNode::add_to_list( ExpressionNode *exp ) {
+//      add_arg( exp );
+//
+//      return this;
+// }
 
 CommaExprNode::CommaExprNode( const CommaExprNode &other ) : CompositeExprNode( other ) {

src/Parser/ParseNode.h ¶

@@ -77 +77 @@
         virtual ExpressionNode *clone() const = 0;
 
-        virtual CommaExprNode *add_to_list( ExpressionNode * );
+        // virtual CommaExprNode *add_to_list( ExpressionNode * );
 
         ExpressionNode *get_argName() const { return argName; }
@@ -322 +322 @@
         CommaExprNode( const CommaExprNode &other );
 
-        virtual CommaExprNode *add_to_list( ExpressionNode * );
+        // virtual CommaExprNode *add_to_list( ExpressionNode * );
         virtual CommaExprNode *clone() const { return new CommaExprNode( *this ); }
 };
@@ -508 +508 @@
         std::string get_target() const;
 
-        StatementNode *add_controlexp( ExpressionNode * );
+        // StatementNode *add_controlexp( ExpressionNode * );
         StatementNode *append_block( StatementNode * );
         StatementNode *append_last_case( StatementNode * );

src/Parser/StatementNode.cc ¶

@@ -107 +107 @@
 }
 
-StatementNode *StatementNode::add_controlexp( ExpressionNode *e ) {
-        if ( control && e )
-                control->add_to_list( e ); // xxx - check this
-        return this;
-}
+// StatementNode *StatementNode::add_controlexp( ExpressionNode *e ) {
+//      if ( control && e )
+//              control->add_to_list( e ); // xxx - check this
+//      return this;
+// }
 
 StatementNode *StatementNode::append_block( StatementNode *stmt ) {