Changeset bdd516a for translator/SymTab/IdTable.cc

Timestamp:

Apr 28, 2015, 4:21:36 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc

Children:

42e2ad7

Parents:

ad17ba6a

Message:

fixed sizeof type variable, find lowest cost alternative for sizeof expression, removed unused classes, added compiler flag, remove temporary file for -CFA, formatting

File:

• translator/SymTab/IdTable.cc (modified) (3 diffs)

translator/SymTab/IdTable.cc

@@ -82 +82 @@
     }
   }
-  for( InnerTableType::const_iterator i = declTable.begin(); i != declTable.end(); ++i ) {
+  // ensure the set of routines with C linkage cannot be overloaded
+  for( InnerTableType::iterator i = declTable.begin(); i != declTable.end(); ++i ) {
     if( !i->second.empty() && i->second.top().first->get_linkage() == LinkageSpec::C && declTable.size() > 1 ) {
-      throw SemanticError( "invalid overload of C function ", i->second.top().first );
+        InnerTableType::iterator j = i;
+        for( j++; j != declTable.end(); ++j ) {
+          if( !j->second.empty() && j->second.top().first->get_linkage() == LinkageSpec::C ) {
+            throw SemanticError( "invalid overload of C function " );
+          }
+        }
     }
   }
@@ -103 +109 @@
 }
 
+DeclarationWithType* IdTable::lookupId( const std::string &id) const {
+   DeclarationWithType* result = 0;
+   int depth = -1;
+
+   OuterTableType::const_iterator outer = table.find( id );
+   if( outer == table.end() ) return 0;
+   const InnerTableType &declTable = outer->second;
+   for( InnerTableType::const_iterator it = declTable.begin(); it != declTable.end(); ++it ) {
+     const std::stack< DeclEntry >& entry = it->second;
+     if( !entry.empty() && entry.top().second > depth ) {
+       result = entry.top().first;
+       depth = entry.top().second;
+     }
+   }
+   return result;
+}
+
 void 
 IdTable::dump( std::ostream &os ) const
 {
+  for( OuterTableType::const_iterator outer = table.begin(); outer != table.end(); ++outer ) {
+    for( InnerTableType::const_iterator inner = outer->second.begin(); inner != outer->second.end(); ++inner ) {
+#if 0
+      const std::stack< DeclEntry >& entry = inner->second;
+      if( !entry.empty() ) { // && entry.top().second == scopeLevel ) {
+        os << outer->first << " (" << inner->first << ") (" << entry.top().second << ")" << std::endl;
+      } else {
+        os << outer->first << " (" << inner->first << ") ( entry-empty)" << std::endl;
+      }
+#endif
+#if 0
+      std::stack<DeclEntry> stack = inner->second;
+      os << "dumping a stack" << std::endl;
+      while (!stack.empty()) {
+        DeclEntry d = stack.top();
+        os << outer->first << " (" << inner->first << ") (" << d.second << ") " << std::endl;
+        stack.pop();
+      }
+#endif
+    }
+  }
+#if 0
   for( OuterTableType::const_iterator outer = table.begin(); outer != table.end(); ++outer ) {
     for( InnerTableType::const_iterator inner = outer->second.begin(); inner != outer->second.end(); ++inner ) {
@@ -114 +159 @@
     }
   }
+#endif
 }