From efe13730e773e6555162180d0c3c4804869bbe84 Mon Sep 17 00:00:00 2001 From: nub31 Date: Tue, 22 Jul 2025 23:24:30 +0200 Subject: [PATCH] ... --- src/compiler/Compiler.sln | 6 ------ src/compiler/NubLang.CLI/NubLang.CLI.csproj | 4 ---- src/compiler/NubLang.CLI/Program.cs | 2 +- src/compiler/NubLang.Common/NubLang.Common.csproj | 10 ---------- src/compiler/{NubLang.Common => NubLang}/HexString.cs | 2 +- src/compiler/NubLang/NubLang.csproj | 4 ---- src/compiler/{NubLang.Common => NubLang}/Optional.cs | 2 +- src/compiler/NubLang/Parsing/Parser.cs | 1 - .../NubLang/Parsing/Syntax/DefinitionSyntax.cs | 2 -- src/compiler/NubLang/Parsing/Syntax/StatementSyntax.cs | 2 -- src/compiler/NubLang/Tokenization/Tokenizer.cs | 4 +--- src/compiler/NubLang/TypeChecking/Node/Definition.cs | 4 +--- src/compiler/NubLang/TypeChecking/Node/Statement.cs | 4 +--- src/compiler/NubLang/TypeChecking/TypeChecker.cs | 1 - src/compiler/{NubLang.Common => NubLang}/Variant.cs | 2 +- 15 files changed, 7 insertions(+), 43 deletions(-) delete mode 100644 src/compiler/NubLang.Common/NubLang.Common.csproj rename src/compiler/{NubLang.Common => NubLang}/HexString.cs (96%) rename src/compiler/{NubLang.Common => NubLang}/Optional.cs (98%) rename src/compiler/{NubLang.Common => NubLang}/Variant.cs (98%) diff --git a/src/compiler/Compiler.sln b/src/compiler/Compiler.sln index b2eb626..292d374 100644 --- a/src/compiler/Compiler.sln +++ b/src/compiler/Compiler.sln @@ -4,8 +4,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NubLang", "NubLang\NubLang. EndProject 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}") = "NubLang.Common", "NubLang.Common\NubLang.Common.csproj", "{91ECE034-32D4-48E6-A905-5F95DB95A3D4}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -20,9 +18,5 @@ Global {A22F17ED-FA17-45AB-92BA-CD02C28B3524}.Debug|Any CPU.Build.0 = Debug|Any CPU {A22F17ED-FA17-45AB-92BA-CD02C28B3524}.Release|Any CPU.ActiveCfg = Release|Any CPU {A22F17ED-FA17-45AB-92BA-CD02C28B3524}.Release|Any CPU.Build.0 = Release|Any CPU - {91ECE034-32D4-48E6-A905-5F95DB95A3D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {91ECE034-32D4-48E6-A905-5F95DB95A3D4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {91ECE034-32D4-48E6-A905-5F95DB95A3D4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {91ECE034-32D4-48E6-A905-5F95DB95A3D4}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection EndGlobal diff --git a/src/compiler/NubLang.CLI/NubLang.CLI.csproj b/src/compiler/NubLang.CLI/NubLang.CLI.csproj index 6a0f8fe..a686430 100644 --- a/src/compiler/NubLang.CLI/NubLang.CLI.csproj +++ b/src/compiler/NubLang.CLI/NubLang.CLI.csproj @@ -13,10 +13,6 @@ - - - - diff --git a/src/compiler/NubLang.CLI/Program.cs b/src/compiler/NubLang.CLI/Program.cs index e050c10..d2d6731 100644 --- a/src/compiler/NubLang.CLI/Program.cs +++ b/src/compiler/NubLang.CLI/Program.cs @@ -1,7 +1,7 @@ using System.Reflection; +using NubLang; using NubLang.CLI; using NubLang.Code; -using NubLang.Common; using NubLang.Diagnostics; using NubLang.Generation; using NubLang.Generation.QBE; diff --git a/src/compiler/NubLang.Common/NubLang.Common.csproj b/src/compiler/NubLang.Common/NubLang.Common.csproj deleted file mode 100644 index b682a68..0000000 --- a/src/compiler/NubLang.Common/NubLang.Common.csproj +++ /dev/null @@ -1,10 +0,0 @@ - - - - net9.0 - enable - enable - true - - - diff --git a/src/compiler/NubLang.Common/HexString.cs b/src/compiler/NubLang/HexString.cs similarity index 96% rename from src/compiler/NubLang.Common/HexString.cs rename to src/compiler/NubLang/HexString.cs index e5c2640..0291111 100644 --- a/src/compiler/NubLang.Common/HexString.cs +++ b/src/compiler/NubLang/HexString.cs @@ -1,4 +1,4 @@ -namespace NubLang.Common; +namespace NubLang; public static class HexString { diff --git a/src/compiler/NubLang/NubLang.csproj b/src/compiler/NubLang/NubLang.csproj index 906da4f..b682a68 100644 --- a/src/compiler/NubLang/NubLang.csproj +++ b/src/compiler/NubLang/NubLang.csproj @@ -7,8 +7,4 @@ true - - - - diff --git a/src/compiler/NubLang.Common/Optional.cs b/src/compiler/NubLang/Optional.cs similarity index 98% rename from src/compiler/NubLang.Common/Optional.cs rename to src/compiler/NubLang/Optional.cs index eb5d85a..a467b5b 100644 --- a/src/compiler/NubLang.Common/Optional.cs +++ b/src/compiler/NubLang/Optional.cs @@ -1,6 +1,6 @@ using System.Diagnostics.CodeAnalysis; -namespace NubLang.Common; +namespace NubLang; public static class Optional { diff --git a/src/compiler/NubLang/Parsing/Parser.cs b/src/compiler/NubLang/Parsing/Parser.cs index 53495ee..1b5c758 100644 --- a/src/compiler/NubLang/Parsing/Parser.cs +++ b/src/compiler/NubLang/Parsing/Parser.cs @@ -1,5 +1,4 @@ using System.Diagnostics.CodeAnalysis; -using NubLang.Common; using NubLang.Diagnostics; using NubLang.Parsing.Syntax; using NubLang.Tokenization; diff --git a/src/compiler/NubLang/Parsing/Syntax/DefinitionSyntax.cs b/src/compiler/NubLang/Parsing/Syntax/DefinitionSyntax.cs index 0ef71ee..91be4f3 100644 --- a/src/compiler/NubLang/Parsing/Syntax/DefinitionSyntax.cs +++ b/src/compiler/NubLang/Parsing/Syntax/DefinitionSyntax.cs @@ -1,5 +1,3 @@ -using NubLang.Common; - namespace NubLang.Parsing.Syntax; public abstract record DefinitionSyntax : SyntaxNode; diff --git a/src/compiler/NubLang/Parsing/Syntax/StatementSyntax.cs b/src/compiler/NubLang/Parsing/Syntax/StatementSyntax.cs index 4716e5e..5ad40e7 100644 --- a/src/compiler/NubLang/Parsing/Syntax/StatementSyntax.cs +++ b/src/compiler/NubLang/Parsing/Syntax/StatementSyntax.cs @@ -1,5 +1,3 @@ -using NubLang.Common; - namespace NubLang.Parsing.Syntax; public abstract record StatementSyntax : SyntaxNode; diff --git a/src/compiler/NubLang/Tokenization/Tokenizer.cs b/src/compiler/NubLang/Tokenization/Tokenizer.cs index 43ed3c6..8e3a354 100644 --- a/src/compiler/NubLang/Tokenization/Tokenizer.cs +++ b/src/compiler/NubLang/Tokenization/Tokenizer.cs @@ -1,6 +1,4 @@ -using NubLang.Common; - -namespace NubLang.Tokenization; +namespace NubLang.Tokenization; public sealed class Tokenizer { diff --git a/src/compiler/NubLang/TypeChecking/Node/Definition.cs b/src/compiler/NubLang/TypeChecking/Node/Definition.cs index 2c8ec82..98cd630 100644 --- a/src/compiler/NubLang/TypeChecking/Node/Definition.cs +++ b/src/compiler/NubLang/TypeChecking/Node/Definition.cs @@ -1,6 +1,4 @@ -using NubLang.Common; - -namespace NubLang.TypeChecking.Node; +namespace NubLang.TypeChecking.Node; public abstract record Definition : Node; diff --git a/src/compiler/NubLang/TypeChecking/Node/Statement.cs b/src/compiler/NubLang/TypeChecking/Node/Statement.cs index 9fd2eea..5a1a42b 100644 --- a/src/compiler/NubLang/TypeChecking/Node/Statement.cs +++ b/src/compiler/NubLang/TypeChecking/Node/Statement.cs @@ -1,6 +1,4 @@ -using NubLang.Common; - -namespace NubLang.TypeChecking.Node; +namespace NubLang.TypeChecking.Node; public record Statement : Node; diff --git a/src/compiler/NubLang/TypeChecking/TypeChecker.cs b/src/compiler/NubLang/TypeChecking/TypeChecker.cs index 4e16b63..30886d5 100644 --- a/src/compiler/NubLang/TypeChecking/TypeChecker.cs +++ b/src/compiler/NubLang/TypeChecking/TypeChecker.cs @@ -1,4 +1,3 @@ -using NubLang.Common; using NubLang.Diagnostics; using NubLang.Parsing.Syntax; using NubLang.Tokenization; diff --git a/src/compiler/NubLang.Common/Variant.cs b/src/compiler/NubLang/Variant.cs similarity index 98% rename from src/compiler/NubLang.Common/Variant.cs rename to src/compiler/NubLang/Variant.cs index 334515e..c9898b8 100644 --- a/src/compiler/NubLang.Common/Variant.cs +++ b/src/compiler/NubLang/Variant.cs @@ -1,6 +1,6 @@ using System.Diagnostics.CodeAnalysis; -namespace NubLang.Common; +namespace NubLang; public readonly struct Variant where T1 : notnull where T2 : notnull {