Changeset 02af79b0 for src/SynTree

Timestamp:

May 9, 2019, 4:47:53 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct

Children:

b038fe4

Parents:

ec28948 (diff), db27767 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/SynTree

Files:

• Declaration.h (modified) (4 diffs)
• TypeSubstitution.cc (modified) (2 diffs)
• TypeSubstitution.h (modified) (9 diffs)

src/SynTree/Declaration.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Sep  3 19:24:06 2017
-// Update Count     : 131
+// Last Modified By : Andrew Beach
+// Last Modified On : Thr May  2 10:47:00 2019
+// Update Count     : 135
 //
 
@@ -19 +19 @@
 #include <iosfwd>                // for ostream
 #include <list>                  // for list
+#include <unordered_map>         // for unordered_map
 #include <string>                // for string, operator+, allocator, to_string
 
@@ -166 +167 @@
         CompoundStmt *get_statements() const { return statements; }
         void set_statements( CompoundStmt *newValue ) { statements = newValue; }
+        bool has_body() const { return NULL != statements; }
 
         static FunctionDecl * newFunction( const std::string & name, FunctionType * type, CompoundStmt * statements );
@@ -334 +336 @@
         virtual Declaration *acceptMutator( Mutator &m )  override { return m.mutate( this ); }
   private:
-        std::map< std::string, long long int > enumValues;
+        std::unordered_map< std::string, long long int > enumValues;
         virtual std::string typeString() const override;
 };

src/SynTree/TypeSubstitution.cc

@@ -108 +108 @@
 namespace {
         struct EnvTrimmer {
-                TypeSubstitution * env, * newEnv;
-                EnvTrimmer( TypeSubstitution * env, TypeSubstitution * newEnv ) : env( env ), newEnv( newEnv ){}
+                const TypeSubstitution * env;
+                TypeSubstitution * newEnv;
+                EnvTrimmer( const TypeSubstitution * env, TypeSubstitution * newEnv ) : env( env ), newEnv( newEnv ){}
                 void previsit( TypeDecl * tyDecl ) {
                         // transfer known bindings for seen type variables
@@ -120 +121 @@
 
 /// reduce environment to just the parts that are referenced in a given expression
-TypeSubstitution * TypeSubstitution::newFromExpr( Expression * expr, TypeSubstitution * env ) {
+TypeSubstitution * TypeSubstitution::newFromExpr( Expression * expr, const TypeSubstitution * env ) {
         if ( env ) {
                 TypeSubstitution * newEnv = new TypeSubstitution();

src/SynTree/TypeSubstitution.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jul 22 09:52:24 2017
-// Update Count     : 3
+// Last Modified On : Tue Apr 30 22:52:47 2019
+// Update Count     : 9
 //
 
@@ -19 +19 @@
 #include <iosfwd>                  // for ostream
 #include <list>                    // for list<>::iterator, _List_iterator
-#include <map>                     // for _Rb_tree_iterator, map, map<>::val...
-#include <set>                     // for set
+#include <unordered_map>
+#include <unordered_set>
 #include <string>                  // for string, operator!=
 #include <utility>                 // for pair
@@ -39 +39 @@
         TypeSubstitution &operator=( const TypeSubstitution &other );
 
-        template< typename SynTreeClass > int apply( SynTreeClass *&input );
-        template< typename SynTreeClass > int applyFree( SynTreeClass *&input );
+        template< typename SynTreeClass > int apply( SynTreeClass *&input ) const;
+        template< typename SynTreeClass > int applyFree( SynTreeClass *&input ) const;
 
         void add( std::string formalType, Type *actualType );
@@ -56 +56 @@
 
         /// create a new TypeSubstitution using bindings from env containing all of the type variables in expr
-        static TypeSubstitution * newFromExpr( Expression * expr, TypeSubstitution * env );
+        static TypeSubstitution * newFromExpr( Expression * expr, const TypeSubstitution * env );
 
         void normalize();
@@ -78 +78 @@
         friend class PassVisitor;
 
-        typedef std::map< std::string, Type* > TypeEnvType;
-        typedef std::map< std::string, Expression* > VarEnvType;
+        typedef std::unordered_map< std::string, Type * > TypeEnvType;
+        typedef std::unordered_map< std::string, Expression * > VarEnvType;
         TypeEnvType typeEnv;
         VarEnvType varEnv;
@@ -98 +98 @@
         ActualIterator actualIt = actualBegin;
         for ( ; formalIt != formalEnd; ++formalIt, ++actualIt ) {
-                if ( TypeDecl *formal = dynamic_cast< TypeDecl* >( *formalIt ) ) {
-                        if ( TypeExpr *actual = dynamic_cast< TypeExpr* >( *actualIt ) ) {
+                if ( TypeDecl *formal = dynamic_cast< TypeDecl * >( *formalIt ) ) {
+                        if ( TypeExpr *actual = dynamic_cast< TypeExpr * >( *actualIt ) ) {
                                 if ( formal->get_name() != "" ) {
                                         TypeEnvType::iterator i = typeEnv.find( formal->get_name() );
@@ -130 +130 @@
 // definitition must happen after PassVisitor is included so that WithGuards can be used
 struct TypeSubstitution::Substituter : public WithGuards, public WithVisitorRef<Substituter> {
-                Substituter( TypeSubstitution & sub, bool freeOnly ) : sub( sub ), freeOnly( freeOnly ) {}
+                Substituter( const TypeSubstitution & sub, bool freeOnly ) : sub( sub ), freeOnly( freeOnly ) {}
 
                 Type * postmutate( TypeInstType * aggregateUseType );
@@ -143 +143 @@
                 void premutate( UnionInstType * aggregateUseType );
 
-                TypeSubstitution & sub;
+                const TypeSubstitution & sub;
                 int subCount = 0;
                 bool freeOnly;
-                typedef std::set< std::string > BoundVarsType;
+                typedef std::unordered_set< std::string > BoundVarsType;
                 BoundVarsType boundVars;
 };
 
 template< typename SynTreeClass >
-int TypeSubstitution::apply( SynTreeClass *&input ) {
+int TypeSubstitution::apply( SynTreeClass *&input ) const {
         assert( input );
         PassVisitor<Substituter> sub( *this, false );
@@ -163 +163 @@
 
 template< typename SynTreeClass >
-int TypeSubstitution::applyFree( SynTreeClass *&input ) {
+int TypeSubstitution::applyFree( SynTreeClass *&input ) const {
         assert( input );
         PassVisitor<Substituter> sub( *this, true );