Changeset d8ba086

Timestamp:

Apr 29, 2016, 2:39:49 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

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, with_gc

Children:

540de412

Parents:

fea7ca7

Message:

add ?{}, ^{?{} implicit otype assertions to autogenerated generic type functions}

Location:

src

Files:

• SymTab/Autogen.cc (modified) (3 diffs)
• SynTree/TypeSubstitution.h (modified) (2 diffs)

src/SymTab/Autogen.cc

@@ -10 +10 @@
 // Created On       : Thu Mar 03 15:45:56 2016
 // Last Modified By : Rob Schluntz
-// Last Modified On : Thu Apr 14 16:58:35 2016
+// Last Modified On : Fri Apr 29 13:11:04 2016
 // Update Count     : 1
 //
@@ -161 +161 @@
         }
 
-        /// Creates a new type decl that's the same as src, but renamed and with only the ?=? assertion (for complete types only)
+        /// Creates a new type decl that's the same as src, but renamed and with only the ?=?, ?{} (default and copy), and ^?{} assertions (for complete types only)
         TypeDecl *cloneAndRename( TypeDecl *src, const std::string &name ) {
                 TypeDecl *dst = new TypeDecl( name, src->get_storageClass(), 0, src->get_kind() );
 
                 if ( src->get_kind() == TypeDecl::Any ) {
-                        // just include assignment operator assertion
-                        TypeInstType *assignParamType = new TypeInstType( Type::Qualifiers(), name, dst );
-                        FunctionType *assignFunctionType = new FunctionType( Type::Qualifiers(), false );
-                        assignFunctionType->get_returnVals().push_back(
-                                new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, assignParamType->clone(), 0 ) );
-                        assignFunctionType->get_parameters().push_back(
-                                new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), assignParamType->clone() ), 0 ) );
-                        assignFunctionType->get_parameters().push_back(
-                                new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, assignParamType, 0 ) );
-                        FunctionDecl *assignAssert = new FunctionDecl( "?=?", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, assignFunctionType, 0, false, false );
+                        TypeInstType *opParamType = new TypeInstType( Type::Qualifiers(), name, dst );
+                        FunctionType *opFunctionType = new FunctionType( Type::Qualifiers(), false );
+                        opFunctionType->get_parameters().push_back(
+                                new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), opParamType->clone() ), 0 ) );
+                        FunctionDecl *ctorAssert = new FunctionDecl( "?{}", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, opFunctionType->clone(), 0, false, false );
+                        FunctionDecl *dtorAssert = new FunctionDecl( "^?{}", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, opFunctionType->clone(), 0, false, false );
+
+                        opFunctionType->get_parameters().push_back(
+                                new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, opParamType, 0 ) );
+                        FunctionDecl *copyCtorAssert = new FunctionDecl( "?{}", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, opFunctionType->clone(), 0, false, false );
+
+                        opFunctionType->get_returnVals().push_back(
+                                new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, opParamType->clone(), 0 ) );
+                        FunctionDecl *assignAssert = new FunctionDecl( "?=?", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, opFunctionType, 0, false, false );
+
                         dst->get_assertions().push_back( assignAssert );
+                        dst->get_assertions().push_back( ctorAssert );
+                        dst->get_assertions().push_back( dtorAssert );
+                        dst->get_assertions().push_back( copyCtorAssert );
                 }
 
@@ -187 +195 @@
                         field = field->clone();
                         genericSubs.apply( field );
+
+                        if ( src ) {
+                                genericSubs.apply( src );
+                        }
                 }
 

src/SynTree/TypeSubstitution.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Tue Apr 26 11:15:07 2016
+// Last Modified On : Fri Apr 29 13:50:09 2016
 // Update Count     : 2
 //
@@ -152 +152 @@
 template< typename TypeInstListIterator >
 void TypeSubstitution::extract( TypeInstListIterator begin, TypeInstListIterator end, TypeSubstitution &result ) {
+        // xxx - this function doesn't extract varEnv - is this intentional?
         while ( begin != end ) {
                 TypeEnvType::iterator cur = typeEnv.find( (*begin++)->get_name() );