Add build tests for QUERY_DSL/PARSER addons

SanderMertens · SanderMertens · commit c5618ac73aab · 2025-02-05T15:47:15.000-08:00
diff --git a/distr/flecs.c b/distr/flecs.c
@@ -25702,6 +25702,7 @@ bool flecs_rest_script(
     (void)world;
     (void)req;
     (void)reply;
+    (void)path;
 #ifdef FLECS_SCRIPT
     ecs_entity_t script = flecs_rest_entity_from_path(world, reply, path);
     if (!script) {
@@ -41502,13 +41503,6 @@ const char* ecs_world_from_json_file(
 #ifndef FLECS_SCRIPT_PRIVATE_H
 #define FLECS_SCRIPT_PRIVATE_H
 
-
-#ifdef FLECS_SCRIPT
-
-typedef struct ecs_script_entity_t ecs_script_entity_t;
-
-#define flecs_script_impl(script) ((ecs_script_impl_t*)script)
-
 /**
  * @file addons/parser/parser.h
  * @brief Parser addon.
@@ -41656,6 +41650,12 @@ const char* flecs_tokenizer_identifier(
 #endif
 
 
+#ifdef FLECS_SCRIPT
+
+typedef struct ecs_script_entity_t ecs_script_entity_t;
+
+#define flecs_script_impl(script) ((ecs_script_impl_t*)script)
+
 struct ecs_script_impl_t {
     ecs_script_t pub;
     ecs_allocator_t allocator;
@@ -55808,8 +55808,6 @@ bool ecs_using_task_threads(
  * @brief Script grammar parser.
  */
 
-
-#ifdef FLECS_QUERY_DSL
 /**
  * @file addons/parser/grammar.h
  * @brief Grammar parser.
@@ -56084,6 +56082,9 @@ bool ecs_using_task_threads(
 #endif
 
 
+#ifdef FLECS_QUERY_DSL
+
+
 #define EcsTokTermIdentifier\
     EcsTokIdentifier:\
     case EcsTokNumber:\
@@ -58078,6 +58079,7 @@ void FlecsScriptMathImport(
  */
 
 
+
 #ifdef FLECS_SCRIPT
 
 #define EcsTokEndOfStatement\
diff --git a/distr/flecs.h b/distr/flecs.h
@@ -13543,6 +13543,10 @@ void FlecsAlertsImport(
 #define FLECS_META
 #endif
 
+#ifndef FLECS_DOC
+#define FLECS_DOC
+#endif
+
 #ifndef FLECS_QUERY_DSL
 #define FLECS_QUERY_DSL /* For parsing component id expressions */
 #endif
diff --git a/include/flecs/addons/json.h b/include/flecs/addons/json.h
@@ -14,6 +14,10 @@
 #define FLECS_META
 #endif
 
+#ifndef FLECS_DOC
+#define FLECS_DOC
+#endif
+
 #ifndef FLECS_QUERY_DSL
 #define FLECS_QUERY_DSL /* For parsing component id expressions */
 #endif
diff --git a/meson.build b/meson.build
@@ -58,14 +58,14 @@ flecs_src = files(
     'src/addons/parser/tokenizer.c',
     'src/addons/pipeline/pipeline.c',
     'src/addons/pipeline/worker.c',
+    'src/addons/query_dsl/parser.c',
     'src/addons/rest.c',
     'src/addons/script/template.c',
     'src/addons/script/ast.c',
     'src/addons/script/function.c',
     'src/addons/script/functions_builtin.c',
     'src/addons/script/functions_math.c',
     'src/addons/script/parser.c',
-    'src/addons/script/query_parser.c',
     'src/addons/script/script.c',
     'src/addons/script/serialize.c',
     'src/addons/script/vars.c',
diff --git a/src/addons/query_dsl/parser.c b/src/addons/query_dsl/parser.c
@@ -4,9 +4,11 @@
  */
 
 #include "flecs.h"
+#include "../parser/grammar.h"
 
 #ifdef FLECS_QUERY_DSL
-#include "../parser/grammar.h"
+
+#include "query_dsl.h"
 
 #define EcsTokTermIdentifier\
     EcsTokIdentifier:\
diff --git a/src/addons/rest.c b/src/addons/rest.c
@@ -521,6 +521,7 @@ bool flecs_rest_script(
     (void)world;
     (void)req;
     (void)reply;
+    (void)path;
 #ifdef FLECS_SCRIPT
     ecs_entity_t script = flecs_rest_entity_from_path(world, reply, path);
     if (!script) {
diff --git a/src/addons/script/parser.c b/src/addons/script/parser.c
@@ -5,9 +5,10 @@
 
 #include "flecs.h"
 
+#include "../parser/grammar.h"
+
 #ifdef FLECS_SCRIPT
 #include "script.h"
-#include "../parser/grammar.h"
 
 #define EcsTokEndOfStatement\
     case ';':\
diff --git a/src/addons/script/script.h b/src/addons/script/script.h
@@ -7,15 +7,14 @@
 #define FLECS_SCRIPT_PRIVATE_H
 
 #include "../../private_api.h"
+#include "../parser/parser.h"
 
 #ifdef FLECS_SCRIPT
 
 typedef struct ecs_script_entity_t ecs_script_entity_t;
 
 #define flecs_script_impl(script) ((ecs_script_impl_t*)script)
 
-#include "../parser/parser.h"
-
 struct ecs_script_impl_t {
     ecs_script_t pub;
     ecs_allocator_t allocator;
diff --git a/test/custom_builds/c/parser/.gitignore b/test/custom_builds/c/parser/.gitignore
@@ -0,0 +1,5 @@
+.bake_cache
+.DS_Store
+.vscode
+gcov
+bin
diff --git a/test/custom_builds/c/parser/include/parser.h b/test/custom_builds/c/parser/include/parser.h
@@ -0,0 +1,16 @@
+#ifndef PARSER_H
+#define PARSER_H
+
+/* This generated file contains includes for project dependencies */
+#include "parser/bake_config.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
diff --git a/test/custom_builds/c/parser/include/parser/bake_config.h b/test/custom_builds/c/parser/include/parser/bake_config.h
@@ -0,0 +1,24 @@
+/*
+                                   )
+                                  (.)
+                                  .|.
+                                  | |
+                              _.--| |--._
+                           .-';  ;`-'& ; `&.
+                          \   &  ;    &   &_/
+                           |"""---...---"""|
+                           \ | | | | | | | /
+                            `---.|.|.|.---'
+
+ * This file is generated by bake.lang.c for your convenience. Headers of
+ * dependencies will automatically show up in this file. Include bake_config.h
+ * in your main project file. Do not edit! */
+
+#ifndef PARSER_BAKE_CONFIG_H
+#define PARSER_BAKE_CONFIG_H
+
+/* Headers of public dependencies */
+#include "../../deps/flecs.h"
+
+#endif
+
diff --git a/test/custom_builds/c/parser/project.json b/test/custom_builds/c/parser/project.json
@@ -0,0 +1,13 @@
+{
+    "id": "parser",
+    "type": "application",
+    "value": {
+        "use": [
+            "flecs"
+        ],
+        "standalone": true
+    },
+    "lang.c": {
+        "defines": ["FLECS_CUSTOM_BUILD", "FLECS_PARSER"]
+    }
+}
diff --git a/test/custom_builds/c/parser/src/main.c b/test/custom_builds/c/parser/src/main.c
@@ -0,0 +1,8 @@
+#include <parser.h>
+#include <stdio.h>
+
+int main(int argc, char *argv[]) {
+    ecs_world_t *world = ecs_init_w_args(argc, argv);
+
+    return ecs_fini(world);
+}
diff --git a/test/custom_builds/c/query_dsl/.gitignore b/test/custom_builds/c/query_dsl/.gitignore
@@ -0,0 +1,5 @@
+.bake_cache
+.DS_Store
+.vscode
+gcov
+bin
diff --git a/test/custom_builds/c/query_dsl/include/query_dsl.h b/test/custom_builds/c/query_dsl/include/query_dsl.h
@@ -0,0 +1,16 @@
+#ifndef QUERY_DSL_H
+#define QUERY_DSL_H
+
+/* This generated file contains includes for project dependencies */
+#include "query_dsl/bake_config.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
diff --git a/test/custom_builds/c/query_dsl/include/query_dsl/bake_config.h b/test/custom_builds/c/query_dsl/include/query_dsl/bake_config.h
@@ -0,0 +1,24 @@
+/*
+                                   )
+                                  (.)
+                                  .|.
+                                  | |
+                              _.--| |--._
+                           .-';  ;`-'& ; `&.
+                          \   &  ;    &   &_/
+                           |"""---...---"""|
+                           \ | | | | | | | /
+                            `---.|.|.|.---'
+
+ * This file is generated by bake.lang.c for your convenience. Headers of
+ * dependencies will automatically show up in this file. Include bake_config.h
+ * in your main project file. Do not edit! */
+
+#ifndef QUERY_DSL_BAKE_CONFIG_H
+#define QUERY_DSL_BAKE_CONFIG_H
+
+/* Headers of public dependencies */
+#include "../../deps/flecs.h"
+
+#endif
+
diff --git a/test/custom_builds/c/query_dsl/project.json b/test/custom_builds/c/query_dsl/project.json
@@ -0,0 +1,13 @@
+{
+    "id": "query_dsl",
+    "type": "application",
+    "value": {
+        "use": [
+            "flecs"
+        ],
+        "standalone": true
+    },
+    "lang.c": {
+        "defines": ["FLECS_CUSTOM_BUILD", "FLECS_QUERY_DSL"]
+    }
+}
diff --git a/test/custom_builds/c/query_dsl/src/main.c b/test/custom_builds/c/query_dsl/src/main.c
@@ -0,0 +1,30 @@
+#include <query_dsl.h>
+#include <stdio.h>
+
+typedef struct {
+    float x, y;
+} Position;
+
+int main(int argc, char *argv[]) {
+    ecs_world_t *world = ecs_init_w_args(argc, argv);
+
+    ECS_COMPONENT(world, Position);
+    ECS_TAG(world, Foo);
+
+    ecs_query_t *q = ecs_query(world, {
+        .expr = "Position"
+    });
+
+    if (!q) {
+        printf("failed to create query\n");
+        return -1;
+    }
+
+    ecs_id_t id = ecs_id_from_str(world, "(Position, Foo)");
+    if (!id || id != ecs_pair_t(Position, Foo)) {
+        printf("failed to parse id\n");
+        return -1;
+    }
+
+    return ecs_fini(world);
+}

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +.bake_cache
 +.DS_Store
 +.vscode
 +gcov
 +bin