Changeset 8e4f34e

Timestamp:

Dec 10, 2024, 2:28:31 PM (8 days ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

master

Children:

6e6e372

Parents:

fd0a1799

Message:

Allow builtin ++ from += overloads, and similar, to work on a type witout a parameterless constructor

Files:

• libcfa/prelude/builtins.c (modified) (2 diffs)
• tests/zero_one.cfa (modified) (1 diff)

libcfa/prelude/builtins.c

@@ -76 +76 @@
 }
 
+// Nearly "otype," except no parameterless constructor.
+// All you need, to store values in variables and to pass and return by value.
+// Many cases of
+//     forall( T ...
+// can be "simplified" to
+//     forall( T& | is_value(T) ...
+forall( T* )
+trait is_value {
+        void ?{}( T&, T );
+        T ?=?( T&, T );
+        void ^?{}( T& );
+};
+
 // implicit increment, decrement if += defined, and implicit not if != defined
 
@@ -81 +94 @@
 // assignment, but is not an lvalue." Hence, return a value not a reference.
 static inline {
-        forall( T | { T ?+=?( T &, one_t ); } )
+        forall( T& | is_value(T) | { T ?+=?( T &, one_t ); } )
         T ++?( T & x ) { return x += 1; }
 
-        forall( T | { T ?+=?( T &, one_t ); } )
+        forall( T& | is_value(T) | { T ?+=?( T &, one_t ); } )
         T ?++( T & x ) { T tmp = x; x += 1; return tmp; }
 
-        forall( T | { T ?-=?( T &, one_t ); } )
+        forall( T& | is_value(T) | { T ?-=?( T &, one_t ); } )
         T --?( T & x ) { return x -= 1; }
 
-        forall( T | { T ?-=?( T &, one_t ); } )
+        forall( T& | is_value(T) | { T ?-=?( T &, one_t ); } )
         T ?--( T & x ) { T tmp = x; x -= 1; return tmp; }
 
-        forall( T | { int ?!=?( T, zero_t ); } )
+        forall( T& | is_value(T) | { int ?!=?( T, zero_t ); } )
         int !?( T & x ) { return !( x != 0 ); }
 } // distribution

tests/zero_one.cfa

@@ -30 +30 @@
 S ?+=?( S & s, one_t ) { s.[i,j] += 1; return s; } // increment
 S ?-=?( S & s, one_t ) { s.[i,j] -= 1; return s; }
-S ++?( S & s ) { s += 1; return s; }
 int ?!=?( S s, zero_t ) { return s.i != 0 && s.j != 0; } // comparison
 void testInitAssignQueryIncrement() {