Changeset ce8c12f for src/InitTweak

Timestamp:

May 15, 2017, 11:30:26 AM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

d36c117

Parents:

65aca88

Message:

initial work on references: reference types passed through the system, very simple examples work

Location:

src/InitTweak

Files:

• FixInit.cc (modified) (1 diff)
• GenInit.cc (modified) (1 diff)
• InitTweak.cc (modified) (2 diffs)

src/InitTweak/FixInit.cc ¶

@@ -400 +400 @@
 
                 bool ResolveCopyCtors::skipCopyConstruct( Type * type ) {
-                        return dynamic_cast< VarArgsType * >( type ) || GenPoly::getFunctionType( type ) || Tuples::isTtype( type );
+                        return dynamic_cast< VarArgsType * >( type ) || dynamic_cast< ReferenceType * >( type ) || GenPoly::getFunctionType( type ) || Tuples::isTtype( type );
                 }
 

src/InitTweak/GenInit.cc ¶

@@ -243 +243 @@
                         std::list< DeclarationWithType * > & params = GenPoly::getFunctionType( dwt->get_type() )->get_parameters();
                         assert( ! params.empty() );
-                        PointerType * type = safe_dynamic_cast< PointerType * >( params.front()->get_type() );
-                        managedTypes.insert( SymTab::Mangler::mangle( type->get_base() ) );
+                        Type * type = InitTweak::getPointerBase( params.front()->get_type() );
+                        assert( type );
+                        managedTypes.insert( SymTab::Mangler::mangle( type ) );
                 }
         }

src/InitTweak/InitTweak.cc ¶

@@ -461 +461 @@
                 } else if ( ArrayType * arrayType = dynamic_cast< ArrayType * >( type ) ) {
                         return arrayType->get_base();
+                } else if ( ReferenceType * refType = dynamic_cast< ReferenceType * >( type ) ) {
+                        return refType->get_base();
                 } else {
                         return NULL;
@@ -544 +546 @@
                 if ( ftype->get_parameters().size() != 2 ) return 0;
 
-                Type * t1 = ftype->get_parameters().front()->get_type();
+                Type * t1 = getPointerBase( ftype->get_parameters().front()->get_type() );
                 Type * t2 = ftype->get_parameters().back()->get_type();
-                PointerType * ptrType = dynamic_cast< PointerType * > ( t1 );
-                assert( ptrType );
-
-                if ( ResolvExpr::typesCompatibleIgnoreQualifiers( ptrType->get_base(), t2, SymTab::Indexer() ) ) {
+                assert( t1 );
+
+                if ( ResolvExpr::typesCompatibleIgnoreQualifiers( t1, t2, SymTab::Indexer() ) ) {
                         return function;
                 } else {