Changeset 2871210 for src/SynTree/Statement.cc

Timestamp:

Jul 3, 2015, 6:08: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, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc

Children:

f6d7e0f

Parents:

0df292b

Message:

include file with keywords, fix type of label address expressions, fix computed goto to any expressions, generic types first attempt

File:

• src/SynTree/Statement.cc (modified) (9 diffs)

src/SynTree/Statement.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jun 23 11:42:09 2015
-// Update Count     : 21
+// Last Modified On : Mon Jun 29 17:37:10 2015
+// Update Count     : 22
 //
 
@@ -28 +28 @@
 using std::endl;
 
-Statement::Statement( std::list<Label> _labels ) : labels(_labels ) {}
+Statement::Statement( std::list<Label> _labels ) : labels( _labels ) {}
 
 void Statement::print( std::ostream &, int indent ) const {}
@@ -34 +34 @@
 Statement::~Statement() {}
 
-ExprStmt::ExprStmt( std::list<Label> _labels, Expression *_expr ) : Statement(_labels ), expr(_expr ) {}
+ExprStmt::ExprStmt( std::list<Label> _labels, Expression *_expr ) : Statement( _labels ), expr( _expr ) {}
 
 ExprStmt::~ExprStmt() {}
@@ -46 +46 @@
 
 BranchStmt::BranchStmt( std::list<Label> labels, Label _target, Type _type ) throw ( SemanticError ) :
-        Statement( labels ), originalTarget(_target ), target(_target ), type(_type ) {
+        Statement( labels ), originalTarget( _target ), target( _target ), computedTarget( NULL ), type( _type ) {
         //actually this is a syntactic error signaled by the parser
         if ( type == BranchStmt::Goto && target.size() == 0 )
@@ -53 +53 @@
 
 BranchStmt::BranchStmt( std::list<Label> labels, Expression *_computedTarget, Type _type ) throw ( SemanticError ) :
-        Statement( labels ), computedTarget(_computedTarget ), type(_type ) {
+        Statement( labels ), computedTarget( _computedTarget ), type( _type ) {
         if ( type != BranchStmt::Goto || computedTarget == 0 )
                 throw SemanticError("Computed target not valid in branch statement");
@@ -75 +75 @@
 
 IfStmt::IfStmt( std::list<Label> _labels, Expression *_condition, Statement *_thenPart, Statement *_elsePart ):
-        Statement(_labels ), condition(_condition ), thenPart(_thenPart ), elsePart(_elsePart ) {}
+        Statement( _labels ), condition( _condition ), thenPart( _thenPart ), elsePart( _elsePart ) {}
 
 IfStmt::~IfStmt() {}
@@ -93 +93 @@
 
 SwitchStmt::SwitchStmt( std::list<Label> _labels, Expression * _condition, std::list<Statement *> &_branches ):
-        Statement(_labels ), condition(_condition ), branches(_branches ) {
+        Statement( _labels ), condition( _condition ), branches( _branches ) {
 }
 
@@ -117 +117 @@
 
 CaseStmt::CaseStmt( std::list<Label> _labels, Expression *_condition, std::list<Statement *> &_statements, bool deflt ) throw ( SemanticError ) : 
-        Statement(_labels ), condition(_condition ), stmts(_statements ), _isDefault( deflt ) {
+        Statement( _labels ), condition( _condition ), stmts( _statements ), _isDefault( deflt ) {
         if ( isDefault() && condition != 0 )
                 throw SemanticError("default with conditions");
@@ -149 +149 @@
 //ChooseStmt::ChooseStmt( std::list<Label> labels, Expression *condition, Statement *body ) {}
 ChooseStmt::ChooseStmt( std::list<Label> _labels, Expression * _condition, std::list<Statement *> &_branches ):
-        Statement(_labels ), condition(_condition ), branches(_branches ) {
+        Statement( _labels ), condition( _condition ), branches( _branches ) {
 }