Changeset 1d17939

Timestamp:

Jul 29, 2020, 5:12:28 PM (4 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

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

Children:

b81fd95

Parents:

15806ed

Message:

Implemented the recomented fix for #204, added at test that would have failed without it.

Files:

• src/ResolvExpr/ConversionCost.cc (modified) (3 diffs)
• src/ResolvExpr/ConversionCost.h (modified) (3 diffs)
• tests/.expect/castError.txt (modified) (3 diffs)
• tests/castError.cfa (modified) (2 diffs)

src/ResolvExpr/ConversionCost.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 07:06:19 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Mon Aug 12 10:21:00 2019
-// Update Count     : 27
+// Last Modified On : Wed Jul 29 16:11:00 2020
+// Update Count     : 28
 //
 
@@ -392 +392 @@
         void ConversionCost::postvisit( const FunctionType * ) {}
 
-        void ConversionCost::postvisit( const StructInstType * inst ) {
-                if ( const StructInstType * destAsInst = dynamic_cast< const StructInstType * >( dest ) ) {
-                        if ( inst->name == destAsInst->name ) {
-                                cost = Cost::zero;
-                        } // if
-                } // if
-        }
-
-        void ConversionCost::postvisit( const UnionInstType * inst ) {
-                if ( const UnionInstType * destAsInst = dynamic_cast< const UnionInstType * >( dest ) ) {
-                        if ( inst->name == destAsInst->name ) {
-                                cost = Cost::zero;
-                        } // if
-                } // if
-        }
-
         void ConversionCost::postvisit( const EnumInstType * ) {
                 static Type::Qualifiers q;
@@ -681 +665 @@
 }
 
-void ConversionCost_new::postvisit( const ast::StructInstType * structInstType ) {
-        if ( const ast::StructInstType * dstAsInst =
-                        dynamic_cast< const ast::StructInstType * >( dst ) ) {
-                if ( structInstType->name == dstAsInst->name ) {
-                        cost = Cost::zero;
-                }
-        }
-}
-
-void ConversionCost_new::postvisit( const ast::UnionInstType * unionInstType ) {
-        if ( const ast::UnionInstType * dstAsInst =
-                        dynamic_cast< const ast::UnionInstType * >( dst ) ) {
-                if ( unionInstType->name == dstAsInst->name ) {
-                        cost = Cost::zero;
-                }
-        }
-}
-
 void ConversionCost_new::postvisit( const ast::EnumInstType * enumInstType ) {
         (void)enumInstType;

src/ResolvExpr/ConversionCost.h

@@ -10 +10 @@
 // Created On       : Sun May 17 09:37:28 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Thu Aug  8 16:13:00 2019
-// Update Count     : 6
+// Last Modified On : Wed Jul 29 16:12:00 2020
+// Update Count     : 7
 //
 
@@ -51 +51 @@
                 void postvisit( const ReferenceType * refType );
                 void postvisit( const FunctionType * functionType );
-                void postvisit( const StructInstType * aggregateUseType );
-                void postvisit( const UnionInstType * aggregateUseType );
                 void postvisit( const EnumInstType * aggregateUseType );
                 void postvisit( const TraitInstType * aggregateUseType );
@@ -102 +100 @@
         void postvisit( const ast::ReferenceType * refType );
         void postvisit( const ast::FunctionType * functionType );
-        void postvisit( const ast::StructInstType * structInstType );
-        void postvisit( const ast::UnionInstType * unionInstType );
         void postvisit( const ast::EnumInstType * enumInstType );
         void postvisit( const ast::TraitInstType * traitInstType );

tests/.expect/castError.txt

@@ -1 @@
-castError.cfa:21:1 error: Cannot choose between 3 alternatives for expression
+castError.cfa:23:1 error: Cannot choose between 3 alternatives for expression
 Explicit Cast of:
   Name: f
@@ -35 +35 @@
 
 
-castError.cfa:26:1 error: Cannot choose between 2 alternatives for expression
+castError.cfa:28:1 error: Cannot choose between 2 alternatives for expression
 Generated Cast of:
   Comma Expression:
@@ -62 +62 @@
 
 
+castError.cfa:30:1 error: No reasonable alternatives for expression Explicit Cast of:
+  Name: sint
+... to:
+  instance of struct S with body 1
+  ... with parameters
+    char
+

tests/castError.cfa

@@ -14 +14 @@
 // 
 
+forall(otype T) struct S { T p; };
 int f;
+S(int) sint;
 
 void f() {
@@ -25 +27 @@
         short int v;
         3, v;           // implicit void cast
+
+        (S(char)) sint;
 }