Changeset 8d70648 for src/GenPoly

Timestamp:

May 30, 2019, 4:15:08 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

a935892, f474e91

Parents:

d76c588 (diff), d88f8b3b (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/GenPoly

Files:

• Box.cc (modified) (3 diffs)
• GenPoly.cc (modified) (1 diff)
• Lvalue.cc (modified) (4 diffs)
• ScopedSet.h (modified) (7 diffs)

src/GenPoly/Box.cc ¶

@@ -657 +657 @@
                                 paramExpr = new AddressExpr( paramExpr );
                         } // if
-                        arg = appExpr->get_args().insert( arg, paramExpr ); // add argument to function call
+                        arg = appExpr->args.insert( arg, paramExpr ); // add argument to function call
                         arg++;
                         // Build a comma expression to call the function and emulate a normal return.
                         CommaExpr *commaExpr = new CommaExpr( appExpr, retExpr );
-                        commaExpr->set_env( appExpr->get_env() );
-                        appExpr->set_env( 0 );
+                        commaExpr->env = appExpr->env;
+                        appExpr->env = nullptr;
                         return commaExpr;
                 }
@@ -708 +708 @@
 //                      if ( ! function->get_returnVals().empty() && isPolyType( function->get_returnVals().front()->get_type(), tyVars ) ) {
                         if ( isDynRet( function, tyVars ) ) {
-                                ret = addRetParam( appExpr, function->get_returnVals().front()->get_type(), arg );
+                                ret = addRetParam( appExpr, function->returnVals.front()->get_type(), arg );
                         } // if
                         std::string mangleName = mangleAdapterName( function, tyVars );
@@ -715 +715 @@
                         // cast adaptee to void (*)(), since it may have any type inside a polymorphic function
                         Type * adapteeType = new PointerType( Type::Qualifiers(), new FunctionType( Type::Qualifiers(), true ) );
-                        appExpr->get_args().push_front( new CastExpr( appExpr->get_function(), adapteeType ) );
+                        appExpr->get_args().push_front( new CastExpr( appExpr->function, adapteeType ) );
                         appExpr->set_function( new NameExpr( adapterName ) ); // xxx - result is never set on NameExpr
 

src/GenPoly/GenPoly.cc ¶

@@ -468 +468 @@
 
         void addToTyVarMap( TypeDecl * tyVar, TyVarMap &tyVarMap ) {
-                // xxx - should this actually be insert?
-                tyVarMap[ tyVar->get_name() ] = TypeDecl::Data{ tyVar };
+                tyVarMap.insert( tyVar->name, TypeDecl::Data{ tyVar } );
         }
 

src/GenPoly/Lvalue.cc ¶

@@ -21 +21 @@
 #include "Lvalue.h"
 
+#include "InitTweak/InitTweak.h"
 #include "Parser/LinkageSpec.h"          // for Spec, isBuiltin, Intrinsic
 #include "ResolvExpr/TypeEnvironment.h"  // for AssertionSet, OpenVarSet
 #include "ResolvExpr/Unify.h"            // for unify
 #include "ResolvExpr/typeops.h"
-#include "SymTab/Autogen.h"
 #include "SymTab/Indexer.h"              // for Indexer
 #include "SynTree/Declaration.h"         // for Declaration, FunctionDecl
@@ -33 +33 @@
 #include "SynTree/Type.h"                // for PointerType, Type, FunctionType
 #include "SynTree/Visitor.h"             // for Visitor, acceptAll
+#include "Validate/FindSpecialDecls.h"   // for dereferenceOperator
 
 #if 0
@@ -44 +45 @@
                 // TODO: fold this into the general createDeref function??
                 Expression * mkDeref( Expression * arg ) {
-                        if ( SymTab::dereferenceOperator ) {
+                        if ( Validate::dereferenceOperator ) {
                                 // note: reference depth can be arbitrarily deep here, so peel off the outermost pointer/reference, not just pointer because they are effecitvely equivalent in this pass
-                                VariableExpr * deref = new VariableExpr( SymTab::dereferenceOperator );
+                                VariableExpr * deref = new VariableExpr( Validate::dereferenceOperator );
                                 deref->result = new PointerType( Type::Qualifiers(), deref->result );
                                 Type * base = InitTweak::getPointerBase( arg->result );
@@ -353 +354 @@
                         Type * destType = castExpr->result;
                         Type * srcType = castExpr->arg->result;
+                        assertf( destType, "Cast to no type in: %s", toCString( castExpr ) );
+                        assertf( srcType, "Cast from no type in: %s", toCString( castExpr ) );
                         int depth1 = destType->referenceDepth();
                         int depth2 = srcType->referenceDepth();

src/GenPoly/ScopedSet.h ¶

@@ -38 +38 @@
                 typedef typename Scope::pointer pointer;
                 typedef typename Scope::const_pointer const_pointer;
-                
+
                 class iterator : public std::iterator< std::bidirectional_iterator_tag,
                                                        value_type > {
@@ -72 +72 @@
                                 return *this;
                         }
-                        
+
                         reference operator* () { return *it; }
                         pointer operator-> () { return it.operator->(); }
@@ -104 +104 @@
                         bool operator!= (const iterator &that) { return !( *this == that ); }
 
+                        size_type get_level() const { return i; }
+
                 private:
                         scope_list const *scopes;
@@ -180 +182 @@
                         bool operator!= (const const_iterator &that) { return !( *this == that ); }
 
+                        size_type get_level() const { return i; }
+
                 private:
                         scope_list const *scopes;
@@ -185 +189 @@
                         size_type i;
                 };
-                
+
                 /// Starts a new scope
                 void beginScope() {
@@ -222 +226 @@
                         return const_iterator( const_cast< ScopedSet< Value >* >(this)->find( key ) );
                 }
-                
+
                 /// Finds the given key in the outermost scope inside the given scope where it occurs
                 iterator findNext( const_iterator &it, const Value &key ) {
@@ -242 +246 @@
                         return std::make_pair( iterator(scopes, res.first, scopes.size()-1), res.second );
                 }
-                
+
         };
 } // namespace GenPoly