Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .csharpierrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
236 changes: 0 additions & 236 deletions .editorconfig

This file was deleted.

3 changes: 3 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"recommendations": ["csharpier.csharpier-vscode"]
}
7 changes: 5 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,8 @@
"Vector3"
],
"Lua.runtime.version": "Lua 5.2",
"dotnet.backgroundAnalysis.analyzerDiagnosticsScope": "fullSolution"
}
"dotnet.backgroundAnalysis.analyzerDiagnosticsScope": "fullSolution",
"[csharp]": {
"editor.defaultFormatter": "csharpier.csharpier-vscode"
}
}
28 changes: 13 additions & 15 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
<Project>

<PropertyGroup>
<!-- NuGet Packaging -->
<PackageVersion>0.5.3</PackageVersion>
<Authors>nuskey;Akeit0</Authors>
<Copyright>© Yusuke Nakada</Copyright>
<PackageProjectUrl>https://github.com/nuskey8/Lua-CSharp</PackageProjectUrl>
<RepositoryUrl>$(PackageProjectUrl)</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageReadmeFile>README.md</PackageReadmeFile>
<PackageIcon>Icon.png</PackageIcon>
</PropertyGroup>

</Project>
<PropertyGroup>
<!-- NuGet Packaging -->
<PackageVersion>0.5.3</PackageVersion>
<Authors>nuskey;Akeit0</Authors>
<Copyright>© Yusuke Nakada</Copyright>
<PackageProjectUrl>https://github.com/nuskey8/Lua-CSharp</PackageProjectUrl>
<RepositoryUrl>$(PackageProjectUrl)</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageReadmeFile>README.md</PackageReadmeFile>
<PackageIcon>Icon.png</PackageIcon>
</PropertyGroup>
</Project>
30 changes: 15 additions & 15 deletions Lua.slnx
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<Solution>
<Folder Name="/sandbox/">
<File Path="sandbox/ConsoleApp2/.gitignore" />
<Project Path="sandbox/Benchmark/Benchmark.csproj" />
<Project Path="sandbox/ConsoleApp1/ConsoleApp1.csproj" />
<Project Path="sandbox/ConsoleApp2/ConsoleApp2.csproj" />
<Project Path="sandbox/JitTest/JitTest.csproj" />
</Folder>
<Folder Name="/src/">
<Project Path="src/Lua.Annotations/Lua.Annotations.csproj" />
<Project Path="src/Lua.SourceGenerator/Lua.SourceGenerator.csproj" />
<Project Path="src/Lua/Lua.csproj" />
</Folder>
<Folder Name="/tests/">
<Project Path="tests/Lua.Tests/Lua.Tests.csproj" />
</Folder>
<Folder Name="/sandbox/">
<File Path="sandbox/ConsoleApp2/.gitignore" />
<Project Path="sandbox/Benchmark/Benchmark.csproj" />
<Project Path="sandbox/ConsoleApp1/ConsoleApp1.csproj" />
<Project Path="sandbox/ConsoleApp2/ConsoleApp2.csproj" />
<Project Path="sandbox/JitTest/JitTest.csproj" />
</Folder>
<Folder Name="/src/">
<Project Path="src/Lua.Annotations/Lua.Annotations.csproj" />
<Project Path="src/Lua.SourceGenerator/Lua.SourceGenerator.csproj" />
<Project Path="src/Lua/Lua.csproj" />
</Folder>
<Folder Name="/tests/">
<Project Path="tests/Lua.Tests/Lua.Tests.csproj" />
</Folder>
</Solution>
22 changes: 14 additions & 8 deletions sandbox/Benchmark/AddBenchmark.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,20 @@ public void Setup()
core.Setup("add.lua");
core.LuaCSharpState.OpenStandardLibraries();

core.LuaCSharpState.Environment["add"] = new LuaFunction("add", (context, ct) =>
{
var a = context.GetArgument<double>(0);
var b = context.GetArgument<double>(1);
return new(context.Return(a + b));
});
core.LuaCSharpState.Environment["add"] = new LuaFunction(
"add",
(context, ct) =>
{
var a = context.GetArgument<double>(0);
var b = context.GetArgument<double>(1);
return new(context.Return(a + b));
}
);
core.MoonSharpState.Globals["add"] = (Func<double, double, double>)Add;
core.NLuaState.RegisterFunction("add", typeof(AddBenchmark).GetMethod(nameof(Add), BindingFlags.Static | BindingFlags.Public));
core.NLuaState.RegisterFunction(
"add",
typeof(AddBenchmark).GetMethod(nameof(Add), BindingFlags.Static | BindingFlags.Public)
);
}

[IterationCleanup]
Expand Down Expand Up @@ -77,4 +83,4 @@ public async Task<LuaValue> Benchmark_LuaCSharp_File()
await core.LuaCSharpState.DoFileAsync(core.FilePath, buffer);
return buffer[0];
}
}
}
30 changes: 14 additions & 16 deletions sandbox/Benchmark/Benchmark.csproj
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.14.0"/>
<PackageReference Include="MoonSharp" Version="2.0.0"/>
<PackageReference Include="NLua" Version="1.7.3"/>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\Lua\Lua.csproj"/>
</ItemGroup>
<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
<PackageReference Include="MoonSharp" Version="2.0.0" />
<PackageReference Include="NLua" Version="1.7.3" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\Lua\Lua.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion sandbox/Benchmark/BenchmarkCore.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ public void Dispose()
{
nLuaState.Dispose();
}
}
}
Loading