Move expression implementation to its own folder

SanderMertens · Nov 22, 2024 · dad8d60 · dad8d60
1 parent 3223fa8
commit dad8d60
Show file tree

Hide file tree

Showing 9 changed files with 12,212 additions and 12,200 deletions.
diff --git a/distr/flecs.c b/distr/flecs.c
diff --git a/src/addons/script/expr_ast.c → src/addons/script/expr/ast.c b/src/addons/script/expr_ast.c → src/addons/script/expr/ast.c
@@ -6,7 +6,7 @@
 #include "flecs.h"
 
 #ifdef FLECS_SCRIPT
-#include "script.h"
+#include "../script.h"
 
 #define flecs_expr_ast_new(parser, T, kind)\
     (T*)flecs_expr_ast_new_(parser, ECS_SIZEOF(T), kind)

diff --git a/src/addons/script/expr_ast.h → src/addons/script/expr/ast.h b/src/addons/script/expr_ast.h → src/addons/script/expr/ast.h
diff --git a/src/addons/script/new_expr.c → src/addons/script/expr/parser.c b/src/addons/script/new_expr.c → src/addons/script/expr/parser.c
@@ -1,13 +1,13 @@
 /**
- * @file addons/script/expr.c
+ * @file addons/script/expr/parser.c
  * @brief Script expression parser.
  */
 
 #include "flecs.h"
 
 #ifdef FLECS_SCRIPT
-#include "script.h"
-#include "parser.h"
+#include "../script.h"
+#include "../parser.h"
 
 /* From https://en.cppreference.com/w/c/language/operator_precedence */
 

diff --git a/src/addons/script/expr_visit.h → src/addons/script/expr/visit.h b/src/addons/script/expr_visit.h → src/addons/script/expr/visit.h
diff --git a/src/addons/script/expr_visit_fold.c → src/addons/script/expr/visit_fold.c b/src/addons/script/expr_visit_fold.c → src/addons/script/expr/visit_fold.c
@@ -6,7 +6,7 @@
 #include "flecs.h"
 
 #ifdef FLECS_SCRIPT
-#include "script.h"
+#include "../script.h"
 
 #define ECS_VALUE_GET(value, T) (*(T*)((ecs_expr_val_t*)value)->ptr)
 
@@ -103,7 +103,7 @@ int flecs_expr_unary_visit_fold(
         return 0;
     }
 
-    if (node->node.type != ecs_id(ecs_bool_t)) {
+    if (node->expr->type != ecs_id(ecs_bool_t)) {
         char *type_str = ecs_get_path(script->world, node->node.type);
         flecs_expr_visit_error(script, node, 
             "! operator cannot be applied to value of type '%s' (must be bool)");
@@ -117,7 +117,9 @@ int flecs_expr_unary_visit_fold(
     result->node.pos = node->node.pos;
     result->node.type = ecs_id(ecs_bool_t);
     result->ptr = &result->storage.bool_;
-    *(bool*)result->ptr = !(*(bool*)((ecs_expr_val_t*)node)->ptr);
+    *(bool*)result->ptr = !*(bool*)(((ecs_expr_val_t*)node->expr)->ptr);
+
+    *node_ptr = (ecs_expr_node_t*)result;
 
     return 0;
 error:

diff --git a/src/addons/script/expr_to_str.c → src/addons/script/expr/visit_to_str.c b/src/addons/script/expr_to_str.c → src/addons/script/expr/visit_to_str.c
@@ -6,7 +6,7 @@
 #include "flecs.h"
 
 #ifdef FLECS_SCRIPT
-#include "script.h"
+#include "../script.h"
 
 typedef struct ecs_expr_str_visitor_t {
     const ecs_world_t *world;

diff --git a/src/addons/script/expr_visit_type.c → src/addons/script/expr/visit_type.c b/src/addons/script/expr_visit_type.c → src/addons/script/expr/visit_type.c
@@ -6,7 +6,7 @@
 #include "flecs.h"
 
 #ifdef FLECS_SCRIPT
-#include "script.h"
+#include "../script.h"
 
 static
 bool flecs_expr_operator_is_equality(
@@ -249,6 +249,10 @@ int flecs_expr_unary_visit_type(
     /* The only supported unary expression is not (!) which returns a bool */
     node->node.type = ecs_id(ecs_bool_t);
 
+    if (node->expr->type != ecs_id(ecs_bool_t)) {
+        node->expr = flecs_expr_cast(script, node->expr, ecs_id(ecs_bool_t));
+    }
+
     return 0;
 error:
     return -1;

diff --git a/src/addons/script/script.h b/src/addons/script/script.h
@@ -45,8 +45,8 @@ struct ecs_script_parser_t {
 };
 
 #include "ast.h"
-#include "expr_ast.h"
-#include "expr_visit.h"
+#include "expr/ast.h"
+#include "expr/visit.h"
 #include "visit.h"
 #include "visit_eval.h"