Update Gravity

STREGA · STREGA · commit 918eae5c01f8 · 2025-12-27T06:48:21.000-05:00
diff --git a/Dependencies/Gravity/src/compiler/debug_macros.h b/Dependencies/Gravity/src/compiler/debug_macros.h
@@ -15,10 +15,10 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
+#include <assert.h>
 #include <limits.h>
 #include <float.h>
 #include <math.h>
-#include <assert.h>
 #include "../shared/gravity_memory.h"
 #include "../shared/gravity_config.h"
 
diff --git a/Dependencies/Gravity/src/compiler/gravity_ast.c b/Dependencies/Gravity/src/compiler/gravity_ast.c
@@ -12,7 +12,6 @@
 #include "../utils/gravity_utils.h"
 #include "../compiler/gravity_visitor.h"
 #include "../compiler/gravity_symboltable.h"
-#include <assert.h>
 
 #define SETBASE(node,tagv,_tok)         node->base.tag = tagv; node->base.token = _tok
 #define SETDECL(node,_decl)             node->base.decl = _decl
diff --git a/Dependencies/Gravity/src/compiler/gravity_codegen.c b/Dependencies/Gravity/src/compiler/gravity_codegen.c
@@ -14,7 +14,6 @@
 #include "../utils/gravity_utils.h"
 #include "../shared/gravity_array.h"
 #include "../shared/gravity_hash.h"
-#include <assert.h>
 
 typedef marray_t(gnode_class_decl_t *)  gnode_class_r;
 struct codegen_t {
diff --git a/Dependencies/Gravity/src/compiler/gravity_ircode.c b/Dependencies/Gravity/src/compiler/gravity_ircode.c
@@ -10,7 +10,6 @@
 #include "../shared/gravity_value.h"
 #include "../utils/gravity_debug.h"
 #include <inttypes.h>
-#include <assert.h>
 
 typedef marray_t(inst_t *)      code_r;
 typedef marray_t(bool *)        context_r;
@@ -44,7 +43,10 @@ ircode_t *ircode_create (uint16_t nlocals) {
     code->error = false;
 
     code->list = mem_alloc(NULL, sizeof(code_r));
-    if (!code->list) return NULL;
+    if (!code->list) {
+        mem_free(code);
+        return NULL;
+    }
     marray_init(*code->list);
     marray_init(code->label_true);
     marray_init(code->label_false);
diff --git a/Dependencies/Gravity/src/compiler/gravity_lexer.c b/Dependencies/Gravity/src/compiler/gravity_lexer.c
@@ -11,7 +11,6 @@
 #include "../compiler/gravity_lexer.h"
 #include "../compiler/gravity_token.h"
 #include "../utils/gravity_utils.h"
-#include <assert.h>
 
 struct gravity_lexer_t {
     const char                  *buffer;        // buffer
diff --git a/Dependencies/Gravity/src/compiler/gravity_optimizer.c b/Dependencies/Gravity/src/compiler/gravity_optimizer.c
@@ -14,7 +14,6 @@
 #include "../compiler/gravity_ircode.h"
 #include "../utils/gravity_utils.h"
 #include "../shared/gravity_value.h"
-#include <assert.h>
 
 #define IS_MOVE(inst)               ((inst) && (inst->op == MOVE))
 #define IS_RET(inst)                ((inst) && (inst->op == RET))
diff --git a/Dependencies/Gravity/src/compiler/gravity_parser.c b/Dependencies/Gravity/src/compiler/gravity_parser.c
@@ -17,7 +17,6 @@
 #include "../shared/gravity_hash.h"
 #include "../runtime/gravity_core.h"
 #include "../compiler/gravity_ast.h"
-#include <assert.h>
 
 typedef marray_t(gravity_lexer_t*)      lexer_r;
 
@@ -438,7 +437,10 @@ static gnode_t *parse_file_expression (gravity_parser_t *parser) {
     while (gravity_lexer_peek(lexer) == TOK_OP_DOT) {
         gravity_lexer_next(lexer); // consume TOK_OP_DOT
         const char *identifier = parse_identifier(parser);
-        if (!identifier) return NULL;
+        if (!identifier) {
+            mem_free(list);
+            return NULL;
+        }
         cstring_array_push(list, identifier);
     }
 
diff --git a/Dependencies/Gravity/src/compiler/gravity_semacheck2.c b/Dependencies/Gravity/src/compiler/gravity_semacheck2.c
@@ -11,7 +11,6 @@
 #include "../compiler/gravity_compiler.h"
 #include "../compiler/gravity_visitor.h"
 #include "../runtime/gravity_core.h"
-#include <assert.h>
 
 struct semacheck_t {
     gnode_r         *declarations;      // declarations stack
diff --git a/Dependencies/Gravity/src/compiler/gravity_symboltable.c b/Dependencies/Gravity/src/compiler/gravity_symboltable.c
@@ -10,7 +10,6 @@
 #include "../shared/gravity_macros.h"
 #include "../shared/gravity_array.h"
 #include "../shared/gravity_hash.h"
-#include <assert.h>
 
 // symbol table implementation using a stack of hash tables
 typedef marray_t(gravity_hash_t*)       ghash_r;
diff --git a/Dependencies/Gravity/src/compiler/gravity_token.c b/Dependencies/Gravity/src/compiler/gravity_token.c
@@ -8,7 +8,6 @@
 
 #include "../compiler/gravity_token.h"
 #include "../utils/gravity_utils.h"
-#include <assert.h>
 
 const char *token_string (gtoken_s token, uint32_t *len) {
     if (len) *len = token.bytes;
diff --git a/Dependencies/Gravity/src/compiler/gravity_visitor.c b/Dependencies/Gravity/src/compiler/gravity_visitor.c
@@ -7,7 +7,6 @@
 //
 
 #include "../compiler/gravity_visitor.h"
-#include <assert.h>
 
 // Visit a node invoking the associated callback.
 
diff --git a/Dependencies/Gravity/src/runtime/gravity_core.c b/Dependencies/Gravity/src/runtime/gravity_core.c
@@ -10,7 +10,6 @@
 #include <math.h>
 #include <time.h>
 #include <stdlib.h>
-#include <assert.h>
 #include "gravity_core.h"
 #include "../shared/gravity_hash.h"
 #include "../shared/gravity_value.h"
diff --git a/Dependencies/Gravity/src/runtime/gravity_vm.c b/Dependencies/Gravity/src/runtime/gravity_vm.c
@@ -6,7 +6,6 @@
 //  Copyright (c) 2014 CreoLabs. All rights reserved.
 //
 
-#include <assert.h>
 #include "../shared/gravity_hash.h"
 #include "../utils/gravity_json.h"
 #include "../shared/gravity_array.h"
diff --git a/Dependencies/Gravity/src/shared/gravity_delegate.h b/Dependencies/Gravity/src/shared/gravity_delegate.h
@@ -31,29 +31,29 @@ typedef struct {
 
 #define ERROR_DESC_NONE     (error_desc_t){0,0,0,0}
 
-typedef void                (* gravity_error_callback) (gravity_vm *vm, error_type_t error_type, const char *description, error_desc_t error_desc, void *xdata);
-typedef void                (* gravity_log_callback)    (gravity_vm *vm, const char *message, void *xdata);
-typedef void                (* gravity_log_clear) (gravity_vm *vm, void *xdata);
-typedef void                (* gravity_unittest_callback) (gravity_vm *vm, error_type_t error_type, const char *desc, const char *note, gravity_value_t value, int32_t row, int32_t col, void *xdata);
-typedef const char*         (* gravity_filename_callback) (uint32_t fileid, void *xdata);
-typedef const char*         (* gravity_loadfile_callback) (const char *file, size_t *size, uint32_t *fileid, void *xdata, bool *is_static);
-typedef const char**        (* gravity_optclass_callback) (void *xdata);
-typedef void                (* gravity_parser_callback) (void *token, void *xdata);
-typedef const char*         (* gravity_precode_callback) (void *xdata);
-typedef void                (* gravity_type_callback) (void *token, const char *type, void *xdata);
+typedef void                (*gravity_error_callback) (gravity_vm *vm, error_type_t error_type, const char *description, error_desc_t error_desc, void *xdata);
+typedef void                (*gravity_log_callback)    (gravity_vm *vm, const char *message, void *xdata);
+typedef void                (*gravity_log_clear) (gravity_vm *vm, void *xdata);
+typedef void                (*gravity_unittest_callback) (gravity_vm *vm, error_type_t error_type, const char *desc, const char *note, gravity_value_t value, int32_t row, int32_t col, void *xdata);
+typedef const char*         (*gravity_filename_callback) (uint32_t fileid, void *xdata);
+typedef const char*         (*gravity_loadfile_callback) (const char *file, size_t *size, uint32_t *fileid, void *xdata, bool *is_static);
+typedef const char**        (*gravity_optclass_callback) (void *xdata);
+typedef void                (*gravity_parser_callback) (void *token, void *xdata);
+typedef const char*         (*gravity_precode_callback) (void *xdata);
+typedef void                (*gravity_type_callback) (void *token, const char *type, void *xdata);
 
-typedef void                (* gravity_bridge_blacken) (gravity_vm *vm, void *xdata);
-typedef void*               (* gravity_bridge_clone) (gravity_vm *vm, void *xdata);
-typedef bool                (* gravity_bridge_equals) (gravity_vm *vm, void *obj1, void *obj2);
-typedef bool                (* gravity_bridge_execute) (gravity_vm *vm, void *xdata, gravity_value_t ctx, gravity_value_t args[], int16_t nargs, uint32_t vindex);
-typedef void                (* gravity_bridge_free) (gravity_vm *vm, gravity_object_t *obj);
-typedef bool                (* gravity_bridge_getundef) (gravity_vm *vm, void *xdata, gravity_value_t target, const char *key, uint32_t vindex);
-typedef bool                (* gravity_bridge_getvalue) (gravity_vm *vm, void *xdata, gravity_value_t target, const char *key, uint32_t vindex);
-typedef bool                (* gravity_bridge_initinstance) (gravity_vm *vm, void *xdata, gravity_value_t ctx, gravity_instance_t *instance, gravity_value_t args[], int16_t nargs);
-typedef bool                (* gravity_bridge_setvalue) (gravity_vm *vm, void *xdata, gravity_value_t target, const char *key, gravity_value_t value);
-typedef bool                (* gravity_bridge_setundef) (gravity_vm *vm, void *xdata, gravity_value_t target, const char *key, gravity_value_t value);
-typedef uint32_t            (* gravity_bridge_size) (gravity_vm *vm, gravity_object_t *obj);
-typedef const char*         (* gravity_bridge_string) (gravity_vm *vm, void *xdata, uint32_t *len);
+typedef void                (*gravity_bridge_blacken) (gravity_vm *vm, void *xdata);
+typedef void*               (*gravity_bridge_clone) (gravity_vm *vm, void *xdata);
+typedef bool                (*gravity_bridge_equals) (gravity_vm *vm, void *obj1, void *obj2);
+typedef bool                (*gravity_bridge_execute) (gravity_vm *vm, void *xdata, gravity_value_t ctx, gravity_value_t args[], int16_t nargs, uint32_t vindex);
+typedef void                (*gravity_bridge_free) (gravity_vm *vm, gravity_object_t *obj);
+typedef bool                (*gravity_bridge_getundef) (gravity_vm *vm, void *xdata, gravity_value_t target, const char *key, uint32_t vindex);
+typedef bool                (*gravity_bridge_getvalue) (gravity_vm *vm, void *xdata, gravity_value_t target, const char *key, uint32_t vindex);
+typedef bool                (*gravity_bridge_initinstance) (gravity_vm *vm, void *xdata, gravity_value_t ctx, gravity_instance_t *instance, gravity_value_t args[], int16_t nargs);
+typedef bool                (*gravity_bridge_setvalue) (gravity_vm *vm, void *xdata, gravity_value_t target, const char *key, gravity_value_t value);
+typedef bool                (*gravity_bridge_setundef) (gravity_vm *vm, void *xdata, gravity_value_t target, const char *key, gravity_value_t value);
+typedef uint32_t            (*gravity_bridge_size) (gravity_vm *vm, gravity_object_t *obj);
+typedef const char*         (*gravity_bridge_string) (gravity_vm *vm, void *xdata, uint32_t *len);
 
 typedef struct {
     // user data
diff --git a/Dependencies/Gravity/src/shared/gravity_value.c b/Dependencies/Gravity/src/shared/gravity_value.c
@@ -15,7 +15,6 @@
 #include "gravity_macros.h"
 #include "gravity_opcodes.h"
 #include "../runtime/gravity_vmmacros.h"
-#include <assert.h>
 
                                                 // mark object visited to avoid infinite loop
 #define SET_OBJECT_VISITED_FLAG(_obj, _flag)    (((gravity_object_t *)_obj)->gc.visited = _flag)
diff --git a/Tests/GravityTests/_GravityXCTestCase.swift b/Tests/GravityTests/_GravityXCTestCase.swift
@@ -17,8 +17,9 @@ open class GravityXCTestCase: XCTestCase {
         XCTAssert(true)
     }
     
+    @MainActor
     func runGravity(at path: String) async {
-        let gravity = await Gravity()
+        let gravity = Gravity()
 
         do {
             try await gravity.compile(file: path)
