...

build.sh

@@ -1,2 +0,0 @@
-#!/bin/bash
-dotnet run --project src/Nub.Lang.CLI/ example

run.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+dotnet run --project src/Nub.Lang.CLI/ example
+./bin/out

src/Nub.Lang.CLI/Nub.Lang.CLI.csproj

@@ -10,7 +10,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\Nub.Lang\Nub.Lang.csproj" />
+      <ProjectReference Include="..\Nub.Lang.Generation\Nub.Lang.Generation.csproj" />
+      <ProjectReference Include="..\Nub.Lang.Syntax\Nub.Lang.Syntax.csproj" />
     </ItemGroup>
 
     <ItemGroup>

src/Nub.Lang.CLI/Program.cs

@@ -1,11 +1,11 @@
 using System.Diagnostics;
 using System.Reflection;
-using Nub.Lang;
-using Nub.Lang.Frontend;
-using Nub.Lang.Frontend.Generation;
-using Nub.Lang.Frontend.Lexing;
-using Nub.Lang.Frontend.Parsing;
-using Nub.Lang.Frontend.Typing;
+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;
 
 const string BIN_DIR = "bin";
 const string BIN_INT_DIR = "bin-int";
@@ -48,7 +48,7 @@ foreach (var file in Directory.EnumerateFiles(srcDir, "*.nub", SearchOption.AllD
     var content = File.ReadAllText(file);
 
     var sourceText = new SourceText(file, content);
-    var tokenizeResult = Lexer.Tokenize(sourceText);
+    var tokenizeResult = Tokenizer.Tokenize(sourceText);
     tokenizeResult.PrintAllDiagnostics();
     error = error || tokenizeResult.HasErrors;
 
@@ -96,12 +96,10 @@ foreach (var compilationUnit in compilationUnits)
         
         var asmPath = Path.Combine(BIN_INT_DIR, $"{baseOutputName}.s");
         await File.WriteAllTextAsync(asmPath, assemblyCode);
-        Console.Out.WriteLine($"Generated: {asmPath}");
 
         var objPath = Path.Combine(BIN_INT_DIR, $"{baseOutputName}.o");
         await InvokeAssembler(asmPath, objPath);
         objectFiles.Add(objPath);
-        Console.Out.WriteLine($"Assembled: {objPath}");
     }
     catch (Exception ex)
     {
@@ -135,7 +133,6 @@ foreach (var resourceName in runtimeResources)
 
         await InvokeAssembler(asmPath, objPath);
         objectFiles.Add(objPath);
-        Console.Out.WriteLine($"Runtime assembled: {objPath}");
 
         File.Delete(asmPath);
     }
@@ -150,7 +147,6 @@ try
 {
     var outputPath = Path.Combine(BIN_DIR, "out");
     await InvokeLinker(objectFiles, outputPath);
-    Console.Out.WriteLine($"Linked executable: {outputPath}");
 }
 catch (Exception ex)
 {

src/Nub.Lang.Common/Nub.Lang.Common.csproj

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

src/Nub.Lang.Common/Optional.cs

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

src/Nub.Lang.Common/Variant.cs

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

src/Nub.Lang.Generation/Nub.Lang.Generation.csproj

@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net9.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\Nub.Lang.Common\Nub.Lang.Common.csproj" />
+      <ProjectReference Include="..\Nub.Lang.Syntax\Nub.Lang.Syntax.csproj" />
+    </ItemGroup>
+
+</Project>

src/Nub.Lang.Generation/QBE/QBEGenerator.cs

@@ -1,14 +1,15 @@
 using System.Diagnostics;
 using System.Globalization;
 using System.Text;
-using Nub.Lang.Frontend.Lexing;
-using Nub.Lang.Frontend.Parsing;
-using Nub.Lang.Frontend.Parsing.Definitions;
-using Nub.Lang.Frontend.Parsing.Expressions;
-using Nub.Lang.Frontend.Parsing.Statements;
-using Nub.Lang.Frontend.Typing;
+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;
 
-namespace Nub.Lang.Frontend.Generation;
+namespace Nub.Lang.Generation.QBE;
 
 public static class QBEGenerator
 {

src/Nub.Lang.Syntax/DefinitionTable.cs

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

src/Nub.Lang.Syntax/Diagnostics/ConsoleColors.cs

@@ -1,8 +1,7 @@
 using System.Text;
-using Nub.Lang.Frontend.Lexing;
-using Nub.Lang.Frontend.Typing;
+using Nub.Lang.Syntax.Tokenization;
 
-namespace Nub.Lang.Diagnostics;
+namespace Nub.Lang.Syntax.Diagnostics;
 
 public static class ConsoleColors
 {
@@ -131,7 +130,7 @@ public static class ConsoleColors
     public static string ColorizeSource(string source)
     {
         var sourceText = new SourceText(string.Empty, source);
-        var tokens = Lexer.Tokenize(sourceText).Value;
+        var tokens = Tokenizer.Tokenize(sourceText).Value;
         var result = new StringBuilder();
         var lastCharIndex = 0;
 

src/Nub.Lang.Syntax/Diagnostics/Diagnostic.cs

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

src/Nub.Lang.Syntax/Diagnostics/DiagnosticsResult.cs

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

src/Nub.Lang.Syntax/Nub.Lang.Syntax.csproj

@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net9.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+        <IsAotCompatible>true</IsAotCompatible>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\Nub.Lang.Common\Nub.Lang.Common.csproj" />
+    </ItemGroup>
+
+</Project>

src/Nub.Lang.Syntax/Parsing/CompilationUnit.cs

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

src/Nub.Lang.Syntax/Parsing/Definitions/DefinitionNode.cs

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

src/Nub.Lang.Syntax/Parsing/Definitions/FuncDefinitionNode.cs

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

src/Nub.Lang.Syntax/Parsing/Definitions/StructDefinitionNode.cs

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

src/Nub.Lang.Syntax/Parsing/Expressions/AddressOfNode.cs

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

src/Nub.Lang.Syntax/Parsing/Expressions/AnonymousFuncNode.cs

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

src/Nub.Lang.Syntax/Parsing/Expressions/ArrayIndexAccessNode.cs

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

src/Nub.Lang.Syntax/Parsing/Expressions/ArrayInitializerNode.cs

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

src/Nub.Lang.Syntax/Parsing/Expressions/BinaryExpressionNode.cs

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

src/Nub.Lang.Syntax/Parsing/Expressions/DereferenceNode.cs

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

src/Nub.Lang.Syntax/Parsing/Expressions/ExpressionNode.cs

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

src/Nub.Lang.Syntax/Parsing/Expressions/FixedArrayInitializerNode.cs

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

src/Nub.Lang.Syntax/Parsing/Expressions/FuncCallNode.cs

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

src/Nub.Lang.Syntax/Parsing/Expressions/IdentifierNode.cs

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

src/Nub.Lang.Syntax/Parsing/Expressions/LiteralNode.cs

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

src/Nub.Lang.Syntax/Parsing/Expressions/MemberAccessNode.cs

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

src/Nub.Lang.Syntax/Parsing/Expressions/StructInitializerNode.cs

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

src/Nub.Lang.Syntax/Parsing/Expressions/UnaryExpressionNode.cs

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

src/Nub.Lang.Syntax/Parsing/Node.cs

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

src/Nub.Lang.Syntax/Parsing/Parser.cs

@@ -1,13 +1,14 @@
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
-using Nub.Lang.Diagnostics;
-using Nub.Lang.Frontend.Lexing;
-using Nub.Lang.Frontend.Parsing.Definitions;
-using Nub.Lang.Frontend.Parsing.Expressions;
-using Nub.Lang.Frontend.Parsing.Statements;
-using Nub.Lang.Frontend.Typing;
+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;
 
-namespace Nub.Lang.Frontend.Parsing;
+namespace Nub.Lang.Syntax.Parsing;
 
 public static class Parser
 {

src/Nub.Lang.Syntax/Parsing/Statements/ArrayIndexAssignmentNode.cs

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

src/Nub.Lang.Syntax/Parsing/Statements/BlockNode.cs

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

src/Nub.Lang.Syntax/Parsing/Statements/BreakNode.cs

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

src/Nub.Lang.Syntax/Parsing/Statements/ContinueNode.cs

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

src/Nub.Lang.Syntax/Parsing/Statements/DereferenceAssignmentNode.cs

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

src/Nub.Lang.Syntax/Parsing/Statements/IfNode.cs

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

src/Nub.Lang.Syntax/Parsing/Statements/MemberAssignmentNode.cs

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

src/Nub.Lang.Syntax/Parsing/Statements/ReturnNode.cs

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

src/Nub.Lang.Syntax/Parsing/Statements/StatementExpressionNode.cs

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

src/Nub.Lang.Syntax/Parsing/Statements/StatementNode.cs

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

src/Nub.Lang.Syntax/Parsing/Statements/VariableAssignmentNode.cs

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

src/Nub.Lang.Syntax/Parsing/Statements/VariableDeclarationNode.cs

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

src/Nub.Lang.Syntax/Parsing/Statements/WhileNode.cs

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

src/Nub.Lang.Syntax/Source.cs

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

src/Nub.Lang.Syntax/Tokenization/DocumentationToken.cs

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

src/Nub.Lang.Syntax/Tokenization/IdentifierToken.cs

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

src/Nub.Lang.Syntax/Tokenization/LiteralToken.cs

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

src/Nub.Lang.Syntax/Tokenization/ModifierToken.cs

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

src/Nub.Lang.Syntax/Tokenization/SymbolToken.cs

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

src/Nub.Lang.Syntax/Tokenization/Token.cs

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

src/Nub.Lang.Syntax/Tokenization/Tokenizer.cs

@@ -1,8 +1,9 @@
-using Nub.Lang.Diagnostics;
+using Nub.Lang.Common;
+using Nub.Lang.Syntax.Diagnostics;
 
-namespace Nub.Lang.Frontend.Lexing;
+namespace Nub.Lang.Syntax.Tokenization;
 
-public static class Lexer
+public static class Tokenizer
 {
     private static readonly Dictionary<string, Symbol> Keywords = new()
     {

src/Nub.Lang.Syntax/Typing/NubType.cs

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

src/Nub.Lang.Syntax/Typing/TypeChecker.cs

@@ -1,12 +1,12 @@
 using System.Diagnostics;
-using Nub.Lang.Diagnostics;
-using Nub.Lang.Frontend.Lexing;
-using Nub.Lang.Frontend.Parsing;
-using Nub.Lang.Frontend.Parsing.Definitions;
-using Nub.Lang.Frontend.Parsing.Expressions;
-using Nub.Lang.Frontend.Parsing.Statements;
+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;
 
-namespace Nub.Lang.Frontend.Typing;
+namespace Nub.Lang.Syntax.Typing;
 
 public static class TypeChecker
 {

src/Nub.Lang.sln

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

src/Nub.Lang/Frontend/Parsing/Statements/BreakNode.cs

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

src/Nub.Lang/Frontend/Parsing/Statements/ContinueNode.cs

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

src/Nub.Lang/Frontend/Parsing/Statements/StatementNode.cs

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