Allow entry point function name to be given on command line (#1031)

Enhancements: - Add a new command line argument `--entry`, which allows the name of the entry point function or static method to be specified.
degory · Jan 26, 2024 · d007756 · d007756
1 parent 70870a1
commit d007756
Show file tree

Hide file tree

Showing 80 changed files with 480 additions and 9 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -15,7 +15,7 @@
       ]
     },
     "ghul.compiler": {
-      "version": "0.6.6",
+      "version": "0.6.8",
       "commands": [
         "ghul-compiler"
       ]

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -249,6 +249,20 @@
                 "showReuseMessage": true,
                 "clear": false
             }
+        },
+        {
+            "label": "Run all unit tests",
+            "type": "shell",
+            "command": "dotnet test unit-tests",
+            "group": "test",
+            "presentation": {
+                "echo": true,
+                "reveal": "always",
+                "focus": false,
+                "panel": "shared",
+                "showReuseMessage": true,
+                "clear": false
+            }
         }
     ]
 }
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>0.6.8-alpha.28</Version>
+    <Version>0.6.9-alpha.33</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/integration-tests/execution/entry-point-command-line-arg-global-function/.vscode/ghul.json b/integration-tests/execution/entry-point-command-line-arg-global-function/.vscode/ghul.json
@@ -0,0 +1,6 @@
+{
+    "compiler": "dotnet ../../../publish/ghul.dll",
+    "source": [
+        "."
+    ]
+}
diff --git a/integration-tests/execution/entry-point-command-line-arg-global-function/.vscode/tasks.json b/integration-tests/execution/entry-point-command-line-arg-global-function/.vscode/tasks.json
@@ -0,0 +1,23 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "Run test",
+            "command": "dotnet ghul-test ${workspaceFolder}",
+            "type": "shell",
+            "group": {
+                "kind": "test",
+                "isDefault": true
+            }
+        },
+        {
+            "label": "Capture test expectation",
+            "command": "../../../tasks/capture.sh ${workspaceFolder}",
+            "type": "shell",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            }
+        }
+    ]
+}
diff --git a/...ation-tests/incomplete-class-14/test.ghul → ...and-line-arg-global-function/err.expected b/...ation-tests/incomplete-class-14/test.ghul → ...and-line-arg-global-function/err.expected
diff --git a/integration-tests/execution/entry-point-command-line-arg-global-function/ghul.json b/integration-tests/execution/entry-point-command-line-arg-global-function/ghul.json
@@ -0,0 +1,6 @@
+{
+    "compiler": "dotnet ../../../publish/ghul.dll",
+    "source": [
+        "."
+    ]
+}
diff --git a/integration-tests/execution/entry-point-command-line-arg-global-function/ghulflags b/integration-tests/execution/entry-point-command-line-arg-global-function/ghulflags
@@ -0,0 +1 @@
+--dotnet --entry named_entry_point
diff --git a/integration-tests/execution/entry-point-command-line-arg-global-function/il.expected b/integration-tests/execution/entry-point-command-line-arg-global-function/il.expected
diff --git a/integration-tests/execution/entry-point-command-line-arg-global-function/run.expected b/integration-tests/execution/entry-point-command-line-arg-global-function/run.expected
@@ -0,0 +1 @@
+Hello, World!
diff --git a/integration-tests/execution/entry-point-command-line-arg-global-function/test.ghul b/integration-tests/execution/entry-point-command-line-arg-global-function/test.ghul
@@ -0,0 +1,3 @@
+named_entry_point() is
+    IO.Std.out.write_line("Hello, World!");
+si
diff --git a/integration-tests/execution/entry-point-command-line-arg-global-function/test.ghulproj b/integration-tests/execution/entry-point-command-line-arg-global-function/test.ghulproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net6.0</TargetFramework>
+
+    <GhulCompiler>dotnet ghul-compiler</GhulCompiler>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <GhulSources Include="**/*.ghul" />
+    <PackageReference Include="ghul.runtime" />
+    <PackageReference Include="ghul.pipes" />
+    <PackageReference Include="ghul.targets" />
+  </ItemGroup>
+</Project>
diff --git a/integration-tests/execution/entry-point-command-line-arg-global-function/warn.expected b/integration-tests/execution/entry-point-command-line-arg-global-function/warn.expected
diff --git a/integration-tests/il/entry-point-command-line-arg-class-static/.vscode/ghul.json b/integration-tests/il/entry-point-command-line-arg-class-static/.vscode/ghul.json
@@ -0,0 +1,6 @@
+{
+    "compiler": "dotnet ../../../publish/ghul.dll",
+    "source": [
+        "."
+    ]
+}
diff --git a/integration-tests/il/entry-point-command-line-arg-class-static/.vscode/tasks.json b/integration-tests/il/entry-point-command-line-arg-class-static/.vscode/tasks.json
@@ -0,0 +1,23 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "Run test",
+            "command": "dotnet ghul-test ${workspaceFolder}",
+            "type": "shell",
+            "group": {
+                "kind": "test",
+                "isDefault": true
+            }
+        },
+        {
+            "label": "Capture test expectation",
+            "command": "../../../tasks/capture.sh ${workspaceFolder}",
+            "type": "shell",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            }
+        }
+    ]
+}
diff --git a/integration-tests/il/entry-point-command-line-arg-class-static/err.expected b/integration-tests/il/entry-point-command-line-arg-class-static/err.expected
@@ -0,0 +1 @@
+error: ilasm failed
diff --git a/integration-tests/il/entry-point-command-line-arg-class-static/fail.expected b/integration-tests/il/entry-point-command-line-arg-class-static/fail.expected
@@ -0,0 +1 @@
+
diff --git a/integration-tests/il/entry-point-command-line-arg-class-static/ghul.json b/integration-tests/il/entry-point-command-line-arg-class-static/ghul.json
@@ -0,0 +1,6 @@
+{
+    "compiler": "dotnet ../../../publish/ghul.dll",
+    "source": [
+        "."
+    ]
+}
diff --git a/integration-tests/il/entry-point-command-line-arg-class-static/ghulflags b/integration-tests/il/entry-point-command-line-arg-class-static/ghulflags
@@ -0,0 +1 @@
+--dotnet --entry named_entry_point
diff --git a/integration-tests/il/entry-point-command-line-arg-class-static/il.expected b/integration-tests/il/entry-point-command-line-arg-class-static/il.expected
@@ -0,0 +1,6 @@
+.method public hidebysig static  default void 'named_entry_point'() cil managed
+{
+.entrypoint
+.maxstack 64
+ret
+}
diff --git a/integration-tests/il/entry-point-command-line-arg-class-static/test.ghul b/integration-tests/il/entry-point-command-line-arg-class-static/test.ghul
@@ -0,0 +1,7 @@
+namespace Test is
+    class Main is
+        @IL.output("il.out")
+        named_entry_point() static is
+        si
+    si
+si
diff --git a/integration-tests/il/entry-point-command-line-arg-class-static/test.ghulproj b/integration-tests/il/entry-point-command-line-arg-class-static/test.ghulproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net6.0</TargetFramework>
+
+    <GhulCompiler>dotnet ghul-compiler</GhulCompiler>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <GhulSources Include="**/*.ghul" />
+    <PackageReference Include="ghul.runtime" />
+    <PackageReference Include="ghul.pipes" />
+    <PackageReference Include="ghul.targets" />
+  </ItemGroup>
+</Project>
diff --git a/integration-tests/il/entry-point-command-line-arg-class-static/warn.expected b/integration-tests/il/entry-point-command-line-arg-class-static/warn.expected
diff --git a/integration-tests/il/entry-point-command-line-arg-global-function/.vscode/ghul.json b/integration-tests/il/entry-point-command-line-arg-global-function/.vscode/ghul.json
@@ -0,0 +1,6 @@
+{
+    "compiler": "dotnet ../../../publish/ghul.dll",
+    "source": [
+        "."
+    ]
+}
diff --git a/integration-tests/il/entry-point-command-line-arg-global-function/.vscode/tasks.json b/integration-tests/il/entry-point-command-line-arg-global-function/.vscode/tasks.json
@@ -0,0 +1,23 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "Run test",
+            "command": "dotnet ghul-test ${workspaceFolder}",
+            "type": "shell",
+            "group": {
+                "kind": "test",
+                "isDefault": true
+            }
+        },
+        {
+            "label": "Capture test expectation",
+            "command": "../../../tasks/capture.sh ${workspaceFolder}",
+            "type": "shell",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            }
+        }
+    ]
+}
diff --git a/integration-tests/il/entry-point-command-line-arg-global-function/err.expected b/integration-tests/il/entry-point-command-line-arg-global-function/err.expected
@@ -0,0 +1 @@
+error: ilasm failed
diff --git a/integration-tests/il/entry-point-command-line-arg-global-function/fail.expected b/integration-tests/il/entry-point-command-line-arg-global-function/fail.expected
@@ -0,0 +1 @@
+
diff --git a/integration-tests/il/entry-point-command-line-arg-global-function/ghul.json b/integration-tests/il/entry-point-command-line-arg-global-function/ghul.json
@@ -0,0 +1,6 @@
+{
+    "compiler": "dotnet ../../../publish/ghul.dll",
+    "source": [
+        "."
+    ]
+}
diff --git a/integration-tests/il/entry-point-command-line-arg-global-function/ghulflags b/integration-tests/il/entry-point-command-line-arg-global-function/ghulflags
@@ -0,0 +1 @@
+--dotnet --entry named_entry_point
diff --git a/integration-tests/il/entry-point-command-line-arg-global-function/il.expected b/integration-tests/il/entry-point-command-line-arg-global-function/il.expected
@@ -0,0 +1,6 @@
+.method public hidebysig static  default void 'named_entry_point'() cil managed
+{
+.entrypoint
+.maxstack 64
+ret
+}
diff --git a/integration-tests/il/entry-point-command-line-arg-global-function/test.ghul b/integration-tests/il/entry-point-command-line-arg-global-function/test.ghul
@@ -0,0 +1,3 @@
+@IL.output("il.out")
+named_entry_point() is
+si
diff --git a/integration-tests/il/entry-point-command-line-arg-global-function/test.ghulproj b/integration-tests/il/entry-point-command-line-arg-global-function/test.ghulproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net6.0</TargetFramework>
+
+    <GhulCompiler>dotnet ghul-compiler</GhulCompiler>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <GhulSources Include="**/*.ghul" />
+    <PackageReference Include="ghul.runtime" />
+    <PackageReference Include="ghul.pipes" />
+    <PackageReference Include="ghul.targets" />
+  </ItemGroup>
+</Project>
diff --git a/integration-tests/il/entry-point-command-line-arg-global-function/warn.expected b/integration-tests/il/entry-point-command-line-arg-global-function/warn.expected
diff --git a/integration-tests/il/entry-point-default-class-static-method/.vscode/ghul.json b/integration-tests/il/entry-point-default-class-static-method/.vscode/ghul.json
@@ -0,0 +1,6 @@
+{
+    "compiler": "dotnet ../../../publish/ghul.dll",
+    "source": [
+        "."
+    ]
+}
diff --git a/integration-tests/il/entry-point-default-class-static-method/.vscode/tasks.json b/integration-tests/il/entry-point-default-class-static-method/.vscode/tasks.json
@@ -0,0 +1,23 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "Run test",
+            "command": "dotnet ghul-test ${workspaceFolder}",
+            "type": "shell",
+            "group": {
+                "kind": "test",
+                "isDefault": true
+            }
+        },
+        {
+            "label": "Capture test expectation",
+            "command": "../../../tasks/capture.sh ${workspaceFolder}",
+            "type": "shell",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            }
+        }
+    ]
+}
diff --git a/integration-tests/il/entry-point-default-class-static-method/err.expected b/integration-tests/il/entry-point-default-class-static-method/err.expected
@@ -0,0 +1 @@
+error: ilasm failed
diff --git a/integration-tests/il/entry-point-default-class-static-method/fail.expected b/integration-tests/il/entry-point-default-class-static-method/fail.expected
@@ -0,0 +1 @@
+
diff --git a/integration-tests/il/entry-point-default-class-static-method/ghul.json b/integration-tests/il/entry-point-default-class-static-method/ghul.json
@@ -0,0 +1,6 @@
+{
+    "compiler": "dotnet ../../../publish/ghul.dll",
+    "source": [
+        "."
+    ]
+}
diff --git a/integration-tests/il/entry-point-default-class-static-method/ghulflags b/integration-tests/il/entry-point-default-class-static-method/ghulflags
@@ -0,0 +1 @@
+--dotnet
diff --git a/integration-tests/il/entry-point-default-class-static-method/il.expected b/integration-tests/il/entry-point-default-class-static-method/il.expected
@@ -0,0 +1,6 @@
+.method public hidebysig static  default void 'entry'() cil managed
+{
+.entrypoint
+.maxstack 64
+ret
+}
diff --git a/integration-tests/il/entry-point-default-class-static-method/test.ghul b/integration-tests/il/entry-point-default-class-static-method/test.ghul
@@ -0,0 +1,7 @@
+namespace Test is
+    class Main is
+        @IL.output("il.out")
+        entry() static is
+        si
+    si
+si
diff --git a/integration-tests/il/entry-point-default-class-static-method/test.ghulproj b/integration-tests/il/entry-point-default-class-static-method/test.ghulproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net6.0</TargetFramework>
+
+    <GhulCompiler>dotnet ghul-compiler</GhulCompiler>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <GhulSources Include="**/*.ghul" />
+    <PackageReference Include="ghul.runtime" />
+    <PackageReference Include="ghul.pipes" />
+    <PackageReference Include="ghul.targets" />
+  </ItemGroup>
+</Project>
diff --git a/integration-tests/il/entry-point-default-class-static-method/warn.expected b/integration-tests/il/entry-point-default-class-static-method/warn.expected
diff --git a/integration-tests/il/entry-point-default-global-function/.vscode/ghul.json b/integration-tests/il/entry-point-default-global-function/.vscode/ghul.json
@@ -0,0 +1,6 @@
+{
+    "compiler": "dotnet ../../../publish/ghul.dll",
+    "source": [
+        "."
+    ]
+}
diff --git a/integration-tests/il/entry-point-default-global-function/.vscode/tasks.json b/integration-tests/il/entry-point-default-global-function/.vscode/tasks.json
@@ -0,0 +1,23 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "Run test",
+            "command": "dotnet ghul-test ${workspaceFolder}",
+            "type": "shell",
+            "group": {
+                "kind": "test",
+                "isDefault": true
+            }
+        },
+        {
+            "label": "Capture test expectation",
+            "command": "../../../tasks/capture.sh ${workspaceFolder}",
+            "type": "shell",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            }
+        }
+    ]
+}
diff --git a/integration-tests/il/entry-point-default-global-function/err.expected b/integration-tests/il/entry-point-default-global-function/err.expected
@@ -0,0 +1 @@
+error: ilasm failed
diff --git a/integration-tests/il/entry-point-default-global-function/fail.expected b/integration-tests/il/entry-point-default-global-function/fail.expected
@@ -0,0 +1 @@
+
diff --git a/integration-tests/il/entry-point-default-global-function/ghul.json b/integration-tests/il/entry-point-default-global-function/ghul.json
@@ -0,0 +1,6 @@
+{
+    "compiler": "dotnet ../../../publish/ghul.dll",
+    "source": [
+        "."
+    ]
+}
diff --git a/integration-tests/il/entry-point-default-global-function/ghulflags b/integration-tests/il/entry-point-default-global-function/ghulflags
@@ -0,0 +1 @@
+--dotnet
diff --git a/integration-tests/il/entry-point-default-global-function/il.expected b/integration-tests/il/entry-point-default-global-function/il.expected
@@ -0,0 +1,6 @@
+.method public hidebysig static  default void 'entry'() cil managed
+{
+.entrypoint
+.maxstack 64
+ret
+}
diff --git a/integration-tests/il/entry-point-default-global-function/test.ghul b/integration-tests/il/entry-point-default-global-function/test.ghul
@@ -0,0 +1,3 @@
+@IL.output("il.out")
+entry() is
+si