Changeset 937e51d for src/GenPoly

Timestamp:

Jun 26, 2015, 4:00:26 PM (11 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

0df292b, e0ff3e6

Parents:

eb50842 (diff), 1869adf (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 pointer to pointer to qualified fix into master

Location:

src/GenPoly

Files:

• Box.cc (modified) (9 diffs)
• Specialize.cc (modified) (3 diffs)
• module.mk (modified) (2 diffs)

src/GenPoly/Box.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May 19 07:31:41 2015
-// Update Count     : 1
+// Last Modified On : Sat Jun 13 09:12:19 2015
+// Update Count     : 4
 //
 
@@ -26 +26 @@
 #include "ScrubTyVars.h"
 
-#include "SynTree/Declaration.h"
+#include "Parser/ParseNode.h"
+
 #include "SynTree/Type.h"
 #include "SynTree/Expression.h"
@@ -32 +33 @@
 #include "SynTree/Statement.h"
 #include "SynTree/Mutator.h"
+
 #include "ResolvExpr/TypeEnvironment.h"
+
 #include "SymTab/Mangler.h"
 
@@ -282 +285 @@
 
                 ObjectDecl *Pass1::makeTemporary( Type *type ) {
-                        ObjectDecl *newObj = new ObjectDecl( tempNamer.newName(), Declaration::NoStorageClass, LinkageSpec::C, 0, type, 0 );
+                        ObjectDecl *newObj = new ObjectDecl( tempNamer.newName(), DeclarationNode::NoStorageClass, LinkageSpec::C, 0, type, 0 );
                         stmtsToAdd.push_back( new DeclStmt( noLabels, newObj ) );
                         return newObj;
@@ -362 +365 @@
                                         arg = new AddressExpr( arg );
                                 } else {
-                                        ObjectDecl *newObj = new ObjectDecl( tempNamer.newName(), Declaration::NoStorageClass, LinkageSpec::C, 0, arg->get_results().front()->clone(), 0 );
+                                        ObjectDecl *newObj = new ObjectDecl( tempNamer.newName(), DeclarationNode::NoStorageClass, LinkageSpec::C, 0, arg->get_results().front()->clone(), 0 );
                                         newObj->get_type()->get_qualifiers() = Type::Qualifiers();
                                         stmtsToAdd.push_back( new DeclStmt( noLabels, newObj ) );
@@ -433 +436 @@
                                 makeRetParm( adapter );
                         } // if
-                        adapter->get_parameters().push_front( new ObjectDecl( "", Declaration::NoStorageClass, LinkageSpec::C, 0, new PointerType( Type::Qualifiers(), new FunctionType( Type::Qualifiers(), true ) ), 0 ) );
+                        adapter->get_parameters().push_front( new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::C, 0, new PointerType( Type::Qualifiers(), new FunctionType( Type::Qualifiers(), true ) ), 0 ) );
                         return adapter;
                 }
@@ -521 +524 @@
                         adapterBody->get_kids().push_back( bodyStmt );
                         std::string adapterName = makeAdapterName( mangleName );
-                        return new FunctionDecl( adapterName, Declaration::NoStorageClass, LinkageSpec::C, adapterType, adapterBody, false );
+                        return new FunctionDecl( adapterName, DeclarationNode::NoStorageClass, LinkageSpec::C, adapterType, adapterBody, false, false );
                 }
 
@@ -902 +905 @@
                                 if ( adaptersDone.find( mangleName ) == adaptersDone.end() ) {
                                         std::string adapterName = makeAdapterName( mangleName );
-                                        paramList.push_front( new ObjectDecl( adapterName, Declaration::NoStorageClass, LinkageSpec::C, 0, new PointerType( Type::Qualifiers(), makeAdapterType( *funType, scopeTyVars ) ), 0 ) );
+                                        paramList.push_front( new ObjectDecl( adapterName, DeclarationNode::NoStorageClass, LinkageSpec::C, 0, new PointerType( Type::Qualifiers(), makeAdapterType( *funType, scopeTyVars ) ), 0 ) );
                                         adaptersDone.insert( adaptersDone.begin(), mangleName );
                                 }
@@ -961 +964 @@
                         std::list< DeclarationWithType *>::iterator last = funcType->get_parameters().begin();
                         std::list< DeclarationWithType *> inferredParams;
-                        ObjectDecl *newObj = new ObjectDecl( "", Declaration::NoStorageClass, LinkageSpec::C, 0, new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ), 0 );
-///   ObjectDecl *newFunPtr = new ObjectDecl( "", Declaration::NoStorageClass, LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), new FunctionType( Type::Qualifiers(), true ) ), 0 );
+                        ObjectDecl *newObj = new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::C, 0, new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ), 0 );
+///   ObjectDecl *newFunPtr = new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), new FunctionType( Type::Qualifiers(), true ) ), 0 );
                         for ( std::list< TypeDecl *>::const_iterator tyParm = funcType->get_forall().begin(); tyParm != funcType->get_forall().end(); ++tyParm ) {
                                 ObjectDecl *thisParm;

src/GenPoly/Specialize.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May 19 07:55:09 2015
-// Update Count     : 4
+// Last Modified On : Sat Jun 13 15:54:07 2015
+// Update Count     : 6
 //
 
@@ -19 +19 @@
 #include "PolyMutator.h"
 
-#include "SynTree/Declaration.h"
+#include "Parser/ParseNode.h"
+
+#include "SynTree/Expression.h"
 #include "SynTree/Statement.h"
-#include "SynTree/Expression.h"
 #include "SynTree/Type.h"
 #include "SynTree/TypeSubstitution.h"
@@ -96 +97 @@
                                         newEnv.applyFree( newType );
                                 } // if
-                                FunctionDecl *thunkFunc = new FunctionDecl( thunkNamer.newName(), Declaration::NoStorageClass, LinkageSpec::C, newType, new CompoundStmt( std::list< std::string >() ), false );
+                                FunctionDecl *thunkFunc = new FunctionDecl( thunkNamer.newName(), DeclarationNode::NoStorageClass, LinkageSpec::C, newType, new CompoundStmt( std::list< std::string >() ), false, false );
                                 thunkFunc->fixUniqueId();
 

src/GenPoly/module.mk

@@ +1 @@
+######################### -*- Mode: Makefile-Gmake -*- ########################
+##
+## Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
+##
+## The contents of this file are covered under the licence agreement in the
+## file "LICENCE" distributed with Cforall.
+##
+## module.mk -- 
+##
+## Author           : Richard C. Bilson
+## Created On       : Mon Jun  1 17:49:17 2015
+## Last Modified By : Peter A. Buhr
+## Last Modified On : Mon Jun  1 17:52:30 2015
+## Update Count     : 1
+###############################################################################
+
 SRC += GenPoly/Box.cc \
        GenPoly/GenPoly.cc \
@@ -7 +23 @@
        GenPoly/CopyParams.cc \
        GenPoly/FindFunction.cc
-