Changeset 73bf8cf2 for src/GenPoly

Timestamp:

Aug 3, 2016, 11:22:09 AM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

f9cebb5

Parents:

8a443f4 (diff), aea7168 (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 ctor

File:

• src/GenPoly/Box.cc (modified) (9 diffs)

src/GenPoly/Box.cc

@@ -619 +619 @@
                         return 0;
                 }
-                
+
                 /// Returns T if the given declaration is a function with parameters (T*, T) for some TypeInstType T, NULL otherwise
                 TypeInstType *isTypeInstPtrValFn( DeclarationWithType *decl ) {
@@ -637 +637 @@
                         return 0;
                 }
-                
+
                 /// Returns T if the given declaration is (*?=?)(T *, T) for some TypeInstType T (return not checked, but maybe should be), NULL otherwise
                 TypeInstType *isTypeInstAssignment( DeclarationWithType *decl ) {
@@ -677 +677 @@
                         return 0;
                 }
-                
+
                 /// Returns T if the given declaration is a function with parameters (T*, T) for some type T, where neither parameter is cv-qualified,
                 /// NULL otherwise
@@ -772 +772 @@
                                 copyOps.beginScope();
                                 dtorOps.beginScope();
-                                
+
                                 DeclarationWithType *oldRetval = retval;
                                 bool oldUseRetval = useRetval;
@@ -1471 +1471 @@
                 VariableExpr *wrapFunctionDecl( DeclarationWithType *functionDecl ) {
                         // line below cloned from FixFunction.cc
+                        // xxx - functionObj is never added to a list of declarations...
                         ObjectDecl *functionObj = new ObjectDecl( functionDecl->get_name(), functionDecl->get_storageClass(), functionDecl->get_linkage(), 0,
                                                                   new PointerType( Type::Qualifiers(), functionDecl->get_type()->clone() ), 0 );
                         functionObj->set_mangleName( functionDecl->get_mangleName() );
+                        functionObj->set_scopeLevel( functionDecl->get_scopeLevel() );
                         return new VariableExpr( functionObj );
                 }
@@ -1492 +1494 @@
                                         = ParamEntry( assertOp->get_uniqueId(), assertOp->get_type()->clone(), actualDecl->get_type()->clone(), wrapFunctionDecl( assertOp ) );
                 }
-                
+
                 Statement * Pass1::mutate( ReturnStmt *returnStmt ) {
                         if ( retval && returnStmt->get_expr() ) {
@@ -1554 +1556 @@
                                                 DeclarationWithType *assertDtor = findOpForType( formalType, dtorOps, scopedDtorOps );
                                                 if ( ! assertDtor ) throw SemanticError( "No destructor found for ", formalType );
-                                                
+
                                                 // add inferred parameters for otype operators to assignment expression
                                                 // NOTE: Code here assumes that first four assertions are assign op, ctor, copy ctor, dtor, in that order
@@ -1568 +1570 @@
                                                 ++actualIt;
                                                 addAssertionFor( assignExpr, *actualIt, assertDtor );
-                                                
-                                                //DeclarationWithType *actualDecl = asserts.front();
-                                                //assignExpr->get_inferParams()[ actualDecl->get_uniqueId() ]
-                                                //      = ParamEntry( assertAssign->get_uniqueId(), assertAssign->get_type()->clone(), actualDecl->get_type()->clone(), wrapFunctionDecl( assertAssign ) );
+
                                         }
                                 }
@@ -2181 +2180 @@
                 bool PolyGenericCalculator::findGeneric( Type *ty ) {
                         ty = replaceTypeInst( ty, env );
-                        
+
                         if ( TypeInstType *typeInst = dynamic_cast< TypeInstType* >( ty ) ) {
                                 if ( scopeTyVars.find( typeInst->get_name() ) != scopeTyVars.end() ) {