Changeset dafbde8 for src

Timestamp:

Jan 20, 2021, 4:49:40 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

454f478

Parents:

92bfda0 (diff), fd54fef (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src

Files:

• Parser/parser.yy (modified) (1 diff)
• ResolvExpr/PolyCost.cc (modified) (2 diffs)
• ResolvExpr/SpecCost.cc (modified) (6 diffs)

src/Parser/parser.yy

@@ -2441 +2441 @@
 type_parameter:                                                                                 // CFA
         type_class identifier_or_type_name
-                { typedefTable.addToScope( *$2, TYPEDEFname, "9" ); }
+                {   typedefTable.addToScope( *$2, TYPEDEFname, "9" );
+                        if ( $1 == TypeDecl::Otype ) { SemanticError( yylloc, "otype keyword is deprecated" ); }
+                        if ( $1 == TypeDecl::Dtype ) { SemanticError( yylloc, "dtype keyword is deprecated" ); }
+                        if ( $1 == TypeDecl::Ttype ) { SemanticError( yylloc, "ttype keyword is deprecated" ); }
+                }
           type_initializer_opt assertion_list_opt
                 { $$ = DeclarationNode::newTypeParam( $1, $2 )->addTypeInitializer( $4 )->addAssertions( $5 ); }

src/ResolvExpr/PolyCost.cc

@@ -35 +35 @@
                 PassVisitor<PolyCost> coster( env, indexer );
                 type->accept( coster );
-                return coster.pass.result;
+                return (coster.pass.result > 0) ? 1 : 0;
         }
 
@@ -87 +87 @@
         ast::Pass<PolyCost_new> costing( symtab, env );
         type->accept( costing );
-        return costing.core.result;
+        return (costing.core.result > 0) ? 1 : 0;
 }
 

src/ResolvExpr/SpecCost.cc

@@ -43 +43 @@
                 // mark specialization of base type
                 void postvisit(ReferenceType*) { if ( count >= 0 ) ++count; }
+
+                void postvisit(StructInstType*) { if ( count >= 0 ) ++count; }
+                void postvisit(UnionInstType*) { if ( count >= 0 ) ++count; }
 
         private:
@@ -82 +85 @@
                 void previsit(StructInstType* sty) {
                         count = minover( sty->parameters );
-                        visit_children = false;
                 }
 
@@ -88 +90 @@
                 void previsit(UnionInstType* uty) {
                         count = minover( uty->parameters );
-                        visit_children = false;
                 }
 
@@ -174 +175 @@
                 void postvisit( const ast::ArrayType * ) { if ( count >= 0 ) ++count; }
                 void postvisit( const ast::ReferenceType * ) { if ( count >= 0 ) ++count; }
+
+                void postvisit( const ast::StructInstType * ) { if ( count >= 0 ) ++count; }
+                void postvisit( const ast::UnionInstType * ) { if ( count >= 0 ) ++count; }
 
                 // Use the minimal specialization value over returns and params.
@@ -189 +193 @@
                 void previsit( const ast::StructInstType * sty ) {
                         count = minimumPresent( sty->params, expr_result );
-                        visit_children = false;
                 }
 
@@ -195 +198 @@
                 void previsit( const ast::UnionInstType * uty ) {
                         count = minimumPresent( uty->params, expr_result );
-                        visit_children = false;
                 }