Changeset b87e2b6


Ignore:
Timestamp:
Aug 4, 2016, 5:26:20 PM (5 years ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, ctor, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, 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:
3 edited

Legend:

Unmodified
Added
Removed
  • src/Parser/ExpressionNode.cc

    r064e3ff rb87e2b6  
    8383}
    8484
    85 CommaExprNode *ExpressionNode::add_to_list( ExpressionNode *exp ) {
    86         return new CommaExprNode( this, exp );
    87 }
     85// CommaExprNode *ExpressionNode::add_to_list( ExpressionNode *exp ) {
     86//      return new CommaExprNode( this, exp );
     87// }
    8888
    8989//##############################################################################
     
    593593}
    594594
    595 CommaExprNode *CommaExprNode::add_to_list( ExpressionNode *exp ) {
    596         add_arg( exp );
    597 
    598         return this;
    599 }
     595// CommaExprNode *CommaExprNode::add_to_list( ExpressionNode *exp ) {
     596//      add_arg( exp );
     597//
     598//      return this;
     599// }
    600600
    601601CommaExprNode::CommaExprNode( const CommaExprNode &other ) : CompositeExprNode( other ) {
  • src/Parser/ParseNode.h

    r064e3ff rb87e2b6  
    7777        virtual ExpressionNode *clone() const = 0;
    7878
    79         virtual CommaExprNode *add_to_list( ExpressionNode * );
     79        // virtual CommaExprNode *add_to_list( ExpressionNode * );
    8080
    8181        ExpressionNode *get_argName() const { return argName; }
     
    322322        CommaExprNode( const CommaExprNode &other );
    323323
    324         virtual CommaExprNode *add_to_list( ExpressionNode * );
     324        // virtual CommaExprNode *add_to_list( ExpressionNode * );
    325325        virtual CommaExprNode *clone() const { return new CommaExprNode( *this ); }
    326326};
     
    508508        std::string get_target() const;
    509509
    510         StatementNode *add_controlexp( ExpressionNode * );
     510        // StatementNode *add_controlexp( ExpressionNode * );
    511511        StatementNode *append_block( StatementNode * );
    512512        StatementNode *append_last_case( StatementNode * );
  • src/Parser/StatementNode.cc

    r064e3ff rb87e2b6  
    107107}
    108108
    109 StatementNode *StatementNode::add_controlexp( ExpressionNode *e ) {
    110         if ( control && e )
    111                 control->add_to_list( e ); // xxx - check this
    112         return this;
    113 }
     109// StatementNode *StatementNode::add_controlexp( ExpressionNode *e ) {
     110//      if ( control && e )
     111//              control->add_to_list( e ); // xxx - check this
     112//      return this;
     113// }
    114114
    115115StatementNode *StatementNode::append_block( StatementNode *stmt ) {
Note: See TracChangeset for help on using the changeset viewer.