Changeset 119889f

Timestamp:

Apr 9, 2025, 9:07:31 PM (5 months ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

master

Children:

6174ecc

Parents:

50e8125

Message:

Partially fix #185.

This fix applies to functions, but not types.

The added test fails without the cfacpp changes.

Files:

• src/AST/Util.cpp (modified) (1 diff)
• src/Parser/TypeData.cpp (modified) (1 diff)
• src/Parser/parser.yy (modified) (1 diff)
• src/SymTab/Mangler.cpp (modified) (1 diff)
• tests/.expect/poly-bare-assn.txt (added)
• tests/poly-bare-assn.cfa (added)

src/AST/Util.cpp

@@ -260 +260 @@
                         }
                 }
+                if ( ! type->assertions.empty() ) visit_children = false;
         }
 

src/Parser/TypeData.cpp

@@ -1585 +1585 @@
         buildParamList( td->function.params, params );
         buildForall( td->forall, forall );
-        // Functions do not store their assertions there anymore.
+        // Functions do not store their assertions there anymore.  <-- FIXME: clarify or remove this comment
+        // Assertions were parsed as belonging to the type that preceded them.
+        // forall ( T | is_foo(T), U | are_bar(T, U) )
+        //   => parse
+        // forall( [ typarm( T, [is_foo(T)] ), typarm( U, [are_bar(T, U)] ) ] )
+        //   => now, flatten as
+        // forall( [ T, U ] ), assns( [ is_foo(T), are_bar(T, U)] )
         for ( ast::ptr<ast::TypeDecl> & type_param : forall ) {
                 auto mut = type_param.get_and_mutate();
                 splice( assertions, mut->assertions );
+        }
+        // When assertions without a type preceding them were parsed, placeholder
+        // types were invented to hold them.
+        // forall ( | is_foo(), U | is_bar(U) )
+        //   => parse
+        // forall( [ typarm( PLCHLD, [is_foo()] ), typarm( U, [is_bar(U)] ) ] )
+        //   => prev step
+        // forall( [ PLCHLD, U ] ), assns( [ is_foo(), is_bar(U)] )
+        //   => now, remove the placeholders
+        // forall( [ U ] ), assns( [ is_foo(), is_bar(U)] )
+        for (std::vector<ast::ptr<ast::TypeDecl>>::iterator it = forall.begin();
+                        it != forall.end(); ) {
+                // placeholder types have empty names
+                if ( (*it)->name == "" ) it = forall.erase(it);
+                else ++it;
         }
         if ( td->base ) {

src/Parser/parser.yy

@@ -3132 +3132 @@
         // | type_specifier identifier_parameter_declarator
         | assertion_list
-                { $$ = DeclarationNode::newTypeParam( ast::TypeDecl::Dtype, new string( DeclarationNode::anonymous.newName() ) )->addAssertions( $1 ); }
+                // Invent a placeholder type to wrap these bare assertions.  Rely on buildFunctionDecl to remove the placeholder.
+                { $$ = DeclarationNode::newTypeParam( ast::TypeDecl::Dtype, new string( "" ) )->addAssertions( $1 ); }
         | ENUM '(' identifier_or_type_name ')' identifier_or_type_name new_type_class type_initializer_opt assertion_list_opt
                 {       

src/SymTab/Mangler.cpp

@@ -290 +290 @@
         if ( typeMode ) return;
         auto funcType = dynamic_cast<const ast::FunctionType *>( type );
-        if ( funcType && !funcType->forall.empty() ) {
+        if ( funcType && (!funcType->forall.empty() || !funcType->assertions.empty()) ) {
                 std::list< std::string > assertionNames;
                 int dcount = 0, fcount = 0, vcount = 0, acount = 0;