Changes in src/Parser/ParseNode.h [8cc5cb0:777bfcf]

File:

• src/Parser/ParseNode.h (modified) (12 diffs)

src/Parser/ParseNode.h

@@ -10 +10 @@
 // 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 +45 @@
         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 +92 @@
         ExpressionNode *expr;
         bool aggregate;
-        ExpressionNode *designator; // may be list
+        ExpressionNode *designator;                                                     // may be list
         InitializerNode *kids;
         bool maybeConstructed;
@@ -336 +336 @@
 
         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 +345 @@
 
         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<std::string> 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 +372 @@
                 return this;
         }
+        virtual std::list<std::string> get_labels() const { assert( false ); return StatementNode::get_labels(); }
+
         virtual StatementNode *append_last_case( StatementNode * );
-        virtual std::list<std::string> get_labels() const { assert( false ); return StatementNode::get_labels(); }
 
         virtual void print( std::ostream &os, int indent = 0 ) {}
@@ -401 +382 @@
 }; // 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 +395 @@
 };
 
-Statement *build_expr( ExpressionNode *ctl );
 Statement *build_if( ExpressionNode *ctl, StatementNode *then_stmt, StatementNode *else_stmt );
 Statement *build_switch( ExpressionNode *ctl, StatementNode *stmt );
@@ -423 +405 @@
 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 +414 @@
   public:
         CompoundStmtNode();
-        CompoundStmtNode( const std::string * );
         CompoundStmtNode( StatementNode * );
         ~CompoundStmtNode();
@@ -445 +429 @@
 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 +461 @@
                         errors.append( e );
                 } // try
-                cur = dynamic_cast< NodeType *>( cur->get_link() );
+                cur = dynamic_cast< NodeType *>( cur->get_next() );
         } // while
         if ( ! errors.isEmpty() ) {