gh-95: Add type BOOL.

Author: python-processing-unit

docs/SPECIFICATION.html

@@ -792,7 +792,7 @@ static Value op_tcp_close(Interpreter* interp, Value* args, int argc, Expr** arg
 		RUNTIME_ERROR(interp, "TCP_CLOSE: invalid handle", line, col);
 	}
 	closesocket(s);
-	return value_int(0);
+	return value_bool(false);
 }
 
 static Value op_udp_bind(Interpreter* interp, Value* args, int argc, Expr** arg_nodes, Env* env, int line, int col) {
@@ -951,7 +951,7 @@ static Value op_udp_close(Interpreter* interp, Value* args, int argc, Expr** arg
 		RUNTIME_ERROR(interp, "UDP_CLOSE: invalid handle", line, col);
 	}
 	closesocket(s);
-	return value_int(0);
+	return value_bool(false);
 }
 
 static Value op_http_get_text(Interpreter* interp, Value* args, int argc, Expr** arg_nodes, Env* env, int line, int col) {
@@ -1203,7 +1203,7 @@ static Value op_ftp_put_bytes(Interpreter* interp, Value* args, int argc, Expr**
 		RUNTIME_ERROR(interp, msg, line, col);
 	}
 	free(out);
-	return value_int(1);
+	return value_bool(true);
 }
 
 static Value op_smtp_send(Interpreter* interp, Value* args, int argc, Expr** arg_nodes, Env* env, int line, int col) {
@@ -1244,7 +1244,7 @@ static Value op_smtp_send(Interpreter* interp, Value* args, int argc, Expr** arg
 		RUNTIME_ERROR(interp, msg, line, col);
 	}
 	free(out);
-	return value_int(1);
+	return value_bool(true);
 }
 
 #ifdef _WIN32

ext/std/networking.c

@@ -92,7 +92,7 @@ static Value op_win_sleep(Interpreter* interp, Value* args, int argc, Expr** arg
 	long long ms = value_as_int(interp, args[0], "ms", line, col);
 	if (interp->error) return value_null();
 	Sleep((DWORD)ms);
-	return value_int(0);
+	return value_bool(false);
 }
 
 static Value op_win_last_error(Interpreter* interp, Value* args, int argc, Expr** arg_nodes, Env* env, int line, int col) {
@@ -147,7 +147,7 @@ static Value op_win_free_library(Interpreter* interp, Value* args, int argc, Exp
 		set_runtime_error(interp, em, line, col);
 		return value_null();
 	}
-	return value_int((int64_t)ok);
+	return value_bool(ok != 0);
 }
 
 static Value op_win_get_proc_address(Interpreter* interp, Value* args, int argc, Expr** arg_nodes, Env* env, int line, int col) {
@@ -255,7 +255,7 @@ static Value op_win_close_handle(Interpreter* interp, Value* args, int argc, Exp
 	long long handle = value_as_int(interp, args[0], "handle", line, col); if (interp->error) return value_null();
 	BOOL ok = CloseHandle((HANDLE)(intptr_t)handle);
 	if (!ok) { DWORD err = GetLastError(); char em[128]; snprintf(em, sizeof(em), "CloseHandle failed: %lu", (unsigned long)err); set_runtime_error(interp, em, line, col); return value_null(); }
-	return value_int((int64_t)ok);
+	return value_bool(ok != 0);
 }
 
 static Value op_win_virtual_alloc(Interpreter* interp, Value* args, int argc, Expr** arg_nodes, Env* env, int line, int col) {
@@ -279,7 +279,7 @@ static Value op_win_virtual_free(Interpreter* interp, Value* args, int argc, Exp
 	DWORD free_type = (DWORD)value_as_int(interp, args[2], "free_type", line, col); if (interp->error) return value_null();
 	BOOL ok = VirtualFree(addr, size, free_type);
 	if (!ok) { DWORD err = GetLastError(); char em[128]; snprintf(em, sizeof(em), "VirtualFree failed: %lu", (unsigned long)err); set_runtime_error(interp, em, line, col); return value_null(); }
-	return value_int((int64_t)ok);
+	return value_bool(ok != 0);
 }
 
 static Value op_win_format_message(Interpreter* interp, Value* args, int argc, Expr** arg_nodes, Env* env, int line, int col) {

ext/std/win32.c

@@ -531,7 +531,7 @@ static Value op_show_image(Interpreter* interp, Value* args, int argc, Expr** ar
 	InvalidateRect(win->hwnd, NULL, TRUE);
 	UpdateWindow(win->hwnd);
 	gui_pump_messages();
-	return value_int(1);
+	return value_bool(true);
 }
 
 static Value op_close_window(Interpreter* interp, Value* args, int argc, Expr** arg_nodes, Env* env, int line, int col) {
@@ -550,7 +550,7 @@ static Value op_close_window(Interpreter* interp, Value* args, int argc, Expr**
 	}
 	DestroyWindow(win->hwnd);
 	gui_pump_messages();
-	return value_int(1);
+	return value_bool(true);
 }
 
 static Value op_minimize(Interpreter* interp, Value* args, int argc, Expr** arg_nodes, Env* env, int line, int col) {
@@ -565,7 +565,7 @@ static Value op_minimize(Interpreter* interp, Value* args, int argc, Expr** arg_
 	if (!win || !IsWindow(win->hwnd)) return fail(interp, "GUI_MINIMIZE: invalid window handle", line, col);
 	ShowWindow(win->hwnd, SW_MINIMIZE);
 	gui_pump_messages();
-	return value_int(1);
+	return value_bool(true);
 }
 
 static Value op_maximize(Interpreter* interp, Value* args, int argc, Expr** arg_nodes, Env* env, int line, int col) {
@@ -580,7 +580,7 @@ static Value op_maximize(Interpreter* interp, Value* args, int argc, Expr** arg_
 	if (!win || !IsWindow(win->hwnd)) return fail(interp, "GUI_MAXIMIZE: invalid window handle", line, col);
 	ShowWindow(win->hwnd, SW_MAXIMIZE);
 	gui_pump_messages();
-	return value_int(1);
+	return value_bool(true);
 }
 
 static Value op_to_front(Interpreter* interp, Value* args, int argc, Expr** arg_nodes, Env* env, int line, int col) {
@@ -596,7 +596,7 @@ static Value op_to_front(Interpreter* interp, Value* args, int argc, Expr** arg_
 	SetWindowPos(win->hwnd, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
 	SetForegroundWindow(win->hwnd);
 	gui_pump_messages();
-	return value_int(1);
+	return value_bool(true);
 }
 
 static Value op_to_back(Interpreter* interp, Value* args, int argc, Expr** arg_nodes, Env* env, int line, int col) {
@@ -611,7 +611,7 @@ static Value op_to_back(Interpreter* interp, Value* args, int argc, Expr** arg_n
 	if (!win || !IsWindow(win->hwnd)) return fail(interp, "GUI_TO_BACK: invalid window handle", line, col);
 	SetWindowPos(win->hwnd, HWND_BOTTOM, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
 	gui_pump_messages();
-	return value_int(1);
+	return value_bool(true);
 }
 
 static Value op_screen(Interpreter* interp, Value* args, int argc, Expr** arg_nodes, Env* env, int line, int col) {

lib/std/gui/gui.c

@@ -597,14 +597,14 @@ static Value load_with_gdiplus(Interpreter* interp, const char* path, int line,
 
 static Value save_with_gdiplus(Interpreter* interp, Value imgv, const char* path, const WCHAR* mime, int quality, int line, int col) {
 	ImageView iv;
-	if (!image_from_value(interp, imgv, "SAVE_*", line, col, &iv)) return value_int(0);
-	if (!ensure_gdiplus(interp, line, col)) return value_int(0);
+	if (!image_from_value(interp, imgv, "SAVE_*", line, col, &iv)) return value_null();
+	if (!ensure_gdiplus(interp, line, col)) return value_null();
 
 	int w = (int)iv.w;
 	int h = (int)iv.h;
 	int stride = w * 4;
 	uint8_t* bgra = (uint8_t*)malloc((size_t)stride * (size_t)h);
-	if (!bgra) { set_runtime_error(interp, "image: out of memory", line, col); return value_int(0); }
+	if (!bgra) { set_runtime_error(interp, "image: out of memory", line, col); return value_null(); }
 
 	for (int y = 0; y < h; y++) {
 		uint8_t* row = bgra + (size_t)y * (size_t)stride;
@@ -625,15 +625,15 @@ static Value save_with_gdiplus(Interpreter* interp, Value imgv, const char* path
 	if (pGdipCreateBitmapFromScan0(w, h, stride, PixelFormat32bppARGB_C, bgra, &bmp) != 0 || !bmp) {
 		free(bgra);
 		set_runtime_error(interp, "image: failed to create bitmap", line, col);
-		return value_int(0);
+		return value_null();
 	}
 
 	CLSID clsid;
 	if (!encoder_clsid_for_mime(mime, &clsid)) {
 		pGdipDisposeImage((GpImage_C*)bmp);
 		free(bgra);
 		set_runtime_error(interp, "image: encoder unavailable", line, col);
-		return value_int(0);
+		return value_null();
 	}
 
 	WCHAR* wpath = NULL;
@@ -642,7 +642,7 @@ static Value save_with_gdiplus(Interpreter* interp, Value imgv, const char* path
 		free(bgra);
 		free(wpath);
 		set_runtime_error(interp, "image: invalid UTF-8 path", line, col);
-		return value_int(0);
+		return value_null();
 	}
 
 	static const GUID EncoderQuality = {0x1d5be4b5, 0xfa4a, 0x452d, {0x9c, 0xdd, 0x5d, 0xb3, 0x51, 0x05, 0xe7, 0xeb}};
@@ -659,8 +659,8 @@ static Value save_with_gdiplus(Interpreter* interp, Value imgv, const char* path
 	pGdipDisposeImage((GpImage_C*)bmp);
 	free(bgra);
 
-	if (st != 0) { set_runtime_error(interp, "image: failed to save image", line, col); return value_int(0); }
-	return value_int(1);
+	if (st != 0) { set_runtime_error(interp, "image: failed to save image", line, col); return value_null(); }
+	return value_bool(true);
 }
 #endif
 
@@ -711,16 +711,15 @@ static Value op_save_png(Interpreter* interp, Value* args, int argc, Expr** arg_
 	(void)env;
 	if (!expect_argc_range(interp, argc, 2, 3, "SAVE_PNG", line, col)) return value_null();
 	const char* path = expect_str(interp, args[1], "SAVE_PNG", line, col);
-	if (interp->error) return value_int(0);
+	if (interp->error) return value_null();
 	int quality = 100;
 	if (argc >= 3) quality = (int)expect_int(interp, args[2], "SAVE_PNG", line, col);
 	if (interp->error) return value_null();
 #ifdef _WIN32
 	return save_with_gdiplus(interp, args[0], path, L"image/png", quality, line, col);
 #else
 	(void)quality;
-	set_runtime_error(interp, "SAVE_PNG not supported on this platform", line, col);
-	return value_int(0);
+	return fail(interp, "SAVE_PNG not supported on this platform", line, col);
 #endif
 }
 
@@ -729,16 +728,15 @@ static Value op_save_jpeg(Interpreter* interp, Value* args, int argc, Expr** arg
 	(void)env;
 	if (!expect_argc_range(interp, argc, 2, 3, "SAVE_JPEG", line, col)) return value_null();
 	const char* path = expect_str(interp, args[1], "SAVE_JPEG", line, col);
-	if (interp->error) return value_int(0);
+	if (interp->error) return value_null();
 	int quality = 85;
 	if (argc >= 3) quality = (int)expect_int(interp, args[2], "SAVE_JPEG", line, col);
 	if (interp->error) return value_null();
 #ifdef _WIN32
 	return save_with_gdiplus(interp, args[0], path, L"image/jpeg", quality, line, col);
 #else
 	(void)quality;
-	set_runtime_error(interp, "SAVE_JPEG not supported on this platform", line, col);
-	return value_int(0);
+	return fail(interp, "SAVE_JPEG not supported on this platform", line, col);
 #endif
 }
 
@@ -747,12 +745,11 @@ static Value op_save_bmp(Interpreter* interp, Value* args, int argc, Expr** arg_
 	(void)env;
 	if (!expect_argc_range(interp, argc, 2, 2, "SAVE_BMP", line, col)) return value_null();
 	const char* path = expect_str(interp, args[1], "SAVE_BMP", line, col);
-	if (interp->error) return value_int(0);
+	if (interp->error) return value_null();
 #ifdef _WIN32
 	return save_with_gdiplus(interp, args[0], path, L"image/bmp", 100, line, col);
 #else
-	set_runtime_error(interp, "SAVE_BMP not supported on this platform", line, col);
-	return value_int(0);
+	return fail(interp, "SAVE_BMP not supported on this platform", line, col);
 #endif
 }
 

lib/std/image/image.c

@@ -119,7 +119,7 @@ FUNC TNS: CROP(TNS: img, TNS: corners){
     RETURN(img[MIN(corners[*, 0d1])-MAX(corners[*, 0d1]), MIN(corners[*, 0d2])-MAX(corners[*, 0d2]), *])
 }
 
-FUNC INT: SHOW(TNS: img){
+FUNC BOOL: SHOW(TNS: img){
     ! Save the image to the provided path and open it with the system default
     ! viewer on Windows. `img_path` is treated as the target file path.
     STR: img_path = "C:/Windows/Temp/tmp_img.png"
@@ -128,5 +128,5 @@ FUNC INT: SHOW(TNS: img){
     ! Use NULL hwnd (0), operation "open", empty params and dir, showcmd=1
     win32.WIN_CALL("shell32", "ShellExecuteW", "PSSSSI", "P", 0d0, "open", img_path, "", "", 0d1)
     DEL(img_path)
-    RETURN(0d0)
+    RETURN(FALSE)
 }

lib/std/image/init.pre

@@ -1,24 +1,24 @@
 ! Primality and factorization functions
 
-FUNC INT: IS_PRIME(INT: n){
+FUNC BOOL: IS_PRIME(INT: n){
     IF(LTE(n, 0d1)){
-        RETURN(0d0)
+        RETURN(FALSE)
     }
     IF(EQ(n, 0d2)){
-        RETURN(0d1)
+        RETURN(TRUE)
     }
     ! reject even numbers greater than 2
     IF(EQ(MOD(n, 0d2), 0d0)){
-        RETURN(0d0)
+        RETURN(FALSE)
     }
     INT: i = 0d3
     WHILE(LTE(MUL(i, i), n)){
         IF(EQ(MOD(n, i), 0d0)){
-            RETURN(0d0)
+            RETURN(FALSE)
         }
         ADD(@i, 0d2)
     }
-    RETURN(0d1)
+    RETURN(TRUE)
 }
 
 FUNC INT: NEXT_PRIME(INT: start){
@@ -42,16 +42,16 @@ FUNC INT: PREV_PRIME(INT: start){
     RETURN(0d0)
 }
 
-FUNC INT: IS_MERSENNE_PRIME(INT: p){
+FUNC BOOL: IS_MERSENNE_PRIME(INT: p){
     IF(IS_PRIME(p)){
         INT: exp = POW(0d2, p)
         INT: mersenne = SUB(exp, 0d1)
         IF(IS_PRIME(mersenne)){
-            RETURN(0d1)
+            RETURN(TRUE)
         }
-        RETURN(0d0)
+        RETURN(FALSE)
     }ELSE{
-        RETURN(0d0)
+        RETURN(FALSE)
     }
 }
 

lib/std/prime.pre

@@ -17,6 +17,15 @@ static void* ast_alloc(size_t size) {
     return ptr;
 }
 
+Expr* expr_bool(bool value, int line, int column) {
+    Expr* expr = ast_alloc(sizeof(Expr));
+    expr->type = EXPR_BOOL;
+    expr->line = line;
+    expr->column = column;
+    expr->as.bool_value = value;
+    return expr;
+}
+
 Expr* expr_int(int64_t value, int base, int line, int column) {
     Expr* expr = ast_alloc(sizeof(Expr));
     expr->type = EXPR_INT;
@@ -404,6 +413,8 @@ static void free_stmt_list(StmtList* list) {
 void free_expr(Expr* expr) {
     if (!expr) return;
     switch (expr->type) {
+        case EXPR_BOOL:
+            break;
         case EXPR_ASYNC:
             free_stmt(expr->as.async.block);
             break;

src/ast.c

@@ -4,6 +4,7 @@
 #include "common.h"
 
 typedef enum {
+    TYPE_BOOL,
     TYPE_INT,
     TYPE_FLT,
     TYPE_STR,
@@ -31,6 +32,7 @@ typedef struct ParamList {
 } ParamList;
 
 typedef enum {
+    EXPR_BOOL,
     EXPR_INT,
     EXPR_FLT,
     EXPR_STR,
@@ -58,6 +60,7 @@ struct Expr {
     int line;
     int column;
     union {
+        bool bool_value;
         struct { int64_t value; int base; } int_value;
         struct { double value; int base; int base_is_nan; } flt_value;
         char* str_value;
@@ -154,6 +157,7 @@ struct Stmt {
     } as;
 };
 
+Expr* expr_bool(bool value, int line, int column);
 Expr* expr_int(int64_t value, int base, int line, int column);
 Expr* expr_flt(double value, int base, int base_is_nan, int line, int column);
 Expr* expr_str(char* value, int line, int column);