Changeset 36ebd03 for src/Parser/TypedefTable.h

Timestamp:

Mar 3, 2016, 1:28:56 PM (10 years ago)

Author:

Aaron Moss <a3moss@…>

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:

3627356

Parents:

9d7b3ea (diff), 4040425 (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/Parser/TypedefTable.h (modified) (3 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 Mar  2 17:26:54 2016
+// Update Count     : 12
 //
 
@@ -40 +40 @@
 
         int currentScope;
-        std::string currentContext;
+        std::string currentTrait;
         int contextScope;
         
@@ -79 +79 @@
         
         // 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;