From a6173055880b6295dcfdbb28b2da396d65934b96 Mon Sep 17 00:00:00 2001 From: nub31 Date: Mon, 7 Jul 2025 16:45:44 +0200 Subject: [PATCH] ... --- src/compiler/Compiler.sln | 4 ++-- src/compiler/{CLI => NubLang.CLI}/Archive.cs | 2 +- src/compiler/{CLI => NubLang.CLI}/GCC.cs | 2 +- src/compiler/{CLI => NubLang.CLI}/HexString.cs | 2 +- .../CLI.csproj => NubLang.CLI/NubLang.CLI.csproj} | 0 src/compiler/{CLI => NubLang.CLI}/Options.cs | 2 +- src/compiler/{CLI => NubLang.CLI}/Program.cs | 4 ++-- src/compiler/{CLI => NubLang.CLI}/QBE.cs | 2 +- .../{CLI => NubLang.CLI}/assets/libruntime_x64.a | Bin .../NubLang.Common.csproj} | 0 src/compiler/{Common => NubLang.Common}/Optional.cs | 2 +- src/compiler/{Common => NubLang.Common}/Variant.cs | 2 +- src/compiler/NubLang/NubLang.csproj | 2 +- src/compiler/NubLang/Syntax/Binding/Binder.cs | 2 +- .../NubLang/Syntax/Binding/Node/BoundDefinition.cs | 2 +- .../NubLang/Syntax/Binding/Node/BoundStatement.cs | 2 +- .../NubLang/Syntax/Parsing/Node/DefinitionSyntax.cs | 2 +- .../NubLang/Syntax/Parsing/Node/ExpressionSyntax.cs | 2 +- .../NubLang/Syntax/Parsing/Node/StatementSyntax.cs | 2 +- src/compiler/NubLang/Syntax/Parsing/Parser.cs | 2 +- .../NubLang/Syntax/Tokenization/Tokenizer.cs | 2 +- 21 files changed, 20 insertions(+), 20 deletions(-) rename src/compiler/{CLI => NubLang.CLI}/Archive.cs (97%) rename src/compiler/{CLI => NubLang.CLI}/GCC.cs (98%) rename src/compiler/{CLI => NubLang.CLI}/HexString.cs (96%) rename src/compiler/{CLI/CLI.csproj => NubLang.CLI/NubLang.CLI.csproj} (100%) rename src/compiler/{CLI => NubLang.CLI}/Options.cs (89%) rename src/compiler/{CLI => NubLang.CLI}/Program.cs (99%) rename src/compiler/{CLI => NubLang.CLI}/QBE.cs (97%) rename src/compiler/{CLI => NubLang.CLI}/assets/libruntime_x64.a (100%) rename src/compiler/{Common/Common.csproj => NubLang.Common/NubLang.Common.csproj} (100%) rename src/compiler/{Common => NubLang.Common}/Optional.cs (98%) rename src/compiler/{Common => NubLang.Common}/Variant.cs (97%) diff --git a/src/compiler/Compiler.sln b/src/compiler/Compiler.sln index f72e1d8..b2eb626 100644 --- a/src/compiler/Compiler.sln +++ b/src/compiler/Compiler.sln @@ -2,9 +2,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NubLang", "NubLang\NubLang.csproj", "{5047E21F-590D-4CB3-AFF3-064316485009}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CLI", "CLI\CLI.csproj", "{A22F17ED-FA17-45AB-92BA-CD02C28B3524}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NubLang.CLI", "NubLang.CLI\NubLang.CLI.csproj", "{A22F17ED-FA17-45AB-92BA-CD02C28B3524}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common", "Common\Common.csproj", "{91ECE034-32D4-48E6-A905-5F95DB95A3D4}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NubLang.Common", "NubLang.Common\NubLang.Common.csproj", "{91ECE034-32D4-48E6-A905-5F95DB95A3D4}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/compiler/CLI/Archive.cs b/src/compiler/NubLang.CLI/Archive.cs similarity index 97% rename from src/compiler/CLI/Archive.cs rename to src/compiler/NubLang.CLI/Archive.cs index 872ffdb..59919c5 100644 --- a/src/compiler/CLI/Archive.cs +++ b/src/compiler/NubLang.CLI/Archive.cs @@ -1,6 +1,6 @@ using System.Diagnostics; -namespace CLI; +namespace NubLang.CLI; public static class Archive { diff --git a/src/compiler/CLI/GCC.cs b/src/compiler/NubLang.CLI/GCC.cs similarity index 98% rename from src/compiler/CLI/GCC.cs rename to src/compiler/NubLang.CLI/GCC.cs index c94c5f1..8411cbb 100644 --- a/src/compiler/CLI/GCC.cs +++ b/src/compiler/NubLang.CLI/GCC.cs @@ -1,6 +1,6 @@ using System.Diagnostics; -namespace CLI; +namespace NubLang.CLI; public static class GCC { diff --git a/src/compiler/CLI/HexString.cs b/src/compiler/NubLang.CLI/HexString.cs similarity index 96% rename from src/compiler/CLI/HexString.cs rename to src/compiler/NubLang.CLI/HexString.cs index 2be6ef3..29ac2a9 100644 --- a/src/compiler/CLI/HexString.cs +++ b/src/compiler/NubLang.CLI/HexString.cs @@ -1,4 +1,4 @@ -namespace CLI; +namespace NubLang.CLI; internal static class HexString { diff --git a/src/compiler/CLI/CLI.csproj b/src/compiler/NubLang.CLI/NubLang.CLI.csproj similarity index 100% rename from src/compiler/CLI/CLI.csproj rename to src/compiler/NubLang.CLI/NubLang.CLI.csproj diff --git a/src/compiler/CLI/Options.cs b/src/compiler/NubLang.CLI/Options.cs similarity index 89% rename from src/compiler/CLI/Options.cs rename to src/compiler/NubLang.CLI/Options.cs index 81e0612..2ff86cb 100644 --- a/src/compiler/CLI/Options.cs +++ b/src/compiler/NubLang.CLI/Options.cs @@ -1,4 +1,4 @@ -namespace CLI; +namespace NubLang.CLI; public class Options { diff --git a/src/compiler/CLI/Program.cs b/src/compiler/NubLang.CLI/Program.cs similarity index 99% rename from src/compiler/CLI/Program.cs rename to src/compiler/NubLang.CLI/Program.cs index 75c354c..33cb6fb 100644 --- a/src/compiler/CLI/Program.cs +++ b/src/compiler/NubLang.CLI/Program.cs @@ -1,5 +1,5 @@ using System.Reflection; -using CLI; +using NubLang.CLI; using NubLang; using NubLang.Diagnostics; using NubLang.Generation.QBE; @@ -209,7 +209,7 @@ async Task CreateBuiltinRuntime() return runtimePath; } -namespace CLI +namespace NubLang.CLI { internal class RuntimeCreationException(string message) : Exception(message); } \ No newline at end of file diff --git a/src/compiler/CLI/QBE.cs b/src/compiler/NubLang.CLI/QBE.cs similarity index 97% rename from src/compiler/CLI/QBE.cs rename to src/compiler/NubLang.CLI/QBE.cs index 0beebbe..9bc3860 100644 --- a/src/compiler/CLI/QBE.cs +++ b/src/compiler/NubLang.CLI/QBE.cs @@ -1,6 +1,6 @@ using System.Diagnostics; -namespace CLI; +namespace NubLang.CLI; public static class QBE { diff --git a/src/compiler/CLI/assets/libruntime_x64.a b/src/compiler/NubLang.CLI/assets/libruntime_x64.a similarity index 100% rename from src/compiler/CLI/assets/libruntime_x64.a rename to src/compiler/NubLang.CLI/assets/libruntime_x64.a diff --git a/src/compiler/Common/Common.csproj b/src/compiler/NubLang.Common/NubLang.Common.csproj similarity index 100% rename from src/compiler/Common/Common.csproj rename to src/compiler/NubLang.Common/NubLang.Common.csproj diff --git a/src/compiler/Common/Optional.cs b/src/compiler/NubLang.Common/Optional.cs similarity index 98% rename from src/compiler/Common/Optional.cs rename to src/compiler/NubLang.Common/Optional.cs index c67d4bc..eb5d85a 100644 --- a/src/compiler/Common/Optional.cs +++ b/src/compiler/NubLang.Common/Optional.cs @@ -1,6 +1,6 @@ using System.Diagnostics.CodeAnalysis; -namespace Common; +namespace NubLang.Common; public static class Optional { diff --git a/src/compiler/Common/Variant.cs b/src/compiler/NubLang.Common/Variant.cs similarity index 97% rename from src/compiler/Common/Variant.cs rename to src/compiler/NubLang.Common/Variant.cs index 541b111..dba2119 100644 --- a/src/compiler/Common/Variant.cs +++ b/src/compiler/NubLang.Common/Variant.cs @@ -1,4 +1,4 @@ -namespace Common; +namespace NubLang.Common; public readonly struct Variant where T1 : notnull where T2 : notnull { diff --git a/src/compiler/NubLang/NubLang.csproj b/src/compiler/NubLang/NubLang.csproj index 672493f..3cd156f 100644 --- a/src/compiler/NubLang/NubLang.csproj +++ b/src/compiler/NubLang/NubLang.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/compiler/NubLang/Syntax/Binding/Binder.cs b/src/compiler/NubLang/Syntax/Binding/Binder.cs index cbdf78b..b05ffae 100644 --- a/src/compiler/NubLang/Syntax/Binding/Binder.cs +++ b/src/compiler/NubLang/Syntax/Binding/Binder.cs @@ -1,4 +1,4 @@ -using Common; +using NubLang.Common; using NubLang.Diagnostics; using NubLang.Syntax.Binding.Node; using NubLang.Syntax.Parsing.Node; diff --git a/src/compiler/NubLang/Syntax/Binding/Node/BoundDefinition.cs b/src/compiler/NubLang/Syntax/Binding/Node/BoundDefinition.cs index ae72af1..ffa3b42 100644 --- a/src/compiler/NubLang/Syntax/Binding/Node/BoundDefinition.cs +++ b/src/compiler/NubLang/Syntax/Binding/Node/BoundDefinition.cs @@ -1,4 +1,4 @@ -using Common; +using NubLang.Common; using NubLang.Syntax.Tokenization; namespace NubLang.Syntax.Binding.Node; diff --git a/src/compiler/NubLang/Syntax/Binding/Node/BoundStatement.cs b/src/compiler/NubLang/Syntax/Binding/Node/BoundStatement.cs index cb526d6..65ec825 100644 --- a/src/compiler/NubLang/Syntax/Binding/Node/BoundStatement.cs +++ b/src/compiler/NubLang/Syntax/Binding/Node/BoundStatement.cs @@ -1,4 +1,4 @@ -using Common; +using NubLang.Common; using NubLang.Syntax.Tokenization; namespace NubLang.Syntax.Binding.Node; diff --git a/src/compiler/NubLang/Syntax/Parsing/Node/DefinitionSyntax.cs b/src/compiler/NubLang/Syntax/Parsing/Node/DefinitionSyntax.cs index 5680223..ea5978e 100644 --- a/src/compiler/NubLang/Syntax/Parsing/Node/DefinitionSyntax.cs +++ b/src/compiler/NubLang/Syntax/Parsing/Node/DefinitionSyntax.cs @@ -1,4 +1,4 @@ -using Common; +using NubLang.Common; using NubLang.Syntax.Tokenization; namespace NubLang.Syntax.Parsing.Node; diff --git a/src/compiler/NubLang/Syntax/Parsing/Node/ExpressionSyntax.cs b/src/compiler/NubLang/Syntax/Parsing/Node/ExpressionSyntax.cs index 1e91ea7..93c343d 100644 --- a/src/compiler/NubLang/Syntax/Parsing/Node/ExpressionSyntax.cs +++ b/src/compiler/NubLang/Syntax/Parsing/Node/ExpressionSyntax.cs @@ -1,4 +1,4 @@ -using Common; +using NubLang.Common; using NubLang.Syntax.Tokenization; namespace NubLang.Syntax.Parsing.Node; diff --git a/src/compiler/NubLang/Syntax/Parsing/Node/StatementSyntax.cs b/src/compiler/NubLang/Syntax/Parsing/Node/StatementSyntax.cs index 08d4aec..7e15cb1 100644 --- a/src/compiler/NubLang/Syntax/Parsing/Node/StatementSyntax.cs +++ b/src/compiler/NubLang/Syntax/Parsing/Node/StatementSyntax.cs @@ -1,4 +1,4 @@ -using Common; +using NubLang.Common; using NubLang.Syntax.Tokenization; namespace NubLang.Syntax.Parsing.Node; diff --git a/src/compiler/NubLang/Syntax/Parsing/Parser.cs b/src/compiler/NubLang/Syntax/Parsing/Parser.cs index 280f9ea..d0e140a 100644 --- a/src/compiler/NubLang/Syntax/Parsing/Parser.cs +++ b/src/compiler/NubLang/Syntax/Parsing/Parser.cs @@ -1,5 +1,5 @@ using System.Diagnostics.CodeAnalysis; -using Common; +using NubLang.Common; using NubLang.Diagnostics; using NubLang.Syntax.Parsing.Node; using NubLang.Syntax.Tokenization; diff --git a/src/compiler/NubLang/Syntax/Tokenization/Tokenizer.cs b/src/compiler/NubLang/Syntax/Tokenization/Tokenizer.cs index 49069b6..b3c0316 100644 --- a/src/compiler/NubLang/Syntax/Tokenization/Tokenizer.cs +++ b/src/compiler/NubLang/Syntax/Tokenization/Tokenizer.cs @@ -1,4 +1,4 @@ -using Common; +using NubLang.Common; using NubLang.Diagnostics; namespace NubLang.Syntax.Tokenization;