...

src/CLI/CLI.csproj

@@ -7,11 +7,12 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <PublishAot>true</PublishAot>
+        <RootNamespace>cli</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\generation\generation.csproj" />
-      <ProjectReference Include="..\syntax\syntax.csproj" />
+      <ProjectReference Include="..\generation2\generation2.csproj" />
+      <ProjectReference Include="..\syntax2\syntax2.csproj" />
     </ItemGroup>
 
     <ItemGroup>

src/CLI/Program.cs

@@ -1,11 +1,10 @@
 using System.Diagnostics;
 using System.Reflection;
-using Nub.Lang.Common;
-using Nub.Lang.Generation.QBE;
-using Nub.Lang.Syntax;
-using Nub.Lang.Syntax.Parsing;
-using Nub.Lang.Syntax.Tokenization;
-using Nub.Lang.Syntax.Typing;
+using generation.QBE;
+using syntax;
+using syntax.Parsing;
+using syntax.Tokenization;
+using syntax.Typing;
 
 const string BIN_DIR = "bin";
 const string BIN_INT_DIR = "bin-int";

src/Common/Common.csproj

@@ -4,6 +4,7 @@
         <TargetFramework>net9.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
+        <RootNamespace>common</RootNamespace>
     </PropertyGroup>
 
 </Project>

src/Common/Optional.cs

@@ -1,6 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 
-namespace Nub.Lang.Common;
+namespace common;
 
 public readonly struct Optional
 {

src/Common/Variant.cs

@@ -1,4 +1,4 @@
-namespace Nub.Lang.Common;
+namespace common;
 
 public readonly struct Variant<T1, T2> where T1 : notnull where T2 : notnull
 {

src/Compiler.sln

@@ -1,12 +1,12 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "syntax", "syntax\syntax.csproj", "{5047E21F-590D-4CB3-AFF3-064316485009}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Syntax", "Syntax\Syntax.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}") = "CLI", "CLI\CLI.csproj", "{A22F17ED-FA17-45AB-92BA-CD02C28B3524}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "generation", "generation\generation.csproj", "{F903F1B9-69A6-4522-B483-81A4B072C8B1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Generation", "Generation\Generation.csproj", "{F903F1B9-69A6-4522-B483-81A4B072C8B1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "common", "common\common.csproj", "{91ECE034-32D4-48E6-A905-5F95DB95A3D4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common", "Common\Common.csproj", "{91ECE034-32D4-48E6-A905-5F95DB95A3D4}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

src/Generation/Generation.csproj

@@ -4,11 +4,12 @@
         <TargetFramework>net9.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
+        <RootNamespace>generation</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\common\common.csproj" />
-      <ProjectReference Include="..\syntax\syntax.csproj" />
+      <ProjectReference Include="..\Common\Common.csproj" />
+      <ProjectReference Include="..\syntax2\syntax2.csproj" />
     </ItemGroup>
 
 </Project>

src/Generation/QBE/QBEGenerator.cs

@@ -1,15 +1,15 @@
 using System.Diagnostics;
 using System.Globalization;
 using System.Text;
-using Nub.Lang.Syntax;
-using Nub.Lang.Syntax.Parsing;
-using Nub.Lang.Syntax.Parsing.Definitions;
-using Nub.Lang.Syntax.Parsing.Expressions;
-using Nub.Lang.Syntax.Parsing.Statements;
-using Nub.Lang.Syntax.Tokenization;
-using Nub.Lang.Syntax.Typing;
+using syntax;
+using syntax.Parsing;
+using syntax.Parsing.Definitions;
+using syntax.Parsing.Expressions;
+using syntax.Parsing.Statements;
+using syntax.Tokenization;
+using syntax.Typing;
 
-namespace Nub.Lang.Generation.QBE;
+namespace generation.QBE;
 
 public static class QBEGenerator
 {

src/Syntax/DefinitionTable.cs

@@ -1,8 +1,8 @@
-using Nub.Lang.Common;
-using Nub.Lang.Syntax.Parsing;
-using Nub.Lang.Syntax.Parsing.Definitions;
+using common;
+using syntax.Parsing;
+using syntax.Parsing.Definitions;
 
-namespace Nub.Lang.Syntax;
+namespace syntax;
 
 public class DefinitionTable
 {

src/Syntax/Diagnostics/ConsoleColors.cs

@@ -1,7 +1,7 @@
 using System.Text;
-using Nub.Lang.Syntax.Tokenization;
+using syntax.Tokenization;
 
-namespace Nub.Lang.Syntax.Diagnostics;
+namespace syntax.Diagnostics;
 
 public static class ConsoleColors
 {

src/Syntax/Diagnostics/Diagnostic.cs

@@ -1,8 +1,8 @@
 using System.Text;
-using Nub.Lang.Syntax.Parsing;
-using Nub.Lang.Syntax.Tokenization;
+using syntax.Parsing;
+using syntax.Tokenization;
 
-namespace Nub.Lang.Syntax.Diagnostics;
+namespace syntax.Diagnostics;
 
 public class Diagnostic
 {

src/Syntax/Diagnostics/DiagnosticsResult.cs

@@ -1,4 +1,4 @@
-namespace Nub.Lang.Syntax.Diagnostics;
+namespace syntax.Diagnostics;
 
 public class DiagnosticsResult(List<Diagnostic> diagnostics)
 {

src/Syntax/Parsing/CompilationUnit.cs

@@ -1,6 +1,6 @@
-using Nub.Lang.Syntax.Parsing.Definitions;
+using syntax.Parsing.Definitions;
 
-namespace Nub.Lang.Syntax.Parsing;
+namespace syntax.Parsing;
 
 public class CompilationUnit(string @namespace, List<DefinitionNode> definitions)
 {

src/Syntax/Parsing/Definitions/DefinitionNode.cs

@@ -1,7 +1,7 @@
-using Nub.Lang.Common;
-using Nub.Lang.Syntax.Tokenization;
+using common;
+using syntax.Tokenization;
 
-namespace Nub.Lang.Syntax.Parsing.Definitions;
+namespace syntax.Parsing.Definitions;
 
 public abstract class DefinitionNode(IReadOnlyList<Token> tokens, Optional<string> documentation, string @namespace) : Node(tokens)
 {

src/Syntax/Parsing/Definitions/FuncDefinitionNode.cs

@@ -1,9 +1,9 @@
-using Nub.Lang.Common;
-using Nub.Lang.Syntax.Parsing.Statements;
-using Nub.Lang.Syntax.Tokenization;
-using Nub.Lang.Syntax.Typing;
+using common;
+using syntax.Parsing.Statements;
+using syntax.Tokenization;
+using syntax.Typing;
 
-namespace Nub.Lang.Syntax.Parsing.Definitions;
+namespace syntax.Parsing.Definitions;
 
 public class FuncParameter(string name, NubType type)
 {

src/Syntax/Parsing/Definitions/StructDefinitionNode.cs

@@ -1,9 +1,9 @@
-using Nub.Lang.Common;
-using Nub.Lang.Syntax.Parsing.Expressions;
-using Nub.Lang.Syntax.Tokenization;
-using Nub.Lang.Syntax.Typing;
+using common;
+using syntax.Parsing.Expressions;
+using syntax.Tokenization;
+using syntax.Typing;
 
-namespace Nub.Lang.Syntax.Parsing.Definitions;
+namespace syntax.Parsing.Definitions;
 
 public class StructField(string name, NubType type, Optional<ExpressionNode> value)
 {

src/Syntax/Parsing/Expressions/AddressOfNode.cs

@@ -1,6 +1,6 @@
-using Nub.Lang.Syntax.Tokenization;
+using syntax.Tokenization;
 
-namespace Nub.Lang.Syntax.Parsing.Expressions;
+namespace syntax.Parsing.Expressions;
 
 public class AddressOfNode(IReadOnlyList<Token> tokens, LValueNode expression) : ExpressionNode(tokens)
 {

src/Syntax/Parsing/Expressions/AnonymousFuncNode.cs

@@ -1,9 +1,9 @@
-using Nub.Lang.Syntax.Parsing.Definitions;
-using Nub.Lang.Syntax.Parsing.Statements;
-using Nub.Lang.Syntax.Tokenization;
-using Nub.Lang.Syntax.Typing;
+using syntax.Parsing.Definitions;
+using syntax.Parsing.Statements;
+using syntax.Tokenization;
+using syntax.Typing;
 
-namespace Nub.Lang.Syntax.Parsing.Expressions;
+namespace syntax.Parsing.Expressions;
 
 public class AnonymousFuncNode(IReadOnlyList<Token> tokens, List<FuncParameter> parameters, BlockNode body, NubType returnType) : ExpressionNode(tokens)
 {

src/Syntax/Parsing/Expressions/ArrayIndexAccessNode.cs

@@ -1,6 +1,6 @@
-using Nub.Lang.Syntax.Tokenization;
+using syntax.Tokenization;
 
-namespace Nub.Lang.Syntax.Parsing.Expressions;
+namespace syntax.Parsing.Expressions;
 
 public class ArrayIndexAccessNode(IReadOnlyList<Token> tokens, ExpressionNode array, ExpressionNode index) : LValueNode(tokens)
 {

src/Syntax/Parsing/Expressions/ArrayInitializerNode.cs

@@ -1,7 +1,7 @@
-using Nub.Lang.Syntax.Tokenization;
-using Nub.Lang.Syntax.Typing;
+using syntax.Tokenization;
+using syntax.Typing;
 
-namespace Nub.Lang.Syntax.Parsing.Expressions;
+namespace syntax.Parsing.Expressions;
 
 public class ArrayInitializerNode(IReadOnlyList<Token> tokens, ExpressionNode capacity, NubType elementType) : ExpressionNode(tokens)
 {

src/Syntax/Parsing/Expressions/BinaryExpressionNode.cs

@@ -1,6 +1,6 @@
-using Nub.Lang.Syntax.Tokenization;
+using syntax.Tokenization;
 
-namespace Nub.Lang.Syntax.Parsing.Expressions;
+namespace syntax.Parsing.Expressions;
 
 public class BinaryExpressionNode(IReadOnlyList<Token> tokens, ExpressionNode left, BinaryExpressionOperator @operator, ExpressionNode right) : ExpressionNode(tokens)
 {

src/Syntax/Parsing/Expressions/DereferenceNode.cs

@@ -1,6 +1,6 @@
-using Nub.Lang.Syntax.Tokenization;
+using syntax.Tokenization;
 
-namespace Nub.Lang.Syntax.Parsing.Expressions;
+namespace syntax.Parsing.Expressions;
 
 public class DereferenceNode(IReadOnlyList<Token> tokens, ExpressionNode expression) : LValueNode(tokens)
 {

src/Syntax/Parsing/Expressions/ExpressionNode.cs

@@ -1,7 +1,7 @@
-using Nub.Lang.Syntax.Tokenization;
-using Nub.Lang.Syntax.Typing;
+using syntax.Tokenization;
+using syntax.Typing;
 
-namespace Nub.Lang.Syntax.Parsing.Expressions;
+namespace syntax.Parsing.Expressions;
 
 public abstract class ExpressionNode(IReadOnlyList<Token> tokens) : Node(tokens)
 {

src/Syntax/Parsing/Expressions/FixedArrayInitializerNode.cs

@@ -1,7 +1,7 @@
-using Nub.Lang.Syntax.Tokenization;
-using Nub.Lang.Syntax.Typing;
+using syntax.Tokenization;
+using syntax.Typing;
 
-namespace Nub.Lang.Syntax.Parsing.Expressions;
+namespace syntax.Parsing.Expressions;
 
 public class FixedArrayInitializerNode(IReadOnlyList<Token> tokens, NubType elementType, int capacity) : ExpressionNode(tokens)
 {

src/Syntax/Parsing/Expressions/FuncCallNode.cs

@@ -1,6 +1,6 @@
-using Nub.Lang.Syntax.Tokenization;
+using syntax.Tokenization;
 
-namespace Nub.Lang.Syntax.Parsing.Expressions;
+namespace syntax.Parsing.Expressions;
 
 public class FuncCallNode(IReadOnlyList<Token> tokens, ExpressionNode expression, List<ExpressionNode> parameters) : ExpressionNode(tokens)
 {

src/Syntax/Parsing/Expressions/IdentifierNode.cs

@@ -1,7 +1,7 @@
-using Nub.Lang.Common;
-using Nub.Lang.Syntax.Tokenization;
+using common;
+using syntax.Tokenization;
 
-namespace Nub.Lang.Syntax.Parsing.Expressions;
+namespace syntax.Parsing.Expressions;
 
 public class IdentifierNode(IReadOnlyList<Token> tokens, Optional<string> @namespace, string name) : LValueNode(tokens)
 {

src/Syntax/Parsing/Expressions/LiteralNode.cs

@@ -1,6 +1,6 @@
-using Nub.Lang.Syntax.Tokenization;
+using syntax.Tokenization;
 
-namespace Nub.Lang.Syntax.Parsing.Expressions;
+namespace syntax.Parsing.Expressions;
 
 public class LiteralNode(IReadOnlyList<Token> tokens, string literal, LiteralKind kind) : ExpressionNode(tokens)
 {

src/Syntax/Parsing/Expressions/MemberAccessNode.cs

@@ -1,6 +1,6 @@
-using Nub.Lang.Syntax.Tokenization;
+using syntax.Tokenization;
 
-namespace Nub.Lang.Syntax.Parsing.Expressions;
+namespace syntax.Parsing.Expressions;
 
 public class MemberAccessNode(IReadOnlyList<Token> tokens, ExpressionNode expression, string member) : LValueNode(tokens)
 {

src/Syntax/Parsing/Expressions/StructInitializerNode.cs

@@ -1,7 +1,7 @@
-using Nub.Lang.Syntax.Tokenization;
-using Nub.Lang.Syntax.Typing;
+using syntax.Tokenization;
+using syntax.Typing;
 
-namespace Nub.Lang.Syntax.Parsing.Expressions;
+namespace syntax.Parsing.Expressions;
 
 public class StructInitializerNode(IReadOnlyList<Token> tokens, NubStructType structType, Dictionary<string, ExpressionNode> initializers) : ExpressionNode(tokens)
 {

src/Syntax/Parsing/Expressions/UnaryExpressionNode.cs

@@ -1,6 +1,6 @@
-using Nub.Lang.Syntax.Tokenization;
+using syntax.Tokenization;
 
-namespace Nub.Lang.Syntax.Parsing.Expressions;
+namespace syntax.Parsing.Expressions;
 
 public class UnaryExpressionNode(IReadOnlyList<Token> tokens, UnaryExpressionOperator @operator, ExpressionNode operand) : ExpressionNode(tokens)
 {

src/Syntax/Parsing/Node.cs

@@ -1,6 +1,6 @@
-using Nub.Lang.Syntax.Tokenization;
+using syntax.Tokenization;
 
-namespace Nub.Lang.Syntax.Parsing;
+namespace syntax.Parsing;
 
 public abstract class Node(IReadOnlyList<Token> tokens)
 {

src/Syntax/Parsing/Parser.cs

@@ -1,14 +1,14 @@
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
-using Nub.Lang.Common;
-using Nub.Lang.Syntax.Diagnostics;
-using Nub.Lang.Syntax.Parsing.Definitions;
-using Nub.Lang.Syntax.Parsing.Expressions;
-using Nub.Lang.Syntax.Parsing.Statements;
-using Nub.Lang.Syntax.Tokenization;
-using Nub.Lang.Syntax.Typing;
+using common;
+using syntax.Diagnostics;
+using syntax.Parsing.Definitions;
+using syntax.Parsing.Expressions;
+using syntax.Parsing.Statements;
+using syntax.Tokenization;
+using syntax.Typing;
 
-namespace Nub.Lang.Syntax.Parsing;
+namespace syntax.Parsing;
 
 public static class Parser
 {
@@ -763,7 +763,7 @@ public static class Parser
         }
 
         throw new ParseException(Diagnostic
-            .Error("Invalid type syntax")
+            .Error("Invalid type Syntax")
             .WithHelp("Expected type name, '^' for pointer, or '[]' for array")
             .At(peekToken)
             .Build());
@@ -775,7 +775,7 @@ public static class Parser
         {
             throw new ParseException(Diagnostic
                 .Error("Unexpected end of file")
-                .WithHelp("Expected more tokens to complete the syntax")
+                .WithHelp("Expected more tokens to complete the Syntax")
                 .At(_tokens.Last())
                 .Build());
         }

src/Syntax/Parsing/Statements/ArrayIndexAssignmentNode.cs

@@ -1,7 +1,7 @@
-using Nub.Lang.Syntax.Parsing.Expressions;
-using Nub.Lang.Syntax.Tokenization;
+using syntax.Parsing.Expressions;
+using syntax.Tokenization;
 
-namespace Nub.Lang.Syntax.Parsing.Statements;
+namespace syntax.Parsing.Statements;
 
 public class ArrayIndexAssignmentNode(IReadOnlyList<Token> tokens, ArrayIndexAccessNode arrayIndexAccess, ExpressionNode value) : StatementNode(tokens)
 {

src/Syntax/Parsing/Statements/BlockNode.cs

@@ -1,6 +1,6 @@
-using Nub.Lang.Syntax.Tokenization;
+using syntax.Tokenization;
 
-namespace Nub.Lang.Syntax.Parsing.Statements;
+namespace syntax.Parsing.Statements;
 
 public class BlockNode(IReadOnlyList<Token> tokens, List<StatementNode> statements) : Node(tokens)
 {

src/Syntax/Parsing/Statements/BreakNode.cs

@@ -0,0 +1,5 @@
+using syntax.Tokenization;
+
+namespace syntax.Parsing.Statements;
+
+public class BreakNode(IReadOnlyList<Token> tokens) : StatementNode(tokens);

src/Syntax/Parsing/Statements/ContinueNode.cs

@@ -0,0 +1,5 @@
+using syntax.Tokenization;
+
+namespace syntax.Parsing.Statements;
+
+public class ContinueNode(IReadOnlyList<Token> tokens) : StatementNode(tokens);

src/Syntax/Parsing/Statements/DereferenceAssignmentNode.cs

@@ -1,7 +1,7 @@
-using Nub.Lang.Syntax.Parsing.Expressions;
-using Nub.Lang.Syntax.Tokenization;
+using syntax.Parsing.Expressions;
+using syntax.Tokenization;
 
-namespace Nub.Lang.Syntax.Parsing.Statements;
+namespace syntax.Parsing.Statements;
 
 public class DereferenceAssignmentNode(IReadOnlyList<Token> tokens, DereferenceNode dereference, ExpressionNode value) : StatementNode(tokens)
 {

src/Syntax/Parsing/Statements/IfNode.cs

@@ -1,8 +1,8 @@
-using Nub.Lang.Common;
-using Nub.Lang.Syntax.Parsing.Expressions;
-using Nub.Lang.Syntax.Tokenization;
+using common;
+using syntax.Parsing.Expressions;
+using syntax.Tokenization;
 
-namespace Nub.Lang.Syntax.Parsing.Statements;
+namespace syntax.Parsing.Statements;
 
 public class IfNode(IReadOnlyList<Token> tokens, ExpressionNode condition, BlockNode body, Optional<Variant<IfNode, BlockNode>> @else) : StatementNode(tokens)
 {

src/Syntax/Parsing/Statements/MemberAssignmentNode.cs

@@ -1,7 +1,7 @@
-using Nub.Lang.Syntax.Parsing.Expressions;
-using Nub.Lang.Syntax.Tokenization;
+using syntax.Parsing.Expressions;
+using syntax.Tokenization;
 
-namespace Nub.Lang.Syntax.Parsing.Statements;
+namespace syntax.Parsing.Statements;
 
 public class MemberAssignmentNode(IReadOnlyList<Token> tokens, MemberAccessNode expression, ExpressionNode value) : StatementNode(tokens)
 {

src/Syntax/Parsing/Statements/ReturnNode.cs

@@ -1,8 +1,8 @@
-using Nub.Lang.Common;
-using Nub.Lang.Syntax.Parsing.Expressions;
-using Nub.Lang.Syntax.Tokenization;
+using common;
+using syntax.Parsing.Expressions;
+using syntax.Tokenization;
 
-namespace Nub.Lang.Syntax.Parsing.Statements;
+namespace syntax.Parsing.Statements;
 
 public class ReturnNode(IReadOnlyList<Token> tokens, Optional<ExpressionNode> value) : StatementNode(tokens)
 {

src/Syntax/Parsing/Statements/StatementExpressionNode.cs

@@ -1,7 +1,7 @@
-using Nub.Lang.Syntax.Parsing.Expressions;
-using Nub.Lang.Syntax.Tokenization;
+using syntax.Parsing.Expressions;
+using syntax.Tokenization;
 
-namespace Nub.Lang.Syntax.Parsing.Statements;
+namespace syntax.Parsing.Statements;
 
 public class StatementExpressionNode(IReadOnlyList<Token> tokens, ExpressionNode expression) : StatementNode(tokens)
 {

src/Syntax/Parsing/Statements/StatementNode.cs

@@ -0,0 +1,5 @@
+using syntax.Tokenization;
+
+namespace syntax.Parsing.Statements;
+
+public abstract class StatementNode(IReadOnlyList<Token> tokens) : Node(tokens);

src/Syntax/Parsing/Statements/VariableAssignmentNode.cs

@@ -1,7 +1,7 @@
-using Nub.Lang.Syntax.Parsing.Expressions;
-using Nub.Lang.Syntax.Tokenization;
+using syntax.Parsing.Expressions;
+using syntax.Tokenization;
 
-namespace Nub.Lang.Syntax.Parsing.Statements;
+namespace syntax.Parsing.Statements;
 
 public class VariableAssignmentNode(IReadOnlyList<Token> tokens, IdentifierNode identifier, ExpressionNode value) : StatementNode(tokens)
 {

src/Syntax/Parsing/Statements/VariableDeclarationNode.cs

@@ -1,9 +1,9 @@
-using Nub.Lang.Common;
-using Nub.Lang.Syntax.Parsing.Expressions;
-using Nub.Lang.Syntax.Tokenization;
-using Nub.Lang.Syntax.Typing;
+using common;
+using syntax.Parsing.Expressions;
+using syntax.Tokenization;
+using syntax.Typing;
 
-namespace Nub.Lang.Syntax.Parsing.Statements;
+namespace syntax.Parsing.Statements;
 
 public class VariableDeclarationNode(IReadOnlyList<Token> tokens, string name, Optional<NubType> explicitType, Optional<ExpressionNode> value) : StatementNode(tokens)
 {

src/Syntax/Parsing/Statements/WhileNode.cs

@@ -1,7 +1,7 @@
-using Nub.Lang.Syntax.Parsing.Expressions;
-using Nub.Lang.Syntax.Tokenization;
+using syntax.Parsing.Expressions;
+using syntax.Tokenization;
 
-namespace Nub.Lang.Syntax.Parsing.Statements;
+namespace syntax.Parsing.Statements;
 
 public class WhileNode(IReadOnlyList<Token> tokens, ExpressionNode condition, BlockNode body) : StatementNode(tokens)
 {

src/Syntax/Source.cs

@@ -1,6 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 
-namespace Nub.Lang.Syntax;
+namespace syntax;
 
 /// <summary>
 /// Represents a location in source code with line and column information.

src/Syntax/Syntax.csproj

@@ -5,10 +5,11 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <IsAotCompatible>true</IsAotCompatible>
+        <RootNamespace>syntax</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\common\common.csproj" />
+      <ProjectReference Include="..\Common\Common.csproj" />
     </ItemGroup>
 
 </Project>

src/Syntax/Tokenization/DocumentationToken.cs

@@ -1,6 +1,4 @@
-using Nub.Lang.Common;
-
-namespace Nub.Lang.Syntax.Tokenization;
+namespace syntax.Tokenization;
 
 public class DocumentationToken(SourceSpan span, string documentation) : Token(span)
 {

src/Syntax/Tokenization/IdentifierToken.cs

@@ -1,6 +1,4 @@
-using Nub.Lang.Common;
-
-namespace Nub.Lang.Syntax.Tokenization;
+namespace syntax.Tokenization;
 
 public class IdentifierToken(SourceSpan span, string value) : Token(span)
 {

src/Syntax/Tokenization/LiteralToken.cs

@@ -1,6 +1,4 @@
-using Nub.Lang.Common;
-
-namespace Nub.Lang.Syntax.Tokenization;
+namespace syntax.Tokenization;
 
 public class LiteralToken(SourceSpan span, LiteralKind kind, string value) : Token(span)
 {

src/Syntax/Tokenization/ModifierToken.cs

@@ -1,6 +1,4 @@
-using Nub.Lang.Common;
-
-namespace Nub.Lang.Syntax.Tokenization;
+namespace syntax.Tokenization;
 
 public class ModifierToken(SourceSpan span, Modifier modifier) : Token(span)
 {

src/Syntax/Tokenization/SymbolToken.cs

@@ -1,6 +1,4 @@
-using Nub.Lang.Common;
-
-namespace Nub.Lang.Syntax.Tokenization;
+namespace syntax.Tokenization;
 
 public class SymbolToken(SourceSpan span, Symbol symbol) : Token(span)
 {

src/Syntax/Tokenization/Token.cs

@@ -1,6 +1,4 @@
-using Nub.Lang.Common;
-
-namespace Nub.Lang.Syntax.Tokenization;
+namespace syntax.Tokenization;
 
 public abstract class Token(SourceSpan span)
 {

src/Syntax/Tokenization/Tokenizer.cs

@@ -1,7 +1,7 @@
-using Nub.Lang.Common;
-using Nub.Lang.Syntax.Diagnostics;
+using common;
+using syntax.Diagnostics;
 
-namespace Nub.Lang.Syntax.Tokenization;
+namespace syntax.Tokenization;
 
 public static class Tokenizer
 {

src/Syntax/Typing/NubType.cs

@@ -1,6 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 
-namespace Nub.Lang.Syntax.Typing;
+namespace syntax.Typing;
 
 public abstract class NubType
 {

src/Syntax/Typing/TypeChecker.cs

@@ -1,12 +1,12 @@
 using System.Diagnostics;
-using Nub.Lang.Syntax.Diagnostics;
-using Nub.Lang.Syntax.Parsing;
-using Nub.Lang.Syntax.Parsing.Definitions;
-using Nub.Lang.Syntax.Parsing.Expressions;
-using Nub.Lang.Syntax.Parsing.Statements;
-using Nub.Lang.Syntax.Tokenization;
+using syntax.Diagnostics;
+using syntax.Parsing;
+using syntax.Parsing.Definitions;
+using syntax.Parsing.Expressions;
+using syntax.Parsing.Statements;
+using syntax.Tokenization;
 
-namespace Nub.Lang.Syntax.Typing;
+namespace syntax.Typing;
 
 public static class TypeChecker
 {

src/syntax/Parsing/Statements/BreakNode.cs

@@ -1,5 +0,0 @@
-using Nub.Lang.Syntax.Tokenization;
-
-namespace Nub.Lang.Syntax.Parsing.Statements;
-
-public class BreakNode(IReadOnlyList<Token> tokens) : StatementNode(tokens);

src/syntax/Parsing/Statements/ContinueNode.cs

@@ -1,5 +0,0 @@
-using Nub.Lang.Syntax.Tokenization;
-
-namespace Nub.Lang.Syntax.Parsing.Statements;
-
-public class ContinueNode(IReadOnlyList<Token> tokens) : StatementNode(tokens);

src/syntax/Parsing/Statements/StatementNode.cs

@@ -1,5 +0,0 @@
-using Nub.Lang.Syntax.Tokenization;
-
-namespace Nub.Lang.Syntax.Parsing.Statements;
-
-public abstract class StatementNode(IReadOnlyList<Token> tokens) : Node(tokens);