Merge branch 'main' of github.com:YabalLang/compiler

GerardSmit · GerardSmit · commit afa160d7bd9e · 2023-12-09T03:06:50.000+01:00
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -0,0 +1,68 @@
+name: dotnet publish
+
+on: [push]
+
+jobs:
+  build:
+    if: startsWith(github.ref, 'refs/tags/')
+    runs-on: ${{ matrix.config.os }}
+
+    strategy:
+      matrix:
+        config:
+          - { os: ubuntu-latest, arch: x64, name: linux-x64 }
+          - { os: ubuntu-latest, arch: arm64, name: linux-arm64 }
+          - { os: windows-latest, arch: x64, name: windows-x64 }
+          - { os: windows-latest, arch: arm64, name: windows-arm64 }
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup dotnet
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: 8.0.x
+          
+      - name: Install dependencies
+        run: dotnet restore
+
+      - name: Publish native
+        run: dotnet publish src/Yabal.Desktop/Yabal.Desktop.csproj -c Release -p:DesktopAot=true -p:Version=${GITHUB_REF#refs/*/} -o .output-native
+
+      - name: Upload native artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: yabal-native-${{ matrix.config.name }}
+          path: .output-native
+
+      - name: Publish
+        run: dotnet publish src/Yabal.Desktop/Yabal.Desktop.csproj -c Release -p:Version=${GITHUB_REF#refs/*/} -o .output-runtime
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: yabal-runtime-${{ matrix.config.name }}
+          path: .output-runtime
+
+  release:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download artifacts
+        uses: actions/download-artifact@v3
+        with:
+          path: files
+      
+      - name: Create zip files
+        run: |
+          mkdir -p release
+          for f in files/*; do
+            zip -r "release/$(basename "${f}").zip" "${f}"
+          done
+
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        with:
+          files: release/*.zip
+          tag_name: 0.1.0-alpha.2
+          token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.gitignore b/.gitignore
@@ -438,4 +438,7 @@ fabric.properties
 src/Yabal.Bot/appsettings.json
 examples/**/*.asmc
 examples/**/*.asmc.aexe
-examples/**/*.hex
+examples/**/*.hex
+
+.output-runtime
+.output-native
diff --git a/src/Yabal.Compiler/InstructionBuildResult.cs b/src/Yabal.Compiler/InstructionBuildResult.cs
@@ -46,7 +46,7 @@ public void ToAssembly(TextWriter writer, bool addComments = false)
 
             var (instructionRef, pointer, raw, comment) = either.Right;
 
-            if (!raw && !instructionRef.HasValue && pointer is null && comment is not null && comment.StartsWith(", "))
+            if (IsComment(either.Right))
             {
                 writer.WriteLine(comment);
                 continue;
@@ -190,6 +190,12 @@ private IEnumerable<int> GetBytes()
 
             var (instruction, pointer, _, _) = either.Right;
 
+            if (IsComment(either.Right))
+            {
+                // Skip comments
+                continue;
+            }
+
             if (!instruction.HasValue)
             {
                 if (pointer is null)
@@ -225,11 +231,23 @@ private static (Dictionary<InstructionPointer, int>, int) GetPointers(ReferenceL
             }
             else
             {
+                if (IsComment(either.Right))
+                {
+                    continue;
+                }
+
                 i++;
                 length++;
             }
         }
 
         return (labels, length);
     }
+
+    private static bool IsComment(InstructionItem item)
+    {
+        var (instruction, pointer, raw, comment) = item;
+
+        return !raw && !instruction.HasValue && pointer is null && comment is not null && comment.StartsWith(", ");
+    }
 }
diff --git a/src/Yabal.Compiler/Yabal.Compiler.csproj b/src/Yabal.Compiler/Yabal.Compiler.csproj
@@ -8,6 +8,7 @@
         <Antlr4UseCSharpGenerator>True</Antlr4UseCSharpGenerator>
         <DebugType>embedded</DebugType>
         <WarningsAsErrors>True</WarningsAsErrors>
+        <EnableTrimAnalyzer>true</EnableTrimAnalyzer>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/src/Yabal.Core/Yabal.Core.csproj b/src/Yabal.Core/Yabal.Core.csproj
@@ -9,6 +9,10 @@
         <DebugType>embedded</DebugType>
     </PropertyGroup>
 
+    <PropertyGroup Condition="'$(TargetFramework)' == 'net8.0'">
+        <EnableTrimAnalyzer>true</EnableTrimAnalyzer>
+    </PropertyGroup>
+
     <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
         <PackageReference Include="Nullable" Version="1.3.1" PrivateAssets="all">
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/src/Yabal.Desktop/Program.cs b/src/Yabal.Desktop/Program.cs
@@ -194,9 +194,12 @@ async Task BuildOutput(FileSystemInfo path, string? outPath, List<OutputFormat>
     var code = File.ReadAllText(path.FullName);
     var fs = new PhysicalFileSystem();
     var uri = new Uri("file:///" + fs.ConvertPathFromInternal(path.FullName));
-    using var context = new YabalContext(fs)
-        .AddFileLoader(FileType.Font, FontLoader.Instance)
-        .AddFileLoader(FileType.Image, ImageLoader.Instance);
+    using var context = new YabalContext(fs);
+
+    #if INCLUDE_LOADERS
+    context.AddFileLoader(FileType.Font, FontLoader.Instance);
+    context.AddFileLoader(FileType.Image, ImageLoader.Instance);
+    #endif
 
     var builder = new YabalBuilder(context)
     {
@@ -308,9 +311,12 @@ async Task Execute(InvocationContext ctx)
     var code = File.ReadAllText(path.Info.FullName);
     var fs = new PhysicalFileSystem();
     var uri = new Uri("file:///" + fs.ConvertPathFromInternal(path.Info.FullName));
-    using var context = new YabalContext(fs)
-        .AddFileLoader(FileType.Font, FontLoader.Instance)
-        .AddFileLoader(FileType.Image, ImageLoader.Instance);
+    using var context = new YabalContext(fs);
+
+    #if INCLUDE_LOADERS
+    context.AddFileLoader(FileType.Font, FontLoader.Instance);
+    context.AddFileLoader(FileType.Image, ImageLoader.Instance);
+    #endif
 
     var showOutput = ctx.ParseResult.GetValueForOption(output);
     var disableScreen = ctx.ParseResult.GetValueForOption(disableScreenOption);
diff --git a/src/Yabal.Desktop/Yabal.Desktop.csproj b/src/Yabal.Desktop/Yabal.Desktop.csproj
@@ -10,13 +10,37 @@
         <LangVersion>preview</LangVersion>
         <AssemblyName>yabal</AssemblyName>
         <ApplicationIcon>icon.ico</ApplicationIcon>
+        <EnableTrimAnalyzer>true</EnableTrimAnalyzer>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(DesktopAot)' == 'true'">
+        <!-- Workaround for https://github.com/dotnet/runtime/issues/94406 -->
+        <PublishAot>true</PublishAot>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(PublishAot)' == ''">
+        <PublishAot>false</PublishAot>
     </PropertyGroup>
 
     <PropertyGroup>
+        <DebugType>embedded</DebugType>
+        <InvariantGlobalization>true</InvariantGlobalization>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(PublishAot)' == 'true'">
+        <DebugSymbols>false</DebugSymbols>
+        <DebugType>None</DebugType>
+        <NativeDebugSymbols>false</NativeDebugSymbols>
+        <DebuggerSupport>false</DebuggerSupport>
+        <EventSourceSupport>false</EventSourceSupport>
+        <EnableUnsafeBinaryFormatterSerialization>false</EnableUnsafeBinaryFormatterSerialization>
+        <HttpActivityPropagationSupport>false</HttpActivityPropagationSupport>
+        <UseSystemResourceKeys>true</UseSystemResourceKeys>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(PublishAot)' == 'false'">
         <SelfContained>true</SelfContained>
         <PublishTrimmed>true</PublishTrimmed>
-        <InvariantGlobalization>true</InvariantGlobalization>
-        <DebugType>embedded</DebugType>
     </PropertyGroup>
 
     <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">
@@ -27,7 +51,7 @@
         <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
     </PropertyGroup>
 
-    <PropertyGroup Condition="'$(Configuration)' == 'Release'">
+    <PropertyGroup Condition="'$(Configuration)' == 'Release' and '$(PublishAot)' == 'false'">
         <PublishSingleFile>true</PublishSingleFile>
     </PropertyGroup>
 
@@ -56,8 +80,15 @@
     <ItemGroup>
       <ProjectReference Include="..\Yabal.Compiler\Yabal.Compiler.csproj" />
       <ProjectReference Include="..\Yabal.Emulator\Yabal.Emulator.csproj" />
-      <ProjectReference Include="..\Yabal.Loaders.Font\Yabal.Loaders.Font.csproj" />
-      <ProjectReference Include="..\Yabal.Loaders.Image\Yabal.Loaders.Image.csproj" />
+    </ItemGroup>
+
+    <PropertyGroup Condition="'$(PublishAot)' == 'false'">
+        <DefineConstants>$(DefineConstants);INCLUDE_LOADERS</DefineConstants>
+    </PropertyGroup>
+
+    <ItemGroup Condition="'$(PublishAot)' == 'false'">
+        <ProjectReference Include="..\Yabal.Loaders.Font\Yabal.Loaders.Font.csproj" />
+        <ProjectReference Include="..\Yabal.Loaders.Image\Yabal.Loaders.Image.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/src/Yabal.Emulator/Yabal.Emulator.csproj b/src/Yabal.Emulator/Yabal.Emulator.csproj
@@ -8,6 +8,7 @@
         <RootNamespace>Yabal</RootNamespace>
         <LangVersion>preview</LangVersion>
         <DebugType>embedded</DebugType>
+        <EnableTrimAnalyzer>true</EnableTrimAnalyzer>
     </PropertyGroup>
 
     <ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public void ToAssembly(TextWriter writer, bool addComments = false)`
`46`	`46`
`47`	`47`	`var (instructionRef, pointer, raw, comment) = either.Right;`
`48`	`48`
`49`		`- if (!raw && !instructionRef.HasValue && pointer is null && comment is not null && comment.StartsWith(", "))`
	`49`	`+ if (IsComment(either.Right))`
`50`	`50`	`{`
`51`	`51`	`writer.WriteLine(comment);`
`52`	`52`	`continue;`
`@@ -190,6 +190,12 @@ private IEnumerable<int> GetBytes()`
`190`	`190`
`191`	`191`	`var (instruction, pointer, _, _) = either.Right;`
`192`	`192`
	`193`	`+ if (IsComment(either.Right))`
	`194`	`+ {`
	`195`	`+ // Skip comments`
	`196`	`+ continue;`
	`197`	`+ }`
	`198`	`+`
`193`	`199`	`if (!instruction.HasValue)`
`194`	`200`	`{`
`195`	`201`	`if (pointer is null)`
`@@ -225,11 +231,23 @@ private static (Dictionary<InstructionPointer, int>, int) GetPointers(ReferenceL`
`225`	`231`	`}`
`226`	`232`	`else`
`227`	`233`	`{`
	`234`	`+ if (IsComment(either.Right))`
	`235`	`+ {`
	`236`	`+ continue;`
	`237`	`+ }`
	`238`	`+`
`228`	`239`	`i++;`
`229`	`240`	`length++;`
`230`	`241`	`}`
`231`	`242`	`}`
`232`	`243`
`233`	`244`	`return (labels, length);`
`234`	`245`	`}`
	`246`	`+`
	`247`	`+ private static bool IsComment(InstructionItem item)`
	`248`	`+ {`
	`249`	`+ var (instruction, pointer, raw, comment) = item;`
	`250`	`+`
	`251`	`+ return !raw && !instruction.HasValue && pointer is null && comment is not null && comment.StartsWith(", ");`
	`252`	`+ }`
`235`	`253`	`}`