Changeset 8135d4c for src/SymTab

Timestamp:

Aug 22, 2017, 7:31:52 PM (7 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

Location:

src/SymTab

Files:

• Autogen.cc (modified) (2 diffs)
• Autogen.h (modified) (1 diff)
• FixFunction.cc (modified) (1 diff)
• Indexer.cc (modified) (3 diffs)
• Indexer.h (modified) (3 diffs)
• Mangler.cc (modified) (1 diff)
• Validate.cc (modified) (1 diff)

src/SymTab/Autogen.cc

@@ -16 +16 @@
 #include "Autogen.h"
 
+#include <cstddef>                 // for NULL
 #include <algorithm>               // for count_if
 #include <cassert>                 // for safe_dynamic_cast, assert, assertf
@@ -21 +22 @@
 #include <list>                    // for list, _List_iterator, list<>::iter...
 #include <set>                     // for set, _Rb_tree_const_iterator
+#include <utility>                 // for pair
 #include <vector>                  // for vector
 

src/SymTab/Autogen.h

@@ -17 +17 @@
 
 #include <cassert>                // for assert
-#include <iterator>               // for back_insert_iterator, back_inserter
-#include <list>                   // for list
-#include <string>                 // for string, operator==
+#include <string>                 // for string
 
 #include "Common/UniqueName.h"    // for UniqueName
 #include "InitTweak/InitTweak.h"  // for InitExpander
-#include "Parser/LinkageSpec.h"   // for C
 #include "SynTree/Constant.h"     // for Constant
-#include "SynTree/Declaration.h"  // for ObjectDecl, Declaration (ptr only)
-#include "SynTree/Expression.h"   // for UntypedExpr, NameExpr, VariableExpr
-#include "SynTree/Initializer.h"  // for SingleInit
-#include "SynTree/Label.h"        // for Label, noLabels
-#include "SynTree/Statement.h"    // for Statement (ptr only), CompoundStmt
+#include "SynTree/Declaration.h"  // for DeclarationWithType, ObjectDecl
+#include "SynTree/Expression.h"   // for NameExpr, ConstantExpr, UntypedExpr...
 #include "SynTree/Type.h"         // for Type, ArrayType, Type::Qualifiers
+
+class CompoundStmt;
+class Statement;
 
 namespace SymTab {

src/SymTab/FixFunction.cc

@@ -20 +20 @@
 #include "Common/utility.h"       // for maybeClone
 #include "SynTree/Declaration.h"  // for FunctionDecl, ObjectDecl, Declarati...
+#include "SynTree/Expression.h"   // for Expression
 #include "SynTree/Type.h"         // for ArrayType, PointerType, Type, Basic...
 

src/SymTab/Indexer.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 21:37:33 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Mar 30 16:38:47 2017
-// Update Count     : 19
+// Last Modified On : Thu Aug 17 16:08:40 2017
+// Update Count     : 20
 //
 
@@ -355 +355 @@
         }
 
+        void Indexer::visit( IfStmt *ifStmt ) {
+            // for statements introduce a level of scope
+            enterScope();
+            Visitor::visit( ifStmt );
+            leaveScope();
+        }
+
+        void Indexer::visit( ForStmt *forStmt ) {
+            // for statements introduce a level of scope
+            enterScope();
+            Visitor::visit( forStmt );
+            leaveScope();
+        }
+
+        void Indexer::visit( CatchStmt *catchStmt ) {
+                // catch statements introduce a level of scope (for the caught exception)
+                enterScope();
+                Visitor::visit( catchStmt );
+                leaveScope();
+        }
 
         void Indexer::visit( ApplicationExpr *applicationExpr ) {
@@ -558 +578 @@
                 leaveScope();
         }
-
-        void Indexer::visit( ForStmt *forStmt ) {
-            // for statements introduce a level of scope
-            enterScope();
-            Visitor::visit( forStmt );
-            leaveScope();
-        }
-
-
 
         void Indexer::lookupId( const std::string &id, std::list< DeclarationWithType* > &out ) const {

src/SymTab/Indexer.h

@@ -10 +10 @@
 // Created On       : Sun May 17 21:38:55 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jul 22 09:46:34 2017
-// Update Count     : 7
+// Last Modified On : Thu Aug 17 16:09:12 2017
+// Update Count     : 8
 //
 
@@ -45 +45 @@
 
                 virtual void visit( CompoundStmt *compoundStmt );
+                virtual void visit( IfStmt *ifStmt );
+                virtual void visit( ForStmt *forStmt );
+                virtual void visit( CatchStmt *catchStmt );
 
                 virtual void visit( ApplicationExpr *applicationExpr );
@@ -81 +84 @@
                 virtual void visit( StructInstType *contextInst );
                 virtual void visit( UnionInstType *contextInst );
-
-                virtual void visit( ForStmt *forStmt );
 
                 // when using an indexer manually (e.g., within a mutator traversal), it is necessary to tell the indexer

src/SymTab/Mangler.cc

@@ -20 +20 @@
 #include <iterator>                 // for ostream_iterator, back_insert_ite...
 #include <list>                     // for _List_iterator, list, _List_const...
-#include <string>                   // for string, operator<<, basic_string
+#include <string>                   // for string, char_traits, operator<<
 
 #include "CodeGen/OperatorTable.h"  // for OperatorInfo, operatorLookup
+#include "Common/SemanticError.h"   // for SemanticError
 #include "Common/utility.h"         // for toString
 #include "Parser/LinkageSpec.h"     // for Spec, isOverridable, AutoGen, Int...

src/SymTab/Validate.cc

@@ -40 +40 @@
 #include "Validate.h"
 
+#include <cassert>                     // for assertf, assert
 #include <cstddef>                     // for size_t
-#include <algorithm>                   // for move, transform
-#include <cassert>                     // for safe_dynamic_cast, assertf
-#include <iterator>                    // for back_inserter, inserter, back_...
-#include <list>                        // for list, _List_iterator, list<>::...
-#include <map>                         // for _Rb_tree_iterator, map, map<>:...
-#include <memory>                      // for unique_ptr, allocator
-#include <string>                      // for string, operator+, operator==
-#include <tuple>                       // for get
-#include <utility>                     // for pair, make_pair
-
-#include "AddVisit.h"                  // for addVisit
-#include "Autogen.h"                   // for SizeType, autogenerateRoutines
+#include <list>                        // for list
+#include <string>                      // for string
+#include <utility>                     // for pair
+
 #include "CodeGen/CodeGenerator.h"     // for genName
 #include "CodeGen/OperatorTable.h"     // for isCtorDtor, isCtorDtorAssign
 #include "Common/PassVisitor.h"        // for PassVisitor, WithDeclsToAdd
-#include "Common/ScopedMap.h"          // for ScopedMap<>::const_iterator
+#include "Common/ScopedMap.h"          // for ScopedMap
 #include "Common/SemanticError.h"      // for SemanticError
 #include "Common/UniqueName.h"         // for UniqueName
 #include "Common/utility.h"            // for operator+, cloneAll, deleteAll
-#include "Concurrency/Keywords.h"      // for applyKeywords, implementMutexF...
+#include "Concurrency/Keywords.h"      // for applyKeywords
 #include "FixFunction.h"               // for FixFunction
 #include "Indexer.h"                   // for Indexer
-#include "InitTweak/InitTweak.h"       // for isCtorDtor, isCtorDtorAssign
-#include "Parser/LinkageSpec.h"        // for C, Cforall
-#include "ResolvExpr/typeops.h"        // for extractResultType, typesCompat...
-#include "SynTree/Attribute.h"         // for Attribute
+#include "InitTweak/InitTweak.h"       // for isCtorDtorAssign
+#include "Parser/LinkageSpec.h"        // for C
+#include "ResolvExpr/typeops.h"        // for typesCompatible
+#include "SymTab/AddVisit.h"           // for addVisit
+#include "SymTab/Autogen.h"            // for SizeType
+#include "SynTree/Attribute.h"         // for noAttributes, Attribute
 #include "SynTree/Constant.h"          // for Constant
-#include "SynTree/Declaration.h"       // for EnumDecl, StructDecl, UnionDecl
-#include "SynTree/Expression.h"        // for TypeExpr, CompoundLiteralExpr
-#include "SynTree/Initializer.h"       // for ListInit, Initializer, noDesig...
-#include "SynTree/Mutator.h"           // for mutateAll, Mutator
-#include "SynTree/Statement.h"         // for CompoundStmt, DeclStmt, Return...
-#include "SynTree/Type.h"              // for Type, TypeInstType, TraitInstType
-#include "SynTree/TypeSubstitution.h"  // for TypeSubstitution, applySubstit...
-#include "SynTree/Visitor.h"           // for acceptAll, Visitor
+#include "SynTree/Declaration.h"       // for ObjectDecl, DeclarationWithType
+#include "SynTree/Expression.h"        // for CompoundLiteralExpr, Expressio...
+#include "SynTree/Initializer.h"       // for ListInit, Initializer
+#include "SynTree/Label.h"             // for operator==, Label
+#include "SynTree/Mutator.h"           // for Mutator
+#include "SynTree/Type.h"              // for Type, TypeInstType, EnumInstType
+#include "SynTree/TypeSubstitution.h"  // for TypeSubstitution
+#include "SynTree/Visitor.h"           // for Visitor
+
+class CompoundStmt;
+class ReturnStmt;
+class SwitchStmt;
+
 
 #define debugPrint( x ) if ( doDebug ) { std::cout << x; }