Changeset be5aa1b for src/SynTree

Timestamp:

May 27, 2015, 4:40:05 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

46cbfe1, 52ac3b4

Parents:

6aa5ec0f

Message:

error if continue statement targets a location that is not an enclosing loop, better error messages for branch statements with labels, formatting, refactoring

Location:

src/SynTree

Files:

• Statement.cc (modified) (3 diffs)
• Statement.h (modified) (3 diffs)

src/SynTree/Statement.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon May 18 10:55:19 2015
-// Update Count     : 2
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed May 27 15:41:13 2015
+// Update Count     : 8
 //
 
@@ -46 +46 @@
 
 BranchStmt::BranchStmt( std::list<Label> labels, Label _target, Type _type ) throw ( SemanticError ) :
-        Statement( labels ), target(_target ), type(_type ) {
+        Statement( labels ), originalTarget(_target ), target(_target ), type(_type ) {
         //actually this is a syntactic error signaled by the parser
         if ( type == BranchStmt::Goto && target.size() == 0 )
@@ -200 +200 @@
 
 void ForStmt::print( std::ostream &os, int indent ) {
+        os << "\r" << string( indent, ' ') << "Labels: {";
+        for (std::list<Label>::iterator it = get_labels().begin(); it != get_labels().end(); ++it) {
+                os << *it << ",";
+        }
+        os << "}" << endl;
+
         os << "\r" << string( indent, ' ') << "For Statement" << endl ;
 

src/SynTree/Statement.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon May 18 10:57:40 2015
-// Update Count     : 2
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed May 27 15:40:43 2015
+// Update Count     : 5
 //
 
@@ -227 +227 @@
         virtual ~BranchStmt() {}
 
+        Label get_originalTarget() { return originalTarget; }
         Label get_target() { return target; }
         void set_target( Label newValue ) { target = newValue; }
@@ -242 +243 @@
   private:
         static const char *brType[];
+        Label originalTarget;  // can give better error messages if we remember the label name that the user entered
         Label target;
         Expression *computedTarget;