Changeset 6a276a0 for src/SynTree

Timestamp:

Mar 14, 2018, 1:19:39 PM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, with_gc

Children:

720a007

Parents:

e2c70ab

Message:

Update parser for new fallthrough semantics

Location:

src/SynTree

Files:

• Statement.cc (modified) (4 diffs)
• Statement.h (modified) (2 diffs)

src/SynTree/Statement.cc

@@ -34 +34 @@
 Statement::Statement( const std::list<Label> & labels ) : labels( labels ) {}
 
-void Statement::print( std::ostream & os, Indenter ) const {
+void Statement::print( std::ostream & os, Indenter indent ) const {
         if ( ! labels.empty() ) {
-                os << "Labels: {";
+                os << indent << "... Labels: {";
                 for ( const Label & l : labels ) {
                         os << l << ",";
@@ -223 +223 @@
 
 void CaseStmt::print( std::ostream &os, Indenter indent ) const {
-        if ( isDefault() ) os << "Default ";
+        if ( isDefault() ) os << indent << "Default ";
         else {
-                os << "Case ";
+                os << indent << "Case ";
                 condition->print( os, indent );
         } // if
@@ -231 +231 @@
 
         for ( Statement * stmt : stmts ) {
+                os << indent+1;
                 stmt->print( os, indent+1 );
         }
@@ -478 +479 @@
 }
 
-void NullStmt::print( std::ostream &os, Indenter ) const {
+void NullStmt::print( std::ostream &os, Indenter indent ) const {
         os << "Null Statement" << endl;
+        Statement::print( os, indent );
 }
 

src/SynTree/Statement.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Sep  3 20:46:46 2017
-// Update Count     : 77
+// Last Modified On : Thu Mar  8 14:53:02 2018
+// Update Count     : 78
 //
 
@@ -255 +255 @@
 class BranchStmt : public Statement {
   public:
-        enum Type { Goto = 0, Break, Continue };
+        enum Type { Goto = 0, Break, Continue, FallThrough, FallThroughDefault };
 
         // originalTarget kept for error messages.