Changeset 4612bb0 for src

Timestamp:

Jul 9, 2018, 4:48:58 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

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, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

046959b

Parents:

c3e44e6a

Message:

Add push operations for ScopedMap? notes

Location:

src

Files:

• Common/ScopedMap.h (modified) (3 diffs)
• Parser/TypedefTable.cc (modified) (1 diff)
• Parser/TypedefTable.h (modified) (1 diff)

src/Common/ScopedMap.h

@@ -33 +33 @@
         struct Scope {
                 MapType map;
-                Note note;      
+                Note note;
+
+                template<typename N>
+                Scope(N&& n) : map(), note(std::forward<N>(n)) {}
+                
+                Scope() = default;
+                Scope(const Scope&) = default;
+                Scope(Scope&&) = default;
+                Scope& operator= (const Scope&) = default;
+                Scope& operator= (Scope&&) = default;
         };
         typedef std::vector< Scope > ScopeList;
@@ -210 +219 @@
         }
 
+        // Starts a new scope with the given note
+        template<typename N>
+        void beginScope( N&& n ) {
+                scopes.emplace_back( std::forward<N>(n) );
+        }
+
         /// Ends a scope; invalidates any iterators pointing to elements of that scope
         void endScope() {
@@ -217 +232 @@
 
         /// Default constructor initializes with one scope
-        ScopedMap() { beginScope(); }
+        ScopedMap() : scopes() { beginScope(); }
+
+        /// Constructs with a given note on the outermost scope
+        template<typename N>
+        ScopedMap( N&& n ) : scopes() { beginScope(std::forward<N>(n)); }
 
         iterator begin() { return iterator(scopes, scopes.back().map.begin(), currentScope()).next_valid(); }

src/Parser/TypedefTable.cc

@@ -91 +91 @@
 
 void TypedefTable::enterScope() {
-        kindTable.beginScope();
+        kindTable.beginScope(0);
         debugPrint( cerr << "Entering scope " << kindTable.currentScope() << endl; print() );
 } // TypedefTable::enterScope

src/Parser/TypedefTable.h

@@ -25 +25 @@
         typedef ScopedMap< std::string, int, int > KindTable;
         KindTable kindTable;    
-        unsigned int level = 0;
+        unsigned int level;
   public:
+    TypedefTable() : kindTable{0}, level{0} {}
         ~TypedefTable();