Changeset cd7ef0b for src/ResolvExpr

Timestamp:

Aug 10, 2017, 3:39:11 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

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:

38d70ab

Parents:

275f4b4 (diff), e1780a2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/ResolvExpr

Files:

• CurrentObject.cc (modified) (3 diffs)
• Resolver.cc (modified) (3 diffs)

src/ResolvExpr/CurrentObject.cc

@@ -36 +36 @@
                                 return constExpr->get_constant()->get_ival();
                         } else {
-                                assertf( false, "Non-integer constant expression in getConstValue", toString( constExpr ).c_str() ); // xxx - might be semantic error
+                                assertf( false, "Non-integer constant expression in getConstValue %s", toString( constExpr ).c_str() ); // xxx - might be semantic error
                         }
                 } else if ( dynamic_cast< OneType * >( constExpr->get_result() ) ) {
@@ -176 +176 @@
                                 setPosition( castExpr->get_arg() );
                         } else if ( VariableExpr * varExpr = dynamic_cast< VariableExpr * >( expr ) ) {
-                                assertf( dynamic_cast<EnumInstType *> ( varExpr->get_result() ), "ArrayIterator given variable that isn't an enum constant", toString( expr ).c_str() );
+                                assertf( dynamic_cast<EnumInstType *> ( varExpr->get_result() ), "ArrayIterator given variable that isn't an enum constant : %s", toString( expr ).c_str() );
                                 index = 0; // xxx - get actual value of enum constant
                         } else if ( dynamic_cast< SizeofExpr * >( expr ) || dynamic_cast< AlignofExpr * >( expr ) ) {
@@ -518 +518 @@
                         curTypes = newTypes;
                         newTypes.clear();
-                        assertf( desigAlts.size() == curTypes.size(), "Designator alternatives (%d) and current types (%d) out of sync", desigAlts.size(), curTypes.size() );
+                        assertf( desigAlts.size() == curTypes.size(), "Designator alternatives (%zu) and current types (%zu) out of sync", desigAlts.size(), curTypes.size() );
                 } // for
                 if ( desigAlts.size() > 1 ) {

src/ResolvExpr/Resolver.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 12:17:01 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Mar 23 17:23:14 2017
-// Update Count     : 211
+// Last Modified By : Andrew Beach
+// Last Modified On : Tus Aug  8 16:06:00 2017
+// Update Count     : 212
 //
 
@@ -71 +71 @@
                 virtual void visit( ReturnStmt *returnStmt ) override;
                 virtual void visit( ThrowStmt *throwStmt ) override;
+                virtual void visit( CatchStmt *catchStmt ) override;
 
                 virtual void visit( SingleInit *singleInit ) override;
@@ -368 +369 @@
 
         void Resolver::visit( ThrowStmt *throwStmt ) {
+                // TODO: Replace *exception type with &exception type.
                 if ( throwStmt->get_expr() ) {
-                        Expression * wrapped = new CastExpr( throwStmt->get_expr(), new BasicType( Type::Qualifiers(), BasicType::SignedInt ) );
+                        StructDecl * exception_decl =
+                                lookupStruct( "__cfaehm__base_exception_t" );
+                        assert( exception_decl );
+                        Expression * wrapped = new CastExpr(
+                                throwStmt->get_expr(),
+                                new PointerType(
+                                        noQualifiers,
+                                        new StructInstType(
+                                                noQualifiers,
+                                                exception_decl
+                                                )
+                                        )
+                                );
                         Expression * newExpr = findSingleExpression( wrapped, *this );
                         throwStmt->set_expr( newExpr );
+                }
+        }
+
+        void Resolver::visit( CatchStmt *catchStmt ) {
+                if ( catchStmt->get_cond() ) {
+                        Expression * wrapped = new CastExpr(
+                                catchStmt->get_cond(),
+                                new BasicType( noQualifiers, BasicType::Bool )
+                                );
+                        catchStmt->set_cond( findSingleExpression( wrapped, *this ) );
                 }
         }