Changes in / [046959b:242f705]

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;
-
-                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;
+                Note note;      
         };
         typedef std::vector< Scope > ScopeList;
@@ -219 +210 @@
         }
 
-        // 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() {
@@ -232 +217 @@
 
         /// Default constructor initializes with one scope
-        ScopedMap() : scopes() { beginScope(); }
-
-        /// Constructs with a given note on the outermost scope
-        template<typename N>
-        ScopedMap( N&& n ) : scopes() { beginScope(std::forward<N>(n)); }
+        ScopedMap() { beginScope(); }
 
         iterator begin() { return iterator(scopes, scopes.back().map.begin(), currentScope()).next_valid(); }

src/Parser/TypedefTable.cc

@@ -91 +91 @@
 
 void TypedefTable::enterScope() {
-        kindTable.beginScope(0);
+        kindTable.beginScope();
         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;
+        unsigned int level = 0;
   public:
-    TypedefTable() : kindTable{0}, level{0} {}
         ~TypedefTable();