Changeset 97b47ec

Timestamp:

Jun 23, 2023, 11:24:07 AM (13 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

1fbf481

Parents:

fe0b94f

Message:

The 'sized' trait is now implemented on top of 'T *' declarations and has no special status in the compiler.

Files:

• libcfa/prelude/prelude-gen.cc (modified) (1 diff)
• src/AST/Decl.cpp (modified) (1 diff)
• src/Validate/LinkReferenceToTypes.cpp (modified) (1 diff)

libcfa/prelude/prelude-gen.cc

@@ -159 +159 @@
 int main() {
         cout << "# 2 \"prelude.cfa\"  // needed for error messages from this file" << endl;
-        cout << "forall( T & ) trait sized {};" << endl;
+        cout << "forall( T * ) trait sized {};" << endl;
 
         cout << "//////////////////////////" << endl;

src/AST/Decl.cpp

@@ -115 +115 @@
         static_assert( sizeof(kindNames) / sizeof(kindNames[0]) == TypeDecl::NUMBER_OF_KINDS, "typeString: kindNames is out of sync." );
         assertf( kind < TypeDecl::NUMBER_OF_KINDS, "TypeDecl kind is out of bounds." );
-        return sized ? kindNames[ kind ] : &kindNames[ kind ][ sizeof("sized") ]; // sizeof includes '\0'
+        // sizeof("sized") includes '\0' and gives the offset to remove "sized ".
+        return sized ? kindNames[ kind ] : &kindNames[ kind ][ sizeof("sized") ];
 }
 

src/Validate/LinkReferenceToTypes.cpp

@@ -264 +264 @@
 
 ast::TraitDecl const * LinkTypesCore::postvisit( ast::TraitDecl const * decl ) {
-        auto mut = ast::mutate( decl );
-        if ( mut->name == "sized" ) {
-                // "sized" is a special trait - flick the sized status on for the type variable.
-                assertf( mut->params.size() == 1, "Built-in trait 'sized' has incorrect number of parameters: %zd", decl->params.size() );
-                ast::TypeDecl * td = mut->params.front().get_and_mutate();
-                td->sized = true;
-        }
-
         // There is some overlap with code from decayForallPointers,
         // perhaps reorganization or shared helper functions are called for.
         // Move assertions from type parameters into the body of the trait.
+        auto mut = ast::mutate( decl );
         for ( ast::ptr<ast::TypeDecl> const & td : decl->params ) {
                 auto expanded = expandAssertions( td->assertions );