Changeset 4741dfe for src

Timestamp:

Jun 5, 2019, 11:24:16 AM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

d4b6638

Parents:

bc4bea8

Message:

Better error printing on yesterday's fix

File:

• src/InitTweak/FixInit.cc (modified) (1 diff)

src/InitTweak/FixInit.cc

@@ -715 +715 @@
                                 stmtsToAddBefore.push_back( new DeclStmt( ret ) );
 
-                                if(!stmtExpr->resultExpr) {
-                                        SemanticError(stmtExpr, "Statement-Expression should have a resulting expression");
-                                }
+                                assertf(
+                                        stmtExpr->resultExpr,
+                                        "Statement-Expression should have a resulting expression at %s:%d",
+                                        stmtExpr->location.filename.c_str(),
+                                        stmtExpr->location.first_line
+                                );
+
                                 ExprStmt * last = stmtExpr->resultExpr;
                                 try {
                                         last->expr = makeCtorDtor( "?{}", ret, last->expr );
                                 } catch(...) {
-                                        std::cerr << "=======================" << std::endl;
-                                        std::cerr << "ERROR, can't resolve" << std::endl;
-                                        ret->print(std::cerr);
-                                        std::cerr << std::endl << "---" << std::endl;
-                                        last->expr->print(std::cerr);
+                                        std::cerr << "*CFA internal error: ";
+                                        std::cerr << "can't resolve implicit constructor";
+                                        std::cerr << " at " << stmtExpr->location.filename;
+                                        std::cerr << ":" << stmtExpr->location.first_line << std::endl;
 
                                         abort();