diff --git a/src/compiler/CLI/Program.cs b/src/compiler/CLI/Program.cs index 219aaf8..290edad 100644 --- a/src/compiler/CLI/Program.cs +++ b/src/compiler/CLI/Program.cs @@ -2,11 +2,11 @@ using CLI; using Generation.QBE; using Syntax; +using Syntax.Binding; using Syntax.Diagnostics; using Syntax.Parsing; using Syntax.Tokenization; -using Syntax.Typing; -using Binder = Syntax.Typing.Binder; +using Binder = Syntax.Binding.Binder; const string BIN_DIR = "bin"; const string INT_DIR = "bin-int"; diff --git a/src/compiler/Generation/QBE/QBEGenerator.cs b/src/compiler/Generation/QBE/QBEGenerator.cs index 17b580a..51bd144 100644 --- a/src/compiler/Generation/QBE/QBEGenerator.cs +++ b/src/compiler/Generation/QBE/QBEGenerator.cs @@ -3,9 +3,9 @@ using System.Diagnostics.CodeAnalysis; using System.Globalization; using System.Text; using Syntax; +using Syntax.Binding; using Syntax.Node; using Syntax.Tokenization; -using Syntax.Typing; namespace Generation.QBE; diff --git a/src/compiler/Syntax/Typing/Binder.cs b/src/compiler/Syntax/Binding/Binder.cs similarity index 99% rename from src/compiler/Syntax/Typing/Binder.cs rename to src/compiler/Syntax/Binding/Binder.cs index 19eec9e..1c20db2 100644 --- a/src/compiler/Syntax/Typing/Binder.cs +++ b/src/compiler/Syntax/Binding/Binder.cs @@ -5,7 +5,7 @@ using Syntax.Parsing; using Syntax.Tokenization; using UnaryExpressionNode = Syntax.Node.UnaryExpressionNode; -namespace Syntax.Typing; +namespace Syntax.Binding; // TODO: Currently anonymous function does not get a new scope public static class Binder diff --git a/src/compiler/Syntax/Typing/BoundSyntaxTree.cs b/src/compiler/Syntax/Binding/BoundSyntaxTree.cs similarity index 81% rename from src/compiler/Syntax/Typing/BoundSyntaxTree.cs rename to src/compiler/Syntax/Binding/BoundSyntaxTree.cs index 6e80811..37b9c39 100644 --- a/src/compiler/Syntax/Typing/BoundSyntaxTree.cs +++ b/src/compiler/Syntax/Binding/BoundSyntaxTree.cs @@ -1,5 +1,5 @@ using Syntax.Node; -namespace Syntax.Typing; +namespace Syntax.Binding; public record BoundSyntaxTree(string Namespace, List Definitions); diff --git a/src/compiler/Syntax/DefinitionTable.cs b/src/compiler/Syntax/DefinitionTable.cs index 75aa445..b5dfeca 100644 --- a/src/compiler/Syntax/DefinitionTable.cs +++ b/src/compiler/Syntax/DefinitionTable.cs @@ -1,7 +1,7 @@ using Common; +using Syntax.Binding; using Syntax.Node; using Syntax.Parsing; -using Syntax.Typing; namespace Syntax; diff --git a/src/compiler/Syntax/Node/Definition.cs b/src/compiler/Syntax/Node/Definition.cs index 732f667..e70ed0e 100644 --- a/src/compiler/Syntax/Node/Definition.cs +++ b/src/compiler/Syntax/Node/Definition.cs @@ -1,6 +1,5 @@ using Common; using Syntax.Tokenization; -using Syntax.Typing; namespace Syntax.Node; diff --git a/src/compiler/Syntax/Node/Expression.cs b/src/compiler/Syntax/Node/Expression.cs index 8f6945d..0e71aa4 100644 --- a/src/compiler/Syntax/Node/Expression.cs +++ b/src/compiler/Syntax/Node/Expression.cs @@ -1,6 +1,5 @@ using Common; using Syntax.Tokenization; -using Syntax.Typing; namespace Syntax.Node; diff --git a/src/compiler/Syntax/Node/Statement.cs b/src/compiler/Syntax/Node/Statement.cs index e216814..65981b2 100644 --- a/src/compiler/Syntax/Node/Statement.cs +++ b/src/compiler/Syntax/Node/Statement.cs @@ -1,6 +1,5 @@ using Common; using Syntax.Tokenization; -using Syntax.Typing; namespace Syntax.Node; diff --git a/src/compiler/Syntax/Typing/NubType.cs b/src/compiler/Syntax/NubType.cs similarity index 99% rename from src/compiler/Syntax/Typing/NubType.cs rename to src/compiler/Syntax/NubType.cs index f95c946..52f10d1 100644 --- a/src/compiler/Syntax/Typing/NubType.cs +++ b/src/compiler/Syntax/NubType.cs @@ -1,6 +1,6 @@ using System.Diagnostics.CodeAnalysis; -namespace Syntax.Typing; +namespace Syntax; public abstract class NubType : IEquatable { diff --git a/src/compiler/Syntax/Parsing/Parser.cs b/src/compiler/Syntax/Parsing/Parser.cs index 27c0ed1..69d4b21 100644 --- a/src/compiler/Syntax/Parsing/Parser.cs +++ b/src/compiler/Syntax/Parsing/Parser.cs @@ -3,7 +3,6 @@ using Common; using Syntax.Diagnostics; using Syntax.Node; using Syntax.Tokenization; -using Syntax.Typing; namespace Syntax.Parsing;