Index: src/Parser/DeclarationNode.cc =================================================================== --- src/Parser/DeclarationNode.cc (revision 387368546018aa1d0ac996c3a245f916a26a8cd2) +++ src/Parser/DeclarationNode.cc (revision 6603c1dbfb45fe26d6acd74a1e2ed275886ab34e) @@ -10,6 +10,6 @@ // Created On : Sat May 16 12:34:05 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Tue Aug 9 08:39:20 2016 -// Update Count : 169 +// Last Modified On : Sat Aug 13 18:56:58 2016 +// Update Count : 171 // @@ -470,6 +470,6 @@ // there may be typedefs chained onto the type - if ( o->get_link() ) { - set_link( o->get_link()->clone() ); + if ( o->get_next() ) { + set_last( o->get_next()->clone() ); } // if } // if @@ -757,5 +757,5 @@ DeclarationNode *DeclarationNode::appendList( DeclarationNode *node ) { if ( node != 0 ) { - set_link( node ); + set_last( node ); } // if return this; @@ -794,5 +794,5 @@ errors.append( e ); } // try - cur = dynamic_cast( cur->get_link() ); + cur = dynamic_cast( cur->get_next() ); } // while if ( ! errors.isEmpty() ) { @@ -831,5 +831,5 @@ errors.append( e ); } // try - cur = dynamic_cast< DeclarationNode *>( cur->get_link() ); + cur = dynamic_cast< DeclarationNode *>( cur->get_next() ); } // while if ( ! errors.isEmpty() ) { @@ -848,5 +848,5 @@ errors.append( e ); } // try - cur = dynamic_cast< DeclarationNode *>( cur->get_link() ); + cur = dynamic_cast< DeclarationNode *>( cur->get_next() ); } // while if ( ! errors.isEmpty() ) { Index: src/Parser/ExpressionNode.cc =================================================================== --- src/Parser/ExpressionNode.cc (revision 387368546018aa1d0ac996c3a245f916a26a8cd2) +++ src/Parser/ExpressionNode.cc (revision 6603c1dbfb45fe26d6acd74a1e2ed275886ab34e) @@ -10,6 +10,6 @@ // Created On : Sat May 16 13:17:07 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Wed Aug 10 11:07:38 2016 -// Update Count : 486 +// Last Modified On : Thu Aug 11 20:24:36 2016 +// Update Count : 487 // @@ -309,57 +309,4 @@ //############################################################################## - -// ForCtlExprNode::ForCtlExprNode( ParseNode *init_, ExpressionNode *cond, ExpressionNode *incr ) throw ( SemanticError ) : condition( cond ), change( incr ) { -// if ( init_ == 0 ) -// init = 0; -// else { -// DeclarationNode *decl; -// ExpressionNode *exp; - -// if (( decl = dynamic_cast(init_) ) != 0) -// init = new StatementNode( decl ); -// else if (( exp = dynamic_cast( init_)) != 0) -// init = new StatementNode( StatementNode::Exp, exp ); -// else -// throw SemanticError("Error in for control expression"); -// } -// } - -// ForCtlExprNode::ForCtlExprNode( const ForCtlExprNode &other ) -// : ExpressionNode( other ), init( maybeClone( other.init ) ), condition( maybeClone( other.condition ) ), change( maybeClone( other.change ) ) { -// } - -// ForCtlExprNode::~ForCtlExprNode() { -// delete init; -// delete condition; -// delete change; -// } - -// Expression *ForCtlExprNode::build() const { -// // this shouldn't be used! -// assert( false ); -// return 0; -// } - -// void ForCtlExprNode::print( std::ostream &os, int indent ) const{ -// os << string( indent,' ' ) << "For Control Expression -- :" << endl; - -// os << string( indent + 2, ' ' ) << "initialization:" << endl; -// if ( init != 0 ) -// init->printList( os, indent + 4 ); - -// os << string( indent + 2, ' ' ) << "condition: " << endl; -// if ( condition != 0 ) -// condition->print( os, indent + 4 ); -// os << string( indent + 2, ' ' ) << "increment: " << endl; -// if ( change != 0 ) -// change->print( os, indent + 4 ); -// } - -// void ForCtlExprNode::printOneLine( std::ostream &, int indent ) const { -// assert( false ); -// } - -//############################################################################## Expression *build_typevalue( DeclarationNode *decl ) { Index: src/Parser/InitializerNode.cc =================================================================== --- src/Parser/InitializerNode.cc (revision 387368546018aa1d0ac996c3a245f916a26a8cd2) +++ src/Parser/InitializerNode.cc (revision 6603c1dbfb45fe26d6acd74a1e2ed275886ab34e) @@ -10,6 +10,6 @@ // Created On : Sat May 16 13:20:24 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Mon Jul 4 15:37:15 2016 -// Update Count : 15 +// Last Modified On : Sat Aug 13 18:55:11 2016 +// Update Count : 18 // @@ -25,8 +25,8 @@ : expr( _expr ), aggregate( aggrp ), designator( des ), kids( 0 ), maybeConstructed( true ) { if ( aggrp ) - kids = dynamic_cast< InitializerNode *>( get_link() ); + kids = dynamic_cast< InitializerNode *>( get_next() ); if ( kids != 0 ) - set_link( 0 ); + set_last( 0 ); } @@ -34,8 +34,8 @@ : expr( 0 ), aggregate( aggrp ), designator( des ), kids( 0 ), maybeConstructed( true ) { if ( init != 0 ) - set_link(init); + set_last( init ); if ( aggrp ) - kids = dynamic_cast< InitializerNode *>( get_link() ); + kids = dynamic_cast< InitializerNode *>( get_next() ); if ( kids != 0 ) @@ -58,5 +58,5 @@ while ( curdes != 0) { curdes->printOneLine(os); - curdes = (ExpressionNode *)(curdes->get_link()); + curdes = (ExpressionNode *)(curdes->get_next()); if ( curdes ) os << ", "; } // while @@ -72,5 +72,5 @@ InitializerNode *moreInit; - if ( get_link() != 0 && ((moreInit = dynamic_cast< InitializerNode * >( get_link() ) ) != 0) ) + if ( get_next() != 0 && ((moreInit = dynamic_cast< InitializerNode * >( get_next() ) ) != 0) ) moreInit->printOneLine( os ); } Index: src/Parser/ParseNode.cc =================================================================== --- src/Parser/ParseNode.cc (revision 387368546018aa1d0ac996c3a245f916a26a8cd2) +++ src/Parser/ParseNode.cc (revision 6603c1dbfb45fe26d6acd74a1e2ed275886ab34e) @@ -10,6 +10,6 @@ // Created On : Sat May 16 13:26:29 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Sun Aug 7 23:32:47 2016 -// Update Count : 94 +// Last Modified On : Sat Aug 13 18:55:35 2016 +// Update Count : 98 // @@ -31,11 +31,10 @@ ParseNode *current = this; - while ( current->get_link() != 0 ) - current = current->get_link(); - + while ( current->get_next() != 0 ) + current = current->get_next(); return current; } -ParseNode *ParseNode::set_link( ParseNode *next_ ) { +ParseNode *ParseNode::set_last( ParseNode *next_ ) { if ( next_ != 0 ) get_last()->next = next_; return this; @@ -54,6 +53,5 @@ ParseNode &ParseNode::operator,( ParseNode &p ) { - set_link( &p ); - + set_last( &p ); return *this; } Index: src/Parser/ParseNode.h =================================================================== --- src/Parser/ParseNode.h (revision 387368546018aa1d0ac996c3a245f916a26a8cd2) +++ src/Parser/ParseNode.h (revision 6603c1dbfb45fe26d6acd74a1e2ed275886ab34e) @@ -10,6 +10,6 @@ // Created On : Sat May 16 13:28:16 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Thu Aug 11 12:24:11 2016 -// Update Count : 443 +// Last Modified On : Sun Aug 14 16:29:20 2016 +// Update Count : 483 // @@ -45,8 +45,8 @@ virtual ~ParseNode(); - ParseNode *get_link() const { return next; } + ParseNode *get_next() const { return next; } + ParseNode *set_next( ParseNode *newlink ) { next = newlink; return this; } ParseNode *get_last(); - ParseNode *set_link( ParseNode * ); - void set_next( ParseNode *newlink ) { next = newlink; } + ParseNode *set_last( ParseNode * ); virtual ParseNode *clone() const { return 0; }; @@ -92,5 +92,5 @@ ExpressionNode *expr; bool aggregate; - ExpressionNode *designator; // may be list + ExpressionNode *designator; // may be list InitializerNode *kids; bool maybeConstructed; @@ -336,18 +336,6 @@ StatementNode(); - StatementNode( const std::string *name ); - StatementNode( Type t, ExpressionNode *control = 0, StatementNode *block = 0 ); - StatementNode( Type t, std::string *target ); StatementNode( DeclarationNode *decl ); - ~StatementNode(); - - static StatementNode *newCatchStmt( DeclarationNode *d = 0, StatementNode *s = 0, bool catchRestP = false ); - - StatementNode *set_block( StatementNode *b ) { block = b; return this; } - StatementNode *get_block() const { return block; } - - void set_control( ExpressionNode *c ) { control = c; } - ExpressionNode *get_control() const { return control; } StatementNode::Type get_type() const { return type; } @@ -357,30 +345,22 @@ void addDeclaration( DeclarationNode *newDecl ) { decl = newDecl; } - void setCatchRest( bool newVal ) { isCatchRest = newVal; } - - std::string get_target() const; - - // StatementNode *add_controlexp( ExpressionNode * ); - StatementNode *append_block( StatementNode * ); + virtual StatementNode *append_last_case( StatementNode * ); - void print( std::ostream &os, int indent = 0) const; + virtual void print( std::ostream &os, int indent = 0) const {} virtual StatementNode *clone() const; virtual Statement *build() const; - private: + public: static const char *StType[]; Type type; - ExpressionNode *control; - StatementNode *block; std::list labels; - std::string *target; // target label for jump statements DeclarationNode *decl; - bool isCatchRest; }; // StatementNode class StatementNode2 : public StatementNode { public: - StatementNode2() {} + StatementNode2() { stmt = nullptr; } StatementNode2( Statement *stmt ) : stmt( stmt ) {} + StatementNode2( DeclarationNode *decl ); virtual ~StatementNode2() {} @@ -392,6 +372,7 @@ return this; } + virtual std::list get_labels() const { assert( false ); return StatementNode::get_labels(); } + virtual StatementNode *append_last_case( StatementNode * ); - virtual std::list get_labels() const { assert( false ); return StatementNode::get_labels(); } virtual void print( std::ostream &os, int indent = 0 ) {} @@ -401,9 +382,11 @@ }; // StatementNode +Statement *build_expr( ExpressionNode *ctl ); + struct ForCtl { ForCtl( ExpressionNode *expr, ExpressionNode *condition, ExpressionNode *change ) : - init( new StatementNode( StatementNode::Exp, expr ) ), condition( condition ), change( change ) {} + init( new StatementNode2( build_expr( expr ) ) ), condition( condition ), change( change ) {} ForCtl( DeclarationNode *decl, ExpressionNode *condition, ExpressionNode *change ) : - init( new StatementNode( decl ) ), condition( condition ), change( change ) {} + init( new StatementNode2( decl ) ), condition( condition ), change( change ) {} StatementNode *init; @@ -412,5 +395,4 @@ }; -Statement *build_expr( ExpressionNode *ctl ); Statement *build_if( ExpressionNode *ctl, StatementNode *then_stmt, StatementNode *else_stmt ); Statement *build_switch( ExpressionNode *ctl, StatementNode *stmt ); @@ -423,4 +405,7 @@ Statement *build_return( ExpressionNode *ctl ); Statement *build_throw( ExpressionNode *ctl ); +Statement *build_try( StatementNode *try_stmt, StatementNode *catch_stmt, StatementNode *finally_stmt ); +Statement *build_catch( DeclarationNode *decl, StatementNode *stmt, bool catchAny = false ); +Statement *build_finally( StatementNode *stmt ); //############################################################################## @@ -429,5 +414,4 @@ public: CompoundStmtNode(); - CompoundStmtNode( const std::string * ); CompoundStmtNode( StatementNode * ); ~CompoundStmtNode(); @@ -445,8 +429,8 @@ class AsmStmtNode : public StatementNode { public: - AsmStmtNode( Type, bool voltile, ConstantExpr *instruction, ExpressionNode *output = 0, ExpressionNode *input = 0, ExpressionNode *clobber = 0, LabelNode *gotolabels = 0 ); + AsmStmtNode( bool voltile, ConstantExpr *instruction, ExpressionNode *output = 0, ExpressionNode *input = 0, ExpressionNode *clobber = 0, LabelNode *gotolabels = 0 ); ~AsmStmtNode(); - void print( std::ostream &os, int indent = 0 ) const; + void print( std::ostream &os, int indent = 0 ) const {} Statement *build() const; private: @@ -477,5 +461,5 @@ errors.append( e ); } // try - cur = dynamic_cast< NodeType *>( cur->get_link() ); + cur = dynamic_cast< NodeType *>( cur->get_next() ); } // while if ( ! errors.isEmpty() ) { Index: src/Parser/StatementNode.cc =================================================================== --- src/Parser/StatementNode.cc (revision 387368546018aa1d0ac996c3a245f916a26a8cd2) +++ src/Parser/StatementNode.cc (revision 6603c1dbfb45fe26d6acd74a1e2ed275886ab34e) @@ -10,6 +10,6 @@ // Created On : Sat May 16 14:59:41 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Thu Aug 11 16:19:45 2016 -// Update Count : 210 +// Last Modified On : Sun Aug 14 13:10:54 2016 +// Update Count : 288 // @@ -34,9 +34,8 @@ }; -StatementNode::StatementNode() : ParseNode(), control( 0 ), block( 0 ), labels( 0 ), target( 0 ), decl( 0 ), isCatchRest ( false ) {} - -StatementNode::StatementNode( const string *name ) : ParseNode( name ), control( 0 ), block( 0 ), labels( 0 ), target( 0 ), decl( 0 ), isCatchRest ( false ) {} - -StatementNode::StatementNode( DeclarationNode *decl ) : type( Decl ), control( 0 ), block( 0 ), labels( 0 ), target( 0 ), isCatchRest ( false ) { +StatementNode::StatementNode() : ParseNode(), labels( 0 ), decl( 0 ) {} + +StatementNode::StatementNode( DeclarationNode *decl ) : type( Decl ), labels( 0 ) { + assert( false ); if ( decl ) { if ( DeclarationNode *agg = decl->extractAggregate() ) { @@ -46,11 +45,11 @@ nextStmt->decl = decl; next = nextStmt; - if ( decl->get_link() ) { - next->set_next( new StatementNode( dynamic_cast< DeclarationNode* >( decl->get_link() ) ) ); + if ( decl->get_next() ) { + next->set_next( new StatementNode( dynamic_cast( decl->get_next() ) ) ); decl->set_next( 0 ); } // if } else { - if ( decl->get_link() ) { - next = new StatementNode( dynamic_cast< DeclarationNode* >( decl->get_link() ) ); + if ( decl->get_next() ) { + next = new StatementNode( dynamic_cast( decl->get_next() ) ); decl->set_next( 0 ); } // if @@ -60,41 +59,36 @@ } -StatementNode::StatementNode( Type t, ExpressionNode *ctrl_label, StatementNode *block ) : type( t ), control( ctrl_label ), block( block ), labels( 0 ), target( 0 ), decl( 0 ), isCatchRest ( false ) { - this->control = ( t == Default ) ? 0 : control; -} - -StatementNode::StatementNode( Type t, string *target ) : type( t ), control( 0 ), block( 0 ), labels( 0 ), target( target ), decl( 0 ), isCatchRest ( false ) {} +StatementNode2::StatementNode2( DeclarationNode *decl ) { + if ( decl ) { + DeclarationNode *agg = decl->extractAggregate(); + if ( agg ) { + StatementNode *nextStmt = new StatementNode; + nextStmt->type = Decl; + nextStmt->decl = decl; + next = nextStmt; + if ( decl->get_next() ) { + next->set_next( new StatementNode2( dynamic_cast(decl->get_next()) ) ); + decl->set_next( 0 ); + } // if + } else { + if ( decl->get_next() ) { + next = new StatementNode2( dynamic_cast( decl->get_next() ) ); + decl->set_next( 0 ); + } // if + agg = decl; + } // if + stmt = new DeclStmt( noLabels, maybeBuild(agg) ); + } else { + assert( false ); + } // if +} StatementNode::~StatementNode() { - delete control; - delete block; - delete target; delete decl; } -StatementNode * StatementNode::newCatchStmt( DeclarationNode *d, StatementNode *s, bool catchRestP ) { - StatementNode *ret = new StatementNode( StatementNode::Catch, 0, s ); - ret->addDeclaration( d ); - ret->setCatchRest( catchRestP ); - - return ret; -} - -std::string StatementNode::get_target() const{ - if ( target ) - return *target; - - return string(""); -} - StatementNode * StatementNode::clone() const { - StatementNode *newnode = new StatementNode( type, maybeClone( control ), maybeClone( block ) ); - if ( target ) { - newnode->target = new string( *target ); - } else { - newnode->target = 0; - } // if - newnode->decl = maybeClone( decl ); - return newnode; + assert( false ); + return 0; } @@ -107,26 +101,6 @@ } -StatementNode *StatementNode::append_block( StatementNode *stmt ) { - if ( stmt != 0 ) { - if ( block == 0 ) - block = stmt; - else - block->set_link( stmt ); - } // if - return this; -} - StatementNode *StatementNode::append_last_case( StatementNode *stmt ) { assert( false ); - if ( stmt != 0 ) { - StatementNode *next = ( StatementNode *)get_link(); - if ( next && ( next->get_type() == StatementNode::Case || next->get_type() == StatementNode::Default ) ) - next->append_last_case( stmt ); - else - if ( block == 0 ) - block = stmt; - else - block->set_link( stmt ); - } // if return this; } @@ -134,5 +108,6 @@ StatementNode *StatementNode2::append_last_case( StatementNode *stmt ) { StatementNode *prev = this; - for ( StatementNode * curr = prev; curr != nullptr; curr = (StatementNode *)curr->get_link() ) { + // find end of list and maintain previous pointer + for ( StatementNode * curr = prev; curr != nullptr; curr = (StatementNode *)curr->get_next() ) { StatementNode2 *node = dynamic_cast(curr); assert( node ); @@ -140,195 +115,38 @@ prev = curr; } // for + // conver from StatementNode list to Statement list StatementNode2 *node = dynamic_cast(prev); std::list stmts; buildList( stmt, stmts ); - CaseStmt * caseStmt; - caseStmt = dynamic_cast(node->stmt); + // splice any new Statements to end of currents Statements + CaseStmt * caseStmt = dynamic_cast(node->stmt); caseStmt->get_statements().splice( caseStmt->get_statements().end(), stmts ); return this; } -void StatementNode::print( std::ostream &os, int indent ) const { - if ( ! labels.empty() ) { - std::list::const_iterator i; - - os << string( indent, ' ' ); - for ( i = labels.begin(); i != labels.end(); i++ ) - os << *i << ":"; - os << endl; - } // if - +Statement *StatementNode::build() const { switch ( type ) { case Decl: - decl->print( os, indent ); - break; + return new DeclStmt( noLabels, maybeBuild< Declaration >( decl ) ); + assert( false ); case Exp: - if ( control ) { - os << string( indent, ' ' ); - control->print( os, indent ); - os << endl; - } else - os << string( indent, ' ' ) << "Null Statement" << endl; - break; - default: - os << string( indent, ' ' ) << StatementNode::StType[type] << endl; - if ( type == Catch ) { - if ( decl ) { - os << string( indent + ParseNode::indent_by, ' ' ) << "Declaration: " << endl; - decl->print( os, indent + 2 * ParseNode::indent_by ); - } else if ( isCatchRest ) { - os << string( indent + ParseNode::indent_by, ' ' ) << "Catches the rest " << endl; - } else { - ; // should never reach here - } // if - } // if - if ( control ) { - os << string( indent + ParseNode::indent_by, ' ' ) << "Control: " << endl; - control->printList( os, indent + 2 * ParseNode::indent_by ); - } // if - if ( block ) { - os << string( indent + ParseNode::indent_by, ' ' ) << "Cases: " << endl; - block->printList( os, indent + 2 * ParseNode::indent_by ); - } // if - if ( target ) { - os << string( indent + ParseNode::indent_by, ' ' ) << "Target: " << get_target() << endl; - } // if - break; - } // switch -} - -Statement *StatementNode::build() const { - std::list branches; - std::list exps; - std::list