Changeset 8135d4c for src/Parser/TypedefTable.h

Timestamp:

Aug 22, 2017, 7:31:52 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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

Children:

9aaac6e9

Parents:

fc56cdbf (diff), b3d413b (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 references

File:

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

src/Parser/TypedefTable.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// TypedefTable.h -- 
+// TypedefTable.h --
 //
 // Author           : Rodolfo G. Esteves
@@ -16 +16 @@
 #pragma once
 
-#include <map>
-#include <list>
-#include <string>
-#include <stack>
+#include <list>       // for list
+#include <map>        // for map, map<>::value_compare
+#include <stack>      // for stack
+#include <string>     // for string
 
 #include "ParserTypes.h"
-#include "parser.hh"
+#include "parser.hh"  // for IDENTIFIER, TYPEDEFname, TYPEGENname
 
 class TypedefTable {
@@ -32 +32 @@
                 kind_t kind;
         };
-        
+
         struct DeferredEntry {
                 std::string identifier;
@@ -44 +44 @@
         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;
 
@@ -70 +70 @@
         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 );
-        
+
         void enterScope();
         void leaveScope();