Changeset 5780d0d

Timestamp:

Dec 18, 2024, 10:33:40 AM (2 hours ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Parents:

94aa202

Message:

Removed increment and decrement operators for enumerations from builtins. I am confident the generic fallbacks work because I added tests.

Files:

• libcfa/prelude/builtins.c (modified) (5 diffs)
• tests/.expect/KRfunctions.arm64.txt (modified) (1 diff)
• tests/.expect/KRfunctions.x64.txt (modified) (1 diff)
• tests/.expect/KRfunctions.x86.txt (modified) (1 diff)
• tests/.expect/declarationSpecifier.arm64.txt (modified) (1 diff)
• tests/.expect/declarationSpecifier.x64.txt (modified) (1 diff)
• tests/.expect/declarationSpecifier.x86.txt (modified) (1 diff)
• tests/.expect/extension.arm64.txt (modified) (1 diff)
• tests/.expect/extension.x64.txt (modified) (1 diff)
• tests/.expect/extension.x86.txt (modified) (1 diff)
• tests/.expect/gccExtensions.arm64.txt (modified) (1 diff)
• tests/.expect/gccExtensions.x64.txt (modified) (1 diff)
• tests/.expect/gccExtensions.x86.txt (modified) (1 diff)
• tests/enum_tests/.expect/inc-dec.txt (added)
• tests/enum_tests/inc-dec.cfa (added)

libcfa/prelude/builtins.c

@@ -66 +66 @@
 forall( T & )
 trait is_generator {
-      void main( T & this );
-      generator$ * get_generator( T & this );
+        void main( T & this );
+        generator$ * get_generator( T & this );
 };
 
@@ -234 +234 @@
 static inline
 forall( E | Serial( E ) ) {
-        E ++?( E & l ) {
+        E ?+=?( E & l, one_t ) {
                 int pos = fromInstance( l );
                 l = fromInt_unsafe( pos + 1 );
@@ -240 +240 @@
         }
 
-        E --?( E & l ) {
+        E ?-=?( E & l, one_t ) {
                 int pos = fromInstance( l );
                 l = fromInt_unsafe( pos - 1 );
@@ -246 +246 @@
         }
 
-        E ?+=?( E & l, one_t ) {
-                int pos = fromInstance( l );
-                l = fromInt_unsafe( pos + 1 );
-                return l;
-        }
-
-        E ?-=?( E & l, one_t ) {
-                int pos = fromInstance( l );
-                l = fromInt_unsafe( pos - 1 );
-                return l;
-        }
-
         E ?+=?( E & l, int i ) {
                 int pos = fromInstance( l );
@@ -268 +256 @@
                 l = fromInt_unsafe( pos - i );
                 return l;
-        }
-
-        E ?++( E & l ) {
-                int pos = fromInstance( l );
-                l = fromInt_unsafe( pos + 1 );
-                return fromInt_unsafe( pos );
-        }
-
-        E ?--( E & l ) {
-                int pos = fromInstance( l );
-                l = fromInt_unsafe( pos - 1 );
-                return fromInt_unsafe( pos );
         }
 }

tests/.expect/KRfunctions.arm64.txt

@@ -99 +99 @@
     signed int _X1bi_2;
     {
-        signed int *(*_tmp_cp_ret8)(signed int __param_0, signed int __param_1);
-        ((void)(_X1xFPi_ii__2=(((void)(_tmp_cp_ret8=_X3f10FFPi_ii__iPiPid__1(3, (&_X1ai_2), (&_X1bi_2), 3.5))) , _tmp_cp_ret8)));
+        signed int *(*_tmp_cp_ret4)(signed int __param_0, signed int __param_1);
+        ((void)(_X1xFPi_ii__2=(((void)(_tmp_cp_ret4=_X3f10FFPi_ii__iPiPid__1(3, (&_X1ai_2), (&_X1bi_2), 3.5))) , _tmp_cp_ret4)));
     }
 

tests/.expect/KRfunctions.x64.txt

@@ -99 +99 @@
     signed int _X1bi_2;
     {
-        signed int *(*_tmp_cp_ret8)(signed int __param_0, signed int __param_1);
-        ((void)(_X1xFPi_ii__2=(((void)(_tmp_cp_ret8=_X3f10FFPi_ii__iPiPid__1(3, (&_X1ai_2), (&_X1bi_2), 3.5))) , _tmp_cp_ret8)));
+        signed int *(*_tmp_cp_ret4)(signed int __param_0, signed int __param_1);
+        ((void)(_X1xFPi_ii__2=(((void)(_tmp_cp_ret4=_X3f10FFPi_ii__iPiPid__1(3, (&_X1ai_2), (&_X1bi_2), 3.5))) , _tmp_cp_ret4)));
     }
 

tests/.expect/KRfunctions.x86.txt

@@ -99 +99 @@
     signed int _X1bi_2;
     {
-        signed int *(*_tmp_cp_ret8)(signed int __param_0, signed int __param_1);
-        ((void)(_X1xFPi_ii__2=(((void)(_tmp_cp_ret8=_X3f10FFPi_ii__iPiPid__1(3, (&_X1ai_2), (&_X1bi_2), 3.5))) , _tmp_cp_ret8)));
+        signed int *(*_tmp_cp_ret4)(signed int __param_0, signed int __param_1);
+        ((void)(_X1xFPi_ii__2=(((void)(_tmp_cp_ret4=_X3f10FFPi_ii__iPiPid__1(3, (&_X1ai_2), (&_X1bi_2), 3.5))) , _tmp_cp_ret4)));
     }
 

tests/.expect/declarationSpecifier.arm64.txt

@@ -949 +949 @@
     }
 
-    signed int _tmp_cp_ret8;
-    signed int _X3reti_2 = (((void)(_tmp_cp_ret8=invoke_main(_X4argci_1, _X4argvPPc_1, _X4envpPPc_1))) , _tmp_cp_ret8);
+    signed int _tmp_cp_ret4;
+    signed int _X3reti_2 = (((void)(_tmp_cp_ret4=invoke_main(_X4argci_1, _X4argvPPc_1, _X4envpPPc_1))) , _tmp_cp_ret4);
     if ( ((&_X17cfa_main_returnedi_1)!=((signed int *)0)) ) {
         {

tests/.expect/declarationSpecifier.x64.txt

@@ -949 +949 @@
     }
 
-    signed int _tmp_cp_ret8;
-    signed int _X3reti_2 = (((void)(_tmp_cp_ret8=invoke_main(_X4argci_1, _X4argvPPc_1, _X4envpPPc_1))) , _tmp_cp_ret8);
+    signed int _tmp_cp_ret4;
+    signed int _X3reti_2 = (((void)(_tmp_cp_ret4=invoke_main(_X4argci_1, _X4argvPPc_1, _X4envpPPc_1))) , _tmp_cp_ret4);
     if ( ((&_X17cfa_main_returnedi_1)!=((signed int *)0)) ) {
         {

tests/.expect/declarationSpecifier.x86.txt

@@ -949 +949 @@
     }
 
-    signed int _tmp_cp_ret8;
-    signed int _X3reti_2 = (((void)(_tmp_cp_ret8=invoke_main(_X4argci_1, _X4argvPPc_1, _X4envpPPc_1))) , _tmp_cp_ret8);
+    signed int _tmp_cp_ret4;
+    signed int _X3reti_2 = (((void)(_tmp_cp_ret4=invoke_main(_X4argci_1, _X4argvPPc_1, _X4envpPPc_1))) , _tmp_cp_ret4);
     if ( ((&_X17cfa_main_returnedi_1)!=((signed int *)0)) ) {
         {

tests/.expect/extension.arm64.txt

@@ -445 +445 @@
 
     {
-        signed int _tmp_cp_ret8;
-        ((void)(((void)(_tmp_cp_ret8=__extension__ _X4fredFi_i__1(3))) , _tmp_cp_ret8));
+        signed int _tmp_cp_ret4;
+        ((void)(((void)(_tmp_cp_ret4=__extension__ _X4fredFi_i__1(3))) , _tmp_cp_ret4));
     }
 

tests/.expect/extension.x64.txt

@@ -445 +445 @@
 
     {
-        signed int _tmp_cp_ret8;
-        ((void)(((void)(_tmp_cp_ret8=__extension__ _X4fredFi_i__1(3))) , _tmp_cp_ret8));
+        signed int _tmp_cp_ret4;
+        ((void)(((void)(_tmp_cp_ret4=__extension__ _X4fredFi_i__1(3))) , _tmp_cp_ret4));
     }
 

tests/.expect/extension.x86.txt

@@ -445 +445 @@
 
     {
-        signed int _tmp_cp_ret8;
-        ((void)(((void)(_tmp_cp_ret8=__extension__ _X4fredFi_i__1(3))) , _tmp_cp_ret8));
+        signed int _tmp_cp_ret4;
+        ((void)(((void)(_tmp_cp_ret4=__extension__ _X4fredFi_i__1(3))) , _tmp_cp_ret4));
     }
 

tests/.expect/gccExtensions.arm64.txt

@@ -339 +339 @@
     }
 
-    signed int _tmp_cp_ret8;
-    signed int _X3reti_2 = (((void)(_tmp_cp_ret8=invoke_main(_X4argci_1, _X4argvPPc_1, _X4envpPPc_1))) , _tmp_cp_ret8);
+    signed int _tmp_cp_ret4;
+    signed int _X3reti_2 = (((void)(_tmp_cp_ret4=invoke_main(_X4argci_1, _X4argvPPc_1, _X4envpPPc_1))) , _tmp_cp_ret4);
     if ( ((&_X17cfa_main_returnedi_1)!=((signed int *)0)) ) {
         {

tests/.expect/gccExtensions.x64.txt

@@ -339 +339 @@
     }
 
-    signed int _tmp_cp_ret8;
-    signed int _X3reti_2 = (((void)(_tmp_cp_ret8=invoke_main(_X4argci_1, _X4argvPPc_1, _X4envpPPc_1))) , _tmp_cp_ret8);
+    signed int _tmp_cp_ret4;
+    signed int _X3reti_2 = (((void)(_tmp_cp_ret4=invoke_main(_X4argci_1, _X4argvPPc_1, _X4envpPPc_1))) , _tmp_cp_ret4);
     if ( ((&_X17cfa_main_returnedi_1)!=((signed int *)0)) ) {
         {

tests/.expect/gccExtensions.x86.txt

@@ -317 +317 @@
     }
 
-    signed int _tmp_cp_ret8;
-    signed int _X3reti_2 = (((void)(_tmp_cp_ret8=invoke_main(_X4argci_1, _X4argvPPc_1, _X4envpPPc_1))) , _tmp_cp_ret8);
+    signed int _tmp_cp_ret4;
+    signed int _X3reti_2 = (((void)(_tmp_cp_ret4=invoke_main(_X4argci_1, _X4argvPPc_1, _X4envpPPc_1))) , _tmp_cp_ret4);
     if ( ((&_X17cfa_main_returnedi_1)!=((signed int *)0)) ) {
         {