diff --git a/acc/Host.cs b/acc/Host.cs index fc4556b..5d9966f 100644 --- a/acc/Host.cs +++ b/acc/Host.cs @@ -153,7 +153,11 @@ public static (byte[] data, byte[] map) Compile(string source, Args args) { void CompileToken(Instruction token) { - map.symbols.Add(((short)offset, source.Split('\n')[offset])); + try + { + map.symbols.Add(((short)offset, source.Split('\n')[offset])); + } + catch{} offset++; gen.Emit(token); var value = token.Assembly(); diff --git a/acc/acc.csproj b/acc/acc.csproj index 5ee2fe3..2e416a4 100644 --- a/acc/acc.csproj +++ b/acc/acc.csproj @@ -5,7 +5,7 @@ net5.0 flame.compiler win10-x64;osx.10.14-x64;linux-x64 - 0.70.500-beta + 0.70.504-beta Yuuki Wesp flame.compiler Yuuki Wesp (C) 2020 diff --git a/libs/Ancient.Compiler.Service/Ancient.Compiler.Service.csproj b/libs/Ancient.Compiler.Service/Ancient.Compiler.Service.csproj index d0af8da..59b7476 100644 --- a/libs/Ancient.Compiler.Service/Ancient.Compiler.Service.csproj +++ b/libs/Ancient.Compiler.Service/Ancient.Compiler.Service.csproj @@ -13,7 +13,7 @@ MIT Yuuki Wesp Ancient Project - 0.70.694.120 + 0.70.699.120 diff --git a/libs/Ancient.Runtime.Context/Ancient.Runtime.Context.csproj b/libs/Ancient.Runtime.Context/Ancient.Runtime.Context.csproj index 6dec2e7..f5df438 100644 --- a/libs/Ancient.Runtime.Context/Ancient.Runtime.Context.csproj +++ b/libs/Ancient.Runtime.Context/Ancient.Runtime.Context.csproj @@ -4,7 +4,7 @@ Library netcoreapp3.1 - 0.70.672.37 + 0.70.673.37 true https://raw.githubusercontent.com/ancientproject/cli/master/resource/icon.png https://github.com/0xF6/ancient_cpu diff --git a/libs/Ancient.Runtime.Context/DeviceLoader.cs b/libs/Ancient.Runtime.Context/DeviceLoader.cs index 5251af6..3cd5b12 100644 --- a/libs/Ancient.Runtime.Context/DeviceLoader.cs +++ b/libs/Ancient.Runtime.Context/DeviceLoader.cs @@ -19,10 +19,11 @@ static DeviceLoader() if(AppFlag.GetVariable("VM_TRACE")) OnTrace += Console.WriteLine; - //AssemblyLoadContext.Default.Resolving += (context, name) => { - // var assemblyPath = $"./{name.Name}.dll"; - // return context.LoadFromAssemblyPath(assemblyPath); - //}; + AssemblyLoadContext.Default.Resolving += (context, name) => + { + var assemblyPath = $"./{name.Name}.dll"; + return context.LoadFromAssemblyPath(assemblyPath); + }; } public static void Boot(Action hook) diff --git a/vm/csharp/vm.csproj b/vm/csharp/vm.csproj index ff68a39..0f89b30 100644 --- a/vm/csharp/vm.csproj +++ b/vm/csharp/vm.csproj @@ -11,7 +11,7 @@ win10-arm64; win10-arm; - 0.70.753-beta + 0.70.754-beta true Yuuki Wesp (C) 2020