Changeset 82a5ea2

Timestamp:

Sep 5, 2024, 4:07:48 PM (3 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

a933489b

Parents:

508cff0

Message:

Added checks for (and a test to check the checks) assertions we will not be able to adapt. Using an adapted version of Mike's error message.

Files:

• src/GenPoly/Box.cpp (modified) (1 diff)
• src/Validate/CheckAssertions.cpp (added)
• src/Validate/CheckAssertions.hpp (added)
• src/Validate/module.mk (modified) (1 diff)
• src/main.cpp (modified) (2 diffs)
• tests/.expect/var-assert.txt (added)
• tests/var-assert.cfa (added)

src/GenPoly/Box.cpp

@@ -515 +515 @@
                 ast::FunctionType const * adaptee,
                 TypeVarMap const & typeVars ) {
+        assertf( ast::FixedArgs == adaptee->isVarArgs,
+                "Cannot adapt a varadic function, should have been checked." );
         ast::FunctionType * adapter = ast::deepCopy( adaptee );
         if ( isDynRet( adapter, typeVars ) ) {

src/Validate/module.mk

@@ -21 +21 @@
         Validate/Autogen.cpp \
         Validate/Autogen.hpp \
+        Validate/CheckAssertions.cpp \
+        Validate/CheckAssertions.hpp \
         Validate/CompoundLiteral.cpp \
         Validate/CompoundLiteral.hpp \

src/main.cpp

@@ -67 +67 @@
 #include "Tuples/Tuples.hpp"                // for expandMemberTuples, expan...
 #include "Validate/Autogen.hpp"             // for autogenerateRoutines
+#include "Validate/CheckAssertions.hpp"     // for checkAssertions
 #include "Validate/CompoundLiteral.hpp"     // for handleCompoundLiterals
 #include "Validate/EliminateTypedef.hpp"    // for eliminateTypedef
@@ -314 +315 @@
                 PASS( "Replace Typedefs", Validate::replaceTypedef, transUnit );
                 PASS( "Fix Return Types", Validate::fixReturnTypes, transUnit );
+                PASS( "Check Assertions", Validate::checkAssertions, transUnit );
                 PASS( "Enum and Pointer Decay", Validate::decayEnumsAndPointers, transUnit );