Changeset 4040425 for src/Parser/TypedefTable.cc

Timestamp:

Mar 2, 2016, 6:15:02 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:

36ebd03, b63e376

Parents:

8f610e85

Message:

change keyword type to otype and context to trait

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 Mar  2 17:25:55 2016
+// Update Count     : 20
 //
 
@@ -61 +61 @@
 
 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 +112 @@
 }
 
-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 +150 @@
 }
 
-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 = "";
 }