Changeset c4497e3 for src

Timestamp:

Jun 26, 2023, 10:11:03 PM (2 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

b9c06b98

Parents:

65ef0cd (diff), 917e1fd (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:

• AST/Decl.cpp (modified) (1 diff)
• Validate/LinkReferenceToTypes.cpp (modified) (1 diff)

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 );