Changeset 7fdb94e for src/Parser/TypedefTable.h

Timestamp:

May 21, 2018, 10:48:05 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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

Children:

b12c036

Parents:

4358c1e

Message:

rewrite TypedefTable?

File:

• src/Parser/TypedefTable.h (modified) (2 diffs)

src/Parser/TypedefTable.h

@@ -7 +7 @@
 // TypedefTable.h --
 //
-// Author           : Rodolfo G. Esteves
+// Author           : Peter A. Buhr
 // Created On       : Sat May 16 15:24:36 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jul 22 09:33:14 2017
-// Update Count     : 34
+// Last Modified On : Mon May 21 20:28:01 2018
+// Update Count     : 76
 //
 
 #pragma once
 
-#include <list>       // for list
-#include <map>        // for map, map<>::value_compare
-#include <stack>      // for stack
-#include <string>     // for string
+#include <string>                                                                               // for string
 
+#include "Common/ScopedMap.h"                                                   // for ScopedMap
 #include "ParserTypes.h"
-#include "parser.hh"  // for IDENTIFIER, TYPEDEFname, TYPEGENname
+#include "parser.hh"                                                                    // for IDENTIFIER, TYPEDEFname, TYPEGENname
 
 class TypedefTable {
@@ -28 +26 @@
         enum kind_t { ID = IDENTIFIER, TD = TYPEDEFname, TG = TYPEGENname };
   private:
-        struct Entry {
-                int scope;
-                kind_t kind;
-        };
+        typedef ScopedMap< std::string, kind_t > KindTable;
+        KindTable kindTable;    
+  public:
+        ~TypedefTable();
 
-        struct DeferredEntry {
-                std::string identifier;
-                kind_t kind;
-        };
-
-        typedef std::map< std::string, std::list< Entry > > tableType;
-        tableType table;
-
-        int currentScope;
-        std::string currentTrait;
-        int contextScope;
-
-        typedef std::list< DeferredEntry > deferListType;
-        std::stack< deferListType > deferListStack;
-        std::map< std::string, deferListType > contexts;
-
-        std::stack< std::string > nextIdentifiers;
-
-        void addToScope( const std::string &identifier, kind_t kind, int scope );
-  public:
-        TypedefTable();
-
-        bool exists( const std::string &identifier );
-        int isKind( const std::string &identifier ) const;
-        void changeKind( const std::string &identifier, kind_t kind );
-
-        void makeTypedef( const std::string &name );
-
-        // "addToCurrentScope" adds the identifier/type pair to the current scope. This does less than you think it does,
-        // since each declaration is within its own scope.  Mostly useful for type parameters.
-        void addToCurrentScope( const std::string &identifier, kind_t kind );
-        void addToCurrentScope( kind_t kind );                  // use nextIdentifiers.top()
-
-        // "addToEnclosingScope" adds the identifier/type pair to the scope that encloses the current one.  This is the
-        // right way to handle type and typedef names
-        void addToEnclosingScope( const std::string &identifier, kind_t kind );
-        void addToEnclosingScope( kind_t kind );                // use nextIdentifiers.top()
-
-        // "addToEnclosingScope2" adds the identifier/type pair to the scope that encloses the scope enclosing the the
-        // current one.  This is the right way to handle assertion names
-        void addToEnclosingScope2( const std::string &identifier, kind_t kind );
-        void addToEnclosingScope2( kind_t kind );               // use nextIdentifiers.top()
-
-        // set the next identifier to be used by an "add" operation without an identifier parameter within the current scope
-        void setNextIdentifier( const std::string &identifier );
-
-        // dump the definitions from a pre-defined context into the current scope
-        void openTrait( const std::string &contextName );
+        bool exists( const std::string & identifier );
+        int isKind( const std::string & identifier ) const;
+        void changeKind( const std::string & identifier, kind_t kind );
+        void makeTypedef( const std::string & name );
+        void addToEnclosingScope( const std::string & identifier, kind_t kind );
 
         void enterScope();
         void leaveScope();
-        void enterTrait( const std::string &contextName );
-        void leaveTrait();
-
-        void print() const;
-};
+}; // TypedefTable
 
 // Local Variables: //