Changeset 478dade

Timestamp:

Sep 9, 2024, 6:30:08 AM (2 days ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

02101a4, d93b813

Parents:

29c8675 (diff), a933489b (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

Files:

• src/ControlStruct/ExceptDecl.cpp (modified) (2 diffs)
• 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/ControlStruct/ExceptDecl.cpp

@@ -9 +9 @@
 // Author           : Andrew Beach
 // Created On       : Tue Jul 12 15:50:00 2022
-// Last Modified By : Andrew Beach
-// Last Modified On : Mon Jul 18 11:01:00 2022
-// Update Count     : 0
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Sep  7 12:05:55 2024
+// Update Count     : 1
 //
 
@@ -286 +286 @@
                         new ast::ExprStmt( location,
                                 new ast::UntypedExpr( location,
-                                        new ast::NameExpr( location, "?=?" ),
+                                        new ast::NameExpr( location, "?{}" ),
                                         {
                                                 new ast::UntypedExpr( location,

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