Changeset 406a6e6

Timestamp:

Aug 14, 2017, 2:44:40 PM (7 years ago)

Author:

Andrew Beach <ajbeach@…>

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, resolv-new, with_gc

Children:

6a36975

Parents:

bd46af4

Message:

Working on exception related readablility.

Location:

src

Files:

• SynTree/Statement.cc (modified) (5 diffs)
• tests/except-2.c (modified) (4 diffs)

src/SynTree/Statement.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Mon Jun 12 10:37:00 2017
-// Update Count     : 64
+// Last Modified On : Mon Aug 14 12:26:00 2017
+// Update Count     : 65
 //
 
@@ -329 +329 @@
 void TryStmt::print( std::ostream &os, int indent ) const {
         os << "Try Statement" << endl;
-        os << string( indent + 2, ' ' ) << "with block: " << endl;
+        os << string( indent + 2, ' ' ) << "with block:" << endl;
+        os << string( indent + 4, ' ' );
         block->print( os, indent + 4 );
 
         // handlers
-        os << string( indent + 2, ' ' ) << "and handlers: " << endl;
-        for ( std::list<CatchStmt *>::const_iterator i = handlers.begin(); i != handlers.end(); i++)
+        os << string( indent + 2, ' ' ) << "and handlers:" << endl;
+        for ( std::list<CatchStmt *>::const_iterator i = handlers.begin(); i != handlers.end(); i++) {
+                os << string( indent + 4, ' ' );
                 (*i )->print( os, indent + 4 );
+        }
 
         // finally block
         if ( finallyBlock != 0 ) {
-                os << string( indent + 2, ' ' ) << "Finally block: " << endl;
+                os << string( indent + 2, ' ' ) << "and finally:" << endl;
                 finallyBlock->print( os, indent + 4 );
         } // if
@@ -360 +363 @@
         os << "Catch " << ((Terminate == kind) ? "Terminate" : "Resume") << " Statement" << endl;
 
-        os << string( indent, ' ' ) << "... catching" << endl;
+        os << string( indent + 2, ' ' ) << "... catching: ";
         if ( decl ) {
                 decl->printShort( os, indent + 4 );
@@ -367 +370 @@
         else
                 os << string( indent + 4 , ' ' ) << ">>> Error:  this catch clause must have a declaration <<<" << endl;
+
+        if ( cond ) {
+                os << string( indent + 2, ' ' ) << "with conditional:" << endl;
+                os << string( indent + 4, ' ' );
+                cond->print( os, indent + 4 );
+        }
+        else
+                os << string( indent + 2, ' ' ) << "with no conditional" << endl;
+
+        os << string( indent + 2, ' ' ) << "with block:" << endl;
+        os << string( indent + 4, ' ' );
+        body->print( os, indent + 4 );
 }
 
@@ -383 +398 @@
 void FinallyStmt::print( std::ostream &os, int indent ) const {
         os << "Finally Statement" << endl;
-        os << string( indent + 2, ' ' ) << "with block: " << endl;
+        os << string( indent + 2, ' ' ) << "with block:" << endl;
+        os << string( indent + 4, ' ' );
         block->print( os, indent + 4 );
 }

src/tests/except-2.c

@@ -5 +5 @@
 
 // Local Exception Types and manual vtable types.
+#define GLUE2(left, right) left##right
+#define GLUE3(left, middle, right) left##middle##right
 #define BASE_EXCEPT __cfaehm__base_exception_t
-#define TABLE(name) name##_vtable
-#define INSTANCE(name) _##name##_vtable_instance
+#define TABLE(name) GLUE2(name,_vtable)
+#define INSTANCE(name) GLUE3(_,name,_vtable_instance)
 #define TRIVIAL_EXCEPTION(name) \
 struct name; \
 struct TABLE(name) { \
-        struct __cfaehm__base_exception_t_vtable const * parent; \
+        struct TABLE(BASE_EXCEPT) const * parent; \
         size_t size; \
         void (*copy)(name *this, name * other); \
@@ -28 +30 @@
 } \
 TABLE(name) INSTANCE(name) @= { \
-        .parent : &INSTANCE(__cfaehm__base_exception_t), \
+        .parent : &INSTANCE(BASE_EXCEPT), \
         .size : sizeof(name), .copy : name##_copy, \
         .free : ^?{}, .msg : name##_msg \
@@ -40 +42 @@
 struct num_error;
 struct num_error_vtable {
-        struct exception_t_vtable const * parent;
+        struct TABLE(BASE_EXCEPT) const * parent;
         size_t size;
         void (*copy)(num_error *this, num_error * other);
@@ -62 +64 @@
 }
 void ?{}(num_error * this, int num) {
-        this->virtual_table = &_num_error_vtable_instance;
+        this->virtual_table = &INSTANCE(num_error);
         this->msg = 0;
         this->num = num;