Changeset 0f9e4403 for src/Parser/TypedefTable.cc

Timestamp:

Apr 15, 2016, 12:03:11 PM (9 years ago)

Author:

Thierry Delisle <tdelisle@…>

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, with_gc

Children:

29ad0ac

Parents:

c5833e8 (diff), 37f0da8 (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' into gc_noraii

File:

• src/Parser/TypedefTable.cc (modified) (4 diffs)

src/Parser/TypedefTable.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 15:20:13 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jun 26 07:30:16 2015
-// Update Count     : 19
+// Last Modified On : Wed Apr 13 16:57:30 2016
+// Update Count     : 24
 //
 
 #include <map>
 #include <list>
+#include <cassert>
 #include "TypedefTable.h"
-#include <cassert>
 using namespace std;
 
@@ -29 +29 @@
 TypedefTable::TypedefTable() : currentScope( 0 ) {}
 
+bool TypedefTable::exists( const string &identifier ) {
+        return table.count( identifier ) > 0;
+}
+
+int TypedefTable::isKind( const string &identifier ) const {
+        tableType::const_iterator id_pos = table.find( identifier );
+        // Name lookup defaults to identifier, and then the identifier's kind is set by the parser.
+        if ( id_pos == table.end() ) return IDENTIFIER;
+        return id_pos->second.begin()->kind;
+}
+
 void TypedefTable::changeKind( const string &identifier, kind_t kind ) {
         tableType::iterator id_pos = table.find( identifier );
-        if ( id_pos == table.end() ) {
-                return;
-        } else {
-                (*((*id_pos ).second.begin())).kind = kind;
-                return;
+        if ( id_pos == table.end() ) return;
+        id_pos->second.begin()->kind = kind;
+}
+
+// SKULLDUGGERY: Generate a typedef for the aggregate name so the aggregate does not have to be qualified by
+// "struct". Only generate the typedef, if the name is not in use. The typedef is implicitly (silently) removed
+// if the name is explicitly used.
+void TypedefTable::makeTypedef( const string &name ) {
+        if ( ! typedefTable.exists( name ) ) {
+                typedefTable.addToEnclosingScope( name, TypedefTable::TD );
         } // if
 }
 
-bool TypedefTable::isKind( const string &identifier, kind_t kind ) const {
-        tableType::const_iterator id_pos = table.find( identifier );
-        if ( id_pos == table.end() ) {
-                return true;
-        } else {
-                return (*((*id_pos ).second.begin())).kind == kind;
-        } // if
-}
-
-bool TypedefTable::isIdentifier( const string &identifier ) const {
-        return isKind( identifier, ID );
-}
-
-bool TypedefTable::isTypedef( const string &identifier ) const {
-        return isKind( identifier, TD );
-}
-
-bool TypedefTable::isTypegen( const string &identifier ) const {
-        return isKind( identifier, TG );
-}
-
 void TypedefTable::addToScope( const std::string &identifier, kind_t kind, int scope ) {
-        if ( currentContext != "" && scope == contextScope ) {
+        if ( currentTrait != "" && scope == contextScope ) {
                 DeferredEntry entry = { identifier, kind };
-                contexts[currentContext].push_back( entry );
+                contexts[currentTrait].push_back( entry );
         } else {
                 debugPrint( "Adding " << identifier << " as kind " << kind << " scope " << scope << " from scope " << currentScope << endl );
@@ -112 +107 @@
 }
 
-void TypedefTable::openContext( const std::string &contextName ) {
+void TypedefTable::openTrait( const std::string &contextName ) {
         map< string, deferListType >::iterator i = contexts.find( contextName );
         if ( i != contexts.end() ) {
@@ -150 +145 @@
 }
 
-void TypedefTable::enterContext( const std::string &contextName ) {
-        currentContext = contextName;
+void TypedefTable::enterTrait( const std::string &contextName ) {
+        currentTrait = contextName;
         contextScope = currentScope;
 }
 
-void TypedefTable::leaveContext() {
-        currentContext = "";
+void TypedefTable::leaveTrait() {
+        currentTrait = "";
 }