fix uri error

Author: Zetelias

.gitignore

@@ -7,5 +7,4 @@ compile_commands.json
 vsxmake*/
 .idea/
 .DS_Store
-
-
+cmake*/

grngame/bindings/da_script_bind.cpp

@@ -1,25 +1,26 @@
 #include "da_script_bind.h"
 #include "da_script_engine.hpp"
+#include <cstdio>
 
-
-extern "C" {
-DaScriptVm* DaScriptEngineCreate(void)
+extern "C"
 {
-    return reinterpret_cast<DaScriptVm*>(new DaScriptEngine());
-}
+    DaScriptVm *DaScriptEngineCreate(void)
+    {
+        return (DaScriptVm *)(new DaScriptEngine());
+    }
 
-void DaScriptEngineDestroy(DaScriptVm* self)
-{
-    delete reinterpret_cast<DaScriptEngine*>(self);
-}
+    void DaScriptEngineDestroy(DaScriptVm *self)
+    {
+        delete reinterpret_cast<DaScriptEngine *>(self);
+    }
 
-bool DaScriptEngineCompileScript(DaScriptVm* self, const char* script_name)
-{
-    return reinterpret_cast<DaScriptEngine*>(self)->CompileScript(script_name);
-}
+    bool DaScriptEngineCompileScript(DaScriptVm *self, const char *script_name)
+    {
+        return reinterpret_cast<DaScriptEngine *>(self)->CompileScript(script_name);
+    }
 
-bool DaScriptEngineRunScript(DaScriptVm* self, const char* script_name, const char* entry)
-{
-    return reinterpret_cast<DaScriptEngine*>(self)->RunScript(script_name, entry);
-}
+    bool DaScriptEngineRunScript(DaScriptVm *self, const char *script_name, const char *entry)
+    {
+        return reinterpret_cast<DaScriptEngine *>(self)->RunScript(script_name, entry);
+    }
 } // extern "C"

grngame/bindings/da_script_engine.cpp

@@ -2,7 +2,7 @@
 #include "daScript/ast/dyn_modules.h"
 #include "grngame/dev/logging.h"
 #include "grngame/platform/directories.h"
-
+#include <cstdio>
 
 DaScriptEngine::DaScriptEngine() : file_access(das::make_smart<das::FsFileAccess>())
 {
@@ -18,31 +18,39 @@ DaScriptEngine::~DaScriptEngine()
     das::Module::Shutdown();
 }
 
-bool DaScriptEngine::CompileScript(const char* script_name)
+bool DaScriptEngine::CompileScript(const char *script_name)
 {
-    main_program = das::compileDaScript(script_name, file_access, text_printer, module_group, policies);
-    if (main_program->failed())
+    auto program = das::compileDaScript(script_name, file_access, text_printer, module_group, policies);
+    if (program->failed())
     {
         LOG_ERROR("Failed to compile daScript file '%s':\n", script_name);
-        LogErrorsOfProgram(main_program);
+        LogErrorsOfProgram(program);
         return false;
     }
 
-    main_context = new das::Context(main_program->getContextStackSize());
+    contexts[script_name] = das::make_smart<das::Context>(program->getContextStackSize());
 
-    if (!main_program->simulate(*main_context, text_printer))
+    if (!program->simulate(*contexts[script_name], text_printer))
     {
         LOG_ERROR("Failed to simulate script '%s':\n", script_name);
-        LogErrorsOfProgram(main_program);
+        LogErrorsOfProgram(program);
         return false;
     }
 
     return true;
 }
 
-bool DaScriptEngine::RunScript(const char* script_name, const char* entry)
+bool DaScriptEngine::RunScript(const char *script_name, const char *entry)
 {
-    auto functions = main_context->findFunctions(entry);
+    auto it = contexts.find(script_name);
+    if (it == contexts.end())
+    {
+        LOG_ERROR("No such script '%s'\n", script_name);
+        return false;
+    }
+
+    auto functions = it->second->findFunctions(entry);
+
     if (functions.empty())
     {
         LOG_ERROR("Failed to find function '%s' in script '%s'", entry, script_name);
@@ -55,14 +63,14 @@ bool DaScriptEngine::RunScript(const char* script_name, const char* entry)
     }
     else
     {
-        main_context->evalWithCatch(functions.at(0), nullptr);
+        contexts[script_name]->evalWithCatch(functions.at(0), nullptr);
         return true;
     }
 }
 
-void DaScriptEngine::LogErrorsOfProgram(const das::ProgramPtr& program)
+void DaScriptEngine::LogErrorsOfProgram(const das::ProgramPtr &program)
 {
-    for (const auto& err : program->errors)
+    for (const auto &err : program->errors)
     {
         LOG_ERROR("- %s\n", err.what.c_str()); // TODO better logging
     }

grngame/bindings/da_script_engine.hpp

@@ -1,4 +1,5 @@
 #pragma once
+#include <unordered_map>
 #define DAS_SMART_PTR_TRACKER 0
 #define DAS_SMART_PTR_MAGIC 0
 #include <daScript/daScript.h>
@@ -10,8 +11,7 @@ class DaScriptEngine
     das::TextPrinter text_printer;
     das::ModuleGroup module_group;
     das::CodeOfPolicies policies;
-    das::ProgramPtr main_program;
-    das::Context* main_context;
+    std::unordered_map<std::string, das::smart_ptr<das::Context>> contexts;
 public:
     DaScriptEngine();
     ~DaScriptEngine();

grngame/core/app.c

@@ -79,7 +79,7 @@ void EngineStart(AppInfo* app_info)
     if (!DaScriptEngineCompileScript(g_app.da_script_engine, "hello.das"))
         exit(7);
 
-    if (!DaScriptEngineRunScript(g_app.da_script_engine, "hellos.das", "main"))
+    if (!DaScriptEngineRunScript(g_app.da_script_engine, "hello.das", "main"))
         exit(8);
 
     MainLoop();

xmake.lua

@@ -38,6 +38,7 @@ package("daslang")
             "-DDAS_GLFW_DISABLED=ON",
             "-DDAS_STDDLG_DISABLED=ON",
             "-DDAS_STBIMAGE_DISABLED=ON",
+            "-DDAS_URIPARSER_DISABLED=ON",
             "-DDAS_STBTRUETYPE_DISABLED=ON",
         }