Changes in / [514247d:546b51e]

Files:

• libcfa/prelude/Makefile.am (modified) (1 diff)
• libcfa/prelude/Makefile.in (modified) (1 diff)
• src/GenPoly/Lvalue.cc (modified) (1 diff)
• src/Parser/parser.yy (modified) (1 diff)
• src/Virtual/ExpandCasts.cc (modified) (1 diff)

libcfa/prelude/Makefile.am

@@ -55 +55 @@
 # create forward declarations for cfa builtins
 builtins.cf : builtins.c ${CC}
-        ${AM_V_GEN}gcc ${AM_CFLAGS} -E -P ${<} -o ${@} -MD -MP -MF $(DEPDIR)/builtins.Po
+        ${AM_V_GEN}cfa ${AM_CFLAGS} -E -P ${<} -o ${@} -MD -MP -MF $(DEPDIR)/builtins.Po
         ${AM_V_at}sed -i 's/builtins.o/builtins.cf/g' $(DEPDIR)/builtins.Po
 

libcfa/prelude/Makefile.in

@@ -510 +510 @@
 # create forward declarations for cfa builtins
 builtins.cf : builtins.c ${CC}
-        ${AM_V_GEN}gcc ${AM_CFLAGS} -E -P ${<} -o ${@} -MD -MP -MF $(DEPDIR)/builtins.Po
+        ${AM_V_GEN}cfa ${AM_CFLAGS} -E -P ${<} -o ${@} -MD -MP -MF $(DEPDIR)/builtins.Po
         ${AM_V_at}sed -i 's/builtins.o/builtins.cf/g' $(DEPDIR)/builtins.Po
 

src/GenPoly/Lvalue.cc

@@ -353 +353 @@
                         Type * destType = castExpr->result;
                         Type * srcType = castExpr->arg->result;
+                        assertf( destType, "Cast to no type in: %s", toCString( castExpr ) );
+                        assertf( srcType, "Cast from no type in: %s", toCString( castExpr ) );
                         int depth1 = destType->referenceDepth();
                         int depth2 = srcType->referenceDepth();

src/Parser/parser.yy

@@ -1310 +1310 @@
 
 handler_clause:
-        handler_key '(' push exception_declaration pop handler_predicate_opt ')' compound_statement pop
+        handler_key '(' push exception_declaration pop handler_predicate_opt ')' compound_statement
                 { $$ = new StatementNode( build_catch( $1, $4, $6, $8 ) ); }
-        | handler_clause handler_key '(' push exception_declaration pop handler_predicate_opt ')' compound_statement pop
+        | handler_clause handler_key '(' push exception_declaration pop handler_predicate_opt ')' compound_statement
                 { $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( $2, $5, $7, $9 ) ) ); }
         ;

src/Virtual/ExpandCasts.cc

@@ -147 +147 @@
                                 //              )
                                 //      ),
-                        new UntypedExpr( new NameExpr( "__cfa__virtual_cast" ), {
+                        new ApplicationExpr( VariableExpr::functionPointer( vcast_decl ), {
                                         new CastExpr(
                                                 new AddressExpr( new VariableExpr( table ) ),
                                                 pointer_to_pvt(1)
-                                                ),
+                                        ),
                                         new CastExpr(
                                                 castExpr->get_arg(),
                                                 pointer_to_pvt(2)
-                                                )
-                                } ),
+                                        )
+                        } ),
                         castExpr->get_result()->clone()
-                        );
+                );
 
                 castExpr->set_arg( nullptr );