Changeset 0f9e4403 for src/Parser/TypedefTable.h

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.h (modified) (5 diffs)

src/Parser/TypedefTable.h

@@ -10 +10 @@
 // Created On       : Sat May 16 15:24:36 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jun 25 22:52:15 2015
-// Update Count     : 11
+// Last Modified On : Wed Apr 13 16:59:56 2016
+// Update Count     : 27
 //
 
@@ -22 +22 @@
 #include <stack>
 
+#include "lex.h"
+#include "parser.h"
+
 class TypedefTable {
   public:
-        enum kind_t { ID, TD, TG };
+        enum kind_t { ID = IDENTIFIER, TD = TYPEDEFname, TG = TYPEGENname };
   private:
         struct Entry {
@@ -40 +43 @@
 
         int currentScope;
-        std::string currentContext;
+        std::string currentTrait;
         int contextScope;
         
@@ -49 +52 @@
         std::stack< std::string > nextIdentifiers;
 
-        bool isKind( const std::string &identifier, kind_t kind ) const;
         void addToScope( const std::string &identifier, kind_t kind, int scope );
   public:
         TypedefTable();
 
-        bool isIdentifier( const std::string &identifier ) const;
-        bool isTypedef( const std::string &identifier ) const;
-        bool isTypegen( const std::string &identifier ) const;
+        bool exists( const std::string &identifier );
+        int isKind( const std::string &identifier ) const;
+        void changeKind( const std::string &identifier, kind_t kind );
 
-        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.
@@ -79 +81 @@
         
         // dump the definitions from a pre-defined context into the current scope
-        void openContext( const std::string &contextName );
+        void openTrait( const std::string &contextName );
         
         void enterScope();
         void leaveScope();
-        void enterContext( const std::string &contextName );
-        void leaveContext();
+        void enterTrait( const std::string &contextName );
+        void leaveTrait();
 
         void print() const;