Sol Part 55: Now Not A Tautology!

runtime.c

@@ -577,7 +577,7 @@ sol_object_t *sol_eval_inner(sol_state_t *state, expr_node *expr, jmp_buf jmp) {
 					ERR_CHECK(state);
 					rint = sol_cast_int(state, right);
 					ERR_CHECK(state);
-					res = sol_new_int(state, BOOL_TO_INT(lint && rint));
+					res = sol_new_int(state, BOOL_TO_INT(lint->ival && rint->ival));
 					sol_obj_free(lint);
 					sol_obj_free(rint);
 					break;
@@ -587,7 +587,7 @@ sol_object_t *sol_eval_inner(sol_state_t *state, expr_node *expr, jmp_buf jmp) {
 					ERR_CHECK(state);
 					rint = sol_cast_int(state, right);
 					ERR_CHECK(state);
-					res = sol_new_int(state, BOOL_TO_INT(lint || rint));
+					res = sol_new_int(state, BOOL_TO_INT(lint->ival || rint->ival));
 					sol_obj_free(lint);
 					sol_obj_free(rint);
 					break;

sol.h

@@ -10,7 +10,7 @@
 #include "dsl/dsl.h"
 
 /** The version of the project, as made available through `debug.version`. */
-#define VERSION "0.2a2"
+#define VERSION "0.2a3"
 /** The hexadecimal version of the project, formatted 0xAAIIRPP where:
  * 
  * - AA is the two-digit major version
@@ -18,9 +18,9 @@
  * - R is 'A' for alpha, 'B' for beta, 'C' for candidate, and 'F' for final
  * - PP is the two-digit patch
  *
- * This value is guaranteed to always increase by revision.
+ * This value is guaranteed to only monotonically increase by revision.
  */
-#define HEXVER 0x0002A02
+#define HEXVER 0x0002A03
 
 #ifndef SOL_ICACHE_MIN
 /** The smallest integer to cache. */

tests/basic_logic.sol

@@ -0,0 +1,11 @@
+execfile("tests/_lib.sol")
+
+assert_eq(0 || 0, 0, "LOR")
+assert_eq(1 || 0, 1, "LOR")
+assert_eq(0 || 1, 1, "LOR")
+assert_eq(1 || 1, 1, "LOR")
+
+assert_eq(0 && 0, 0, "LAND")
+assert_eq(1 && 0, 0, "LAND")
+assert_eq(0 && 1, 0, "LAND")
+assert_eq(1 && 1, 1, "LAND")