From a06e46c6a5b65eaf2a3addb02380104edfec615f Mon Sep 17 00:00:00 2001 From: nub31 Date: Sun, 1 Jun 2025 01:53:11 +0200 Subject: [PATCH] ... --- src/lang/Nub.Lang.CLI/Program.cs | 1 - src/lang/Nub.Lang/{Frontend => }/Diagnostics/ConsoleColors.cs | 2 +- src/lang/Nub.Lang/{Frontend => }/Diagnostics/Diagnostic.cs | 2 +- .../Nub.Lang/{Frontend => }/Diagnostics/DiagnosticsResult.cs | 2 +- src/lang/Nub.Lang/Frontend/Lexing/Lexer.cs | 2 +- src/lang/Nub.Lang/Frontend/Parsing/Parser.cs | 4 ++-- src/lang/Nub.Lang/Frontend/Typing/TypeChecker.cs | 2 +- 7 files changed, 7 insertions(+), 8 deletions(-) rename src/lang/Nub.Lang/{Frontend => }/Diagnostics/ConsoleColors.cs (99%) rename src/lang/Nub.Lang/{Frontend => }/Diagnostics/Diagnostic.cs (99%) rename src/lang/Nub.Lang/{Frontend => }/Diagnostics/DiagnosticsResult.cs (92%) diff --git a/src/lang/Nub.Lang.CLI/Program.cs b/src/lang/Nub.Lang.CLI/Program.cs index e62add6..e159ca2 100644 --- a/src/lang/Nub.Lang.CLI/Program.cs +++ b/src/lang/Nub.Lang.CLI/Program.cs @@ -1,6 +1,5 @@ using Nub.Lang; using Nub.Lang.Backend; -using Nub.Lang.Frontend.Diagnostics; using Nub.Lang.Frontend.Lexing; using Nub.Lang.Frontend.Parsing; using Nub.Lang.Frontend.Typing; diff --git a/src/lang/Nub.Lang/Frontend/Diagnostics/ConsoleColors.cs b/src/lang/Nub.Lang/Diagnostics/ConsoleColors.cs similarity index 99% rename from src/lang/Nub.Lang/Frontend/Diagnostics/ConsoleColors.cs rename to src/lang/Nub.Lang/Diagnostics/ConsoleColors.cs index eaa1791..6c211a0 100644 --- a/src/lang/Nub.Lang/Frontend/Diagnostics/ConsoleColors.cs +++ b/src/lang/Nub.Lang/Diagnostics/ConsoleColors.cs @@ -2,7 +2,7 @@ using System.Text; using Nub.Lang.Frontend.Lexing; using Nub.Lang.Frontend.Typing; -namespace Nub.Lang.Frontend.Diagnostics; +namespace Nub.Lang.Diagnostics; public static class ConsoleColors { diff --git a/src/lang/Nub.Lang/Frontend/Diagnostics/Diagnostic.cs b/src/lang/Nub.Lang/Diagnostics/Diagnostic.cs similarity index 99% rename from src/lang/Nub.Lang/Frontend/Diagnostics/Diagnostic.cs rename to src/lang/Nub.Lang/Diagnostics/Diagnostic.cs index 9517681..eb75061 100644 --- a/src/lang/Nub.Lang/Frontend/Diagnostics/Diagnostic.cs +++ b/src/lang/Nub.Lang/Diagnostics/Diagnostic.cs @@ -2,7 +2,7 @@ using System.Text; using Nub.Lang.Frontend.Lexing; using Nub.Lang.Frontend.Parsing; -namespace Nub.Lang.Frontend.Diagnostics; +namespace Nub.Lang.Diagnostics; public class Diagnostic { diff --git a/src/lang/Nub.Lang/Frontend/Diagnostics/DiagnosticsResult.cs b/src/lang/Nub.Lang/Diagnostics/DiagnosticsResult.cs similarity index 92% rename from src/lang/Nub.Lang/Frontend/Diagnostics/DiagnosticsResult.cs rename to src/lang/Nub.Lang/Diagnostics/DiagnosticsResult.cs index c2af33d..f1c761e 100644 --- a/src/lang/Nub.Lang/Frontend/Diagnostics/DiagnosticsResult.cs +++ b/src/lang/Nub.Lang/Diagnostics/DiagnosticsResult.cs @@ -1,4 +1,4 @@ -namespace Nub.Lang.Frontend.Diagnostics; +namespace Nub.Lang.Diagnostics; public class DiagnosticsResult(List diagnostics) { diff --git a/src/lang/Nub.Lang/Frontend/Lexing/Lexer.cs b/src/lang/Nub.Lang/Frontend/Lexing/Lexer.cs index 5771545..2935775 100644 --- a/src/lang/Nub.Lang/Frontend/Lexing/Lexer.cs +++ b/src/lang/Nub.Lang/Frontend/Lexing/Lexer.cs @@ -1,4 +1,4 @@ -using Nub.Lang.Frontend.Diagnostics; +using Nub.Lang.Diagnostics; using Nub.Lang.Frontend.Typing; namespace Nub.Lang.Frontend.Lexing; diff --git a/src/lang/Nub.Lang/Frontend/Parsing/Parser.cs b/src/lang/Nub.Lang/Frontend/Parsing/Parser.cs index 2a62f03..00196f0 100644 --- a/src/lang/Nub.Lang/Frontend/Parsing/Parser.cs +++ b/src/lang/Nub.Lang/Frontend/Parsing/Parser.cs @@ -1,5 +1,5 @@ using System.Diagnostics.CodeAnalysis; -using Nub.Lang.Frontend.Diagnostics; +using Nub.Lang.Diagnostics; using Nub.Lang.Frontend.Lexing; using Nub.Lang.Frontend.Typing; @@ -276,7 +276,7 @@ public class Parser { throw new ParseException(Diagnostic .Error($"Unexpected symbol '{symbol.Symbol}' after identifier") - .WithHelp("Expected '(', '=', or ':' after identifier") + .WithHelp("Expected '(', '=', or '::' after identifier") .At(symbol) .Build()); } diff --git a/src/lang/Nub.Lang/Frontend/Typing/TypeChecker.cs b/src/lang/Nub.Lang/Frontend/Typing/TypeChecker.cs index b8e75b5..cddf0fe 100644 --- a/src/lang/Nub.Lang/Frontend/Typing/TypeChecker.cs +++ b/src/lang/Nub.Lang/Frontend/Typing/TypeChecker.cs @@ -1,5 +1,5 @@ +using Nub.Lang.Diagnostics; using Nub.Lang.Frontend.Parsing; -using Nub.Lang.Frontend.Diagnostics; namespace Nub.Lang.Frontend.Typing;