Changeset dcbb03b for src/SymTab/Indexer.cc

Timestamp:

Mar 1, 2018, 9:29:03 AM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

1f37ed02

Parents:

b002261 (diff), 446ffa3 (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

File:

• src/SymTab/Indexer.cc (modified) (6 diffs)

src/SymTab/Indexer.cc

@@ -443 +443 @@
                         // isomorphic to C type-compatibility, which it may not be.
                         if ( hasIncompatibleCDecl( name, mangleName, scope ) ) {
-                                throw SemanticError( decl, "conflicting overload of C function " );
+                                SemanticError( decl, "conflicting overload of C function " );
                         }
                 } else {
                         // Check that a Cforall declaration doesn't override any C declaration
                         if ( hasCompatibleCDecl( name, mangleName, scope ) ) {
-                                throw SemanticError( decl, "Cforall declaration hides C function " );
+                                SemanticError( decl, "Cforall declaration hides C function " );
                         }
                 }
@@ -463 +463 @@
         void Indexer::addId( DeclarationWithType * decl, Expression * baseExpr ) {
                 // default handling of conflicts is to raise an error
-                addId( decl, [decl](IdData &, const std::string & msg) { throw SemanticError( decl, msg ); return true; }, baseExpr );
+                addId( decl, [decl](IdData &, const std::string & msg) { SemanticError( decl, msg ); return true; }, baseExpr );
         }
 
         void Indexer::addDeletedId( DeclarationWithType * decl, BaseSyntaxNode * deleteStmt ) {
                 // default handling of conflicts is to raise an error
-                addId( decl, [decl](IdData &, const std::string & msg) { throw SemanticError( decl, msg ); return true; }, nullptr, deleteStmt );
+                addId( decl, [decl](IdData &, const std::string & msg) { SemanticError( decl, msg ); return true; }, nullptr, deleteStmt );
         }
 
@@ -477 +477 @@
                         return true;
                 } else {
-                        throw SemanticError( added, "redeclaration of " );
+                        SemanticError( added, "redeclaration of " );
                 }
         }
@@ -504 +504 @@
                         return false;
                 } else if ( ! added->get_members().empty() ) {
-                        throw SemanticError( added, "redeclaration of " );
+                        SemanticError( added, "redeclaration of " );
                 } // if
                 return true;
@@ -603 +603 @@
                                         if ( dynamic_cast< StructInstType * >( t ) || dynamic_cast< UnionInstType * >( t ) ) {
                                                 Expression * base = expr->clone();
-                                                ResolvExpr::referenceToRvalueConversion( base );
+                                                ResolvExpr::Cost cost = ResolvExpr::Cost::zero; // xxx - carry this cost into the indexer as a base cost?
+                                                ResolvExpr::referenceToRvalueConversion( base, cost );
                                                 addMembers( t->getAggr(), new MemberExpr( dwt, base ), handleConflicts );
                                         }
@@ -705 +706 @@
         }
 
-        Expression * Indexer::IdData::combine() const {
+        Expression * Indexer::IdData::combine( ResolvExpr::Cost & cost ) const {
                 Expression * ret = nullptr;
                 if ( baseExpr ) {
                         Expression * base = baseExpr->clone();
-                        ResolvExpr::referenceToRvalueConversion( base );
+                        ResolvExpr::referenceToRvalueConversion( base, cost );
                         ret = new MemberExpr( id, base );
                         // xxx - this introduces hidden environments, for now remove them.