From 728fb970e9e418e10ae2745bcb3c1148d807e96b Mon Sep 17 00:00:00 2001 From: Kolo <67389779+JustKolosaki@users.noreply.github.com> Date: Tue, 11 Mar 2025 19:43:27 +0100 Subject: [PATCH] lock some stuff there's some compilation errors in some classes if a library isn't available and polymod is the only thing that's in a project --- polymod/hscript/_internal/PolymodClassDeclEx.hx | 3 ++- polymod/hscript/_internal/PolymodExprEx.hx | 2 ++ polymod/hscript/_internal/PolymodPrinterEx.hx | 2 ++ polymod/hscript/_internal/PolymodScriptClass.hx | 2 ++ polymod/hscript/_internal/PolymodScriptMacro.hx | 6 ++---- polymod/hscript/_internal/PolymodScriptManager.hx | 6 +++++- 6 files changed, 15 insertions(+), 6 deletions(-) diff --git a/polymod/hscript/_internal/PolymodClassDeclEx.hx b/polymod/hscript/_internal/PolymodClassDeclEx.hx index e2a6924f..65d624b4 100644 --- a/polymod/hscript/_internal/PolymodClassDeclEx.hx +++ b/polymod/hscript/_internal/PolymodClassDeclEx.hx @@ -1,5 +1,6 @@ package polymod.hscript._internal; +#if hscript import hscript.Expr.ClassDecl; import hscript.Expr.FieldDecl; import polymod.hscript._internal.PolymodScriptClass; @@ -30,4 +31,4 @@ typedef PolymodClassImport = { @:optional var cls:Class; @:optional var enm:Enum; } - +#end \ No newline at end of file diff --git a/polymod/hscript/_internal/PolymodExprEx.hx b/polymod/hscript/_internal/PolymodExprEx.hx index 0be927b7..3b2a4bf5 100644 --- a/polymod/hscript/_internal/PolymodExprEx.hx +++ b/polymod/hscript/_internal/PolymodExprEx.hx @@ -1,5 +1,6 @@ package polymod.hscript._internal; +#if hscript #if hscriptPos class ErrorEx { @@ -132,3 +133,4 @@ ECustom(msg:String); throw "Unimplemented error type " + err; } } +#end \ No newline at end of file diff --git a/polymod/hscript/_internal/PolymodPrinterEx.hx b/polymod/hscript/_internal/PolymodPrinterEx.hx index 7e7d581e..3a039879 100644 --- a/polymod/hscript/_internal/PolymodPrinterEx.hx +++ b/polymod/hscript/_internal/PolymodPrinterEx.hx @@ -1,5 +1,6 @@ package polymod.hscript._internal; +#if hscript import hscript.Printer; class PolymodPrinterEx extends Printer @@ -37,3 +38,4 @@ class PolymodPrinterEx extends Printer #end } } +#end \ No newline at end of file diff --git a/polymod/hscript/_internal/PolymodScriptClass.hx b/polymod/hscript/_internal/PolymodScriptClass.hx index 2d0a0bd9..51ccecf1 100644 --- a/polymod/hscript/_internal/PolymodScriptClass.hx +++ b/polymod/hscript/_internal/PolymodScriptClass.hx @@ -1,5 +1,6 @@ package polymod.hscript._internal; +#if hscript import hscript.Expr; import polymod.hscript._internal.PolymodExprEx; @@ -558,3 +559,4 @@ class PolymodScriptClass } #end } +#end \ No newline at end of file diff --git a/polymod/hscript/_internal/PolymodScriptMacro.hx b/polymod/hscript/_internal/PolymodScriptMacro.hx index ba72be2f..b00f18b8 100644 --- a/polymod/hscript/_internal/PolymodScriptMacro.hx +++ b/polymod/hscript/_internal/PolymodScriptMacro.hx @@ -1,5 +1,6 @@ package polymod.hscript._internal; +#if hscript import EReg; import haxe.macro.Context; import haxe.macro.Expr; @@ -84,10 +85,6 @@ class PolymodScriptMacro static var scriptOverrides:Array = []; public static function buildScriptImpls(?filters:Array):Void { - #if !hscript - return; - #end - // if no filters are given // create a scripted implementation // for every class @@ -588,3 +585,4 @@ class PolymodScriptMacro return scriptOverrides; } } +#end \ No newline at end of file diff --git a/polymod/hscript/_internal/PolymodScriptManager.hx b/polymod/hscript/_internal/PolymodScriptManager.hx index 4645c004..31c0371a 100644 --- a/polymod/hscript/_internal/PolymodScriptManager.hx +++ b/polymod/hscript/_internal/PolymodScriptManager.hx @@ -1,5 +1,6 @@ package polymod.hscript._internal; +#if hscript import hscript.Expr; import polymod.hscript._internal.PolymodClassDeclEx; @@ -102,6 +103,7 @@ class PolymodScriptManager } } + #if lime public function registerScriptClassByPathAsync(path:String):lime.app.Future { var promise = new lime.app.Promise(); @@ -154,6 +156,7 @@ class PolymodScriptManager // Await the promise return promise.future; } + #end public function validateImports():Void { @@ -547,4 +550,5 @@ class PolymodScriptManager return staticCallFunction(path, fnName, [arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7]); } #end -} \ No newline at end of file +} +#end \ No newline at end of file