diff --git a/src/core/core.csproj b/src/Core/CsMic.Core.csproj similarity index 74% rename from src/core/core.csproj rename to src/Core/CsMic.Core.csproj index 9ddca4e..f6c72b7 100644 --- a/src/core/core.csproj +++ b/src/Core/CsMic.Core.csproj @@ -2,16 +2,17 @@ net9.0 - cs_mic.core + CsMic enable enable False + CsMic.Core 2.0.0-beta-01 - cs-mic + CsMic - + diff --git a/src/core/FunctionArgument.cs b/src/Core/FunctionArgument.cs similarity index 96% rename from src/core/FunctionArgument.cs rename to src/Core/FunctionArgument.cs index 103223f..86e9d93 100644 --- a/src/core/FunctionArgument.cs +++ b/src/Core/FunctionArgument.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace csmic +namespace CsMic { public class FunctionArgument { diff --git a/src/core/FunctionValue.cs b/src/Core/FunctionValue.cs similarity index 97% rename from src/core/FunctionValue.cs rename to src/Core/FunctionValue.cs index f5b396e..8f7398f 100644 --- a/src/core/FunctionValue.cs +++ b/src/Core/FunctionValue.cs @@ -1,11 +1,11 @@ -using csmic; +using CsMic; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace csmic +namespace CsMic { public class FunctionValue { diff --git a/src/core/FunctionValueType.cs b/src/Core/FunctionValueType.cs similarity index 93% rename from src/core/FunctionValueType.cs rename to src/Core/FunctionValueType.cs index 5d3c9c0..9a8f140 100644 --- a/src/core/FunctionValueType.cs +++ b/src/Core/FunctionValueType.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace csmic +namespace CsMic { public enum FunctionValueType { diff --git a/src/core/ICodedFunction.cs b/src/Core/ICodedFunction.cs similarity index 96% rename from src/core/ICodedFunction.cs rename to src/Core/ICodedFunction.cs index b5df526..d7642bd 100644 --- a/src/core/ICodedFunction.cs +++ b/src/Core/ICodedFunction.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace csmic +namespace CsMic { public interface ICodedFunction { diff --git a/src/core/InputInterpreter.cs b/src/Core/InputInterpreter.cs similarity index 95% rename from src/core/InputInterpreter.cs rename to src/Core/InputInterpreter.cs index a306ac1..d3a8533 100644 --- a/src/core/InputInterpreter.cs +++ b/src/Core/InputInterpreter.cs @@ -2,7 +2,7 @@ using System.Text; using System.IO; -namespace csmic +namespace CsMic { public class InputInterpreter { @@ -122,8 +122,8 @@ namespace csmic // Create a child interpreter sharing stores, so ProduceOutput doesn't affect parent state var child = new InputInterpreter(this); using var ms = new MemoryStream(Encoding.UTF8.GetBytes(expressionText)); - var scanner = new csmic.Interpreter.Scanner(ms); - var parser = new csmic.Interpreter.Parser(scanner) + var scanner = new CsMic.Interpreter.Scanner(ms); + var parser = new CsMic.Interpreter.Parser(scanner) { Interpreter = child }; @@ -138,8 +138,8 @@ namespace csmic try { using var ms = new MemoryStream(Encoding.UTF8.GetBytes(input ?? string.Empty)); - var scanner = new csmic.Interpreter.Scanner(ms); - var parser = new csmic.Interpreter.Parser(scanner) + var scanner = new CsMic.Interpreter.Scanner(ms); + var parser = new CsMic.Interpreter.Parser(scanner) { Interpreter = this }; diff --git a/src/core/NuGetPublish.targets b/src/Core/NuGetPublish.targets similarity index 85% rename from src/core/NuGetPublish.targets rename to src/Core/NuGetPublish.targets index 4feeb24..1b90dd3 100644 --- a/src/core/NuGetPublish.targets +++ b/src/Core/NuGetPublish.targets @@ -1,6 +1,6 @@  - + - \ No newline at end of file + diff --git a/src/core/Variable.cs b/src/Core/Variable.cs similarity index 95% rename from src/core/Variable.cs rename to src/Core/Variable.cs index 166d4fb..4a57322 100644 --- a/src/core/Variable.cs +++ b/src/Core/Variable.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace cs_mic.core +namespace CsMic { public class Variable { diff --git a/src/core/VariableType.cs b/src/Core/VariableType.cs similarity index 91% rename from src/core/VariableType.cs rename to src/Core/VariableType.cs index 4061f70..06f16be 100644 --- a/src/core/VariableType.cs +++ b/src/Core/VariableType.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace cs_mic.core +namespace CsMic { public enum VariableType { diff --git a/src/core/cocor/Interpreter.atg b/src/Core/cocor/Interpreter.atg similarity index 99% rename from src/core/cocor/Interpreter.atg rename to src/Core/cocor/Interpreter.atg index 67ba9c3..b44a7d6 100644 --- a/src/core/cocor/Interpreter.atg +++ b/src/Core/cocor/Interpreter.atg @@ -2,7 +2,7 @@ using System.Globalization; using System.Text; using System.Collections.Generic; -using csmic; +using CsMic; COMPILER INTERPRETER diff --git a/src/core/cocor/Parser.frame b/src/Core/cocor/Parser.frame similarity index 100% rename from src/core/cocor/Parser.frame rename to src/Core/cocor/Parser.frame diff --git a/src/core/cocor/Scanner.frame b/src/Core/cocor/Scanner.frame similarity index 100% rename from src/core/cocor/Scanner.frame rename to src/Core/cocor/Scanner.frame diff --git a/src/cs-mic.sln b/src/CsMic.sln similarity index 81% rename from src/cs-mic.sln rename to src/CsMic.sln index e021e8e..ce873a4 100644 --- a/src/cs-mic.sln +++ b/src/CsMic.sln @@ -1,18 +1,17 @@ - Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.12.35707.178 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "core", "core\core.csproj", "{5387FF55-3044-4EB4-BB90-AD2E922131C1}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CsMic.Core", "Core\CsMic.Core.csproj", "{5387FF55-3044-4EB4-BB90-AD2E922131C1}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{6394EDF0-24F7-4B75-B4CE-E5F884EE88AC}" ProjectSection(SolutionItems) = preProject setup.ps1 = setup.ps1 EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "tests", "tests\tests.csproj", "{F356A0E2-1338-43FE-B4C0-1AE7C9F0685F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CsMic.Tests", "Tests\CsMic.Tests.csproj", "{F356A0E2-1338-43FE-B4C0-1AE7C9F0685F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "stdlib", "stdlib\stdlib.csproj", "{F7AD600D-4247-49CE-9A26-B20C6F2FF6AE}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CsMic.StandardLibrary", "StandardLibrary\CsMic.StandardLibrary.csproj", "{F7AD600D-4247-49CE-9A26-B20C6F2FF6AE}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/stdlib/Constants.cs b/src/StandardLibrary/Constants.cs similarity index 94% rename from src/stdlib/Constants.cs rename to src/StandardLibrary/Constants.cs index c599ae1..a458182 100644 --- a/src/stdlib/Constants.cs +++ b/src/StandardLibrary/Constants.cs @@ -1,4 +1,6 @@ -namespace csmic.stdlib +using CsMic; + +namespace CsMic.StandardLibrary { public static class Constants { diff --git a/src/stdlib/stdlib.csproj b/src/StandardLibrary/CsMic.StandardLibrary.csproj similarity index 64% rename from src/stdlib/stdlib.csproj rename to src/StandardLibrary/CsMic.StandardLibrary.csproj index 302b8c2..3931d94 100644 --- a/src/stdlib/stdlib.csproj +++ b/src/StandardLibrary/CsMic.StandardLibrary.csproj @@ -2,12 +2,14 @@ net9.0 + CsMic.StandardLibrary + CsMic.StandardLibrary enable enable - + diff --git a/src/stdlib/Functions.cs b/src/StandardLibrary/Functions.cs similarity index 88% rename from src/stdlib/Functions.cs rename to src/StandardLibrary/Functions.cs index 75b64c5..00a077b 100644 --- a/src/stdlib/Functions.cs +++ b/src/StandardLibrary/Functions.cs @@ -1,12 +1,12 @@ -using csmic; -using stdlib.functions; +using CsMic; +using CsMic.StandardLibrary.Functions; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace stdlib +namespace CsMic.StandardLibrary { public static class Functions { diff --git a/src/stdlib/functions/AbsoluteValue.cs b/src/StandardLibrary/functions/AbsoluteValue.cs similarity index 87% rename from src/stdlib/functions/AbsoluteValue.cs rename to src/StandardLibrary/functions/AbsoluteValue.cs index 61e2d08..141c6e2 100644 --- a/src/stdlib/functions/AbsoluteValue.cs +++ b/src/StandardLibrary/functions/AbsoluteValue.cs @@ -1,7 +1,7 @@ -using csmic; -using FunctionValueType = csmic.FunctionValueType; +using CsMic; +using FunctionValueType = CsMic.FunctionValueType; -namespace stdlib.functions +namespace CsMic.StandardLibrary.Functions { public class AbsoluteValue : FunctionBase, ICodedFunction { diff --git a/src/stdlib/functions/FunctionBase.cs b/src/StandardLibrary/functions/FunctionBase.cs similarity index 94% rename from src/stdlib/functions/FunctionBase.cs rename to src/StandardLibrary/functions/FunctionBase.cs index 338d2d7..94ce5ec 100644 --- a/src/stdlib/functions/FunctionBase.cs +++ b/src/StandardLibrary/functions/FunctionBase.cs @@ -1,7 +1,7 @@ -using csmic; -using FunctionValueType = csmic.FunctionValueType; +using CsMic; +using FunctionValueType = CsMic.FunctionValueType; -namespace stdlib.functions +namespace CsMic.StandardLibrary.Functions { public abstract class FunctionBase { diff --git a/src/stdlib/functions/Max.cs b/src/StandardLibrary/functions/Max.cs similarity index 95% rename from src/stdlib/functions/Max.cs rename to src/StandardLibrary/functions/Max.cs index be1ddaf..2d44115 100644 --- a/src/stdlib/functions/Max.cs +++ b/src/StandardLibrary/functions/Max.cs @@ -1,11 +1,11 @@ -using csmic; +using CsMic; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace stdlib.functions +namespace CsMic.StandardLibrary.Functions { public class Max : FunctionBase, ICodedFunction { diff --git a/src/stdlib/functions/Min.cs b/src/StandardLibrary/functions/Min.cs similarity index 95% rename from src/stdlib/functions/Min.cs rename to src/StandardLibrary/functions/Min.cs index 94d2faf..e4d4e7e 100644 --- a/src/stdlib/functions/Min.cs +++ b/src/StandardLibrary/functions/Min.cs @@ -1,11 +1,11 @@ -using csmic; +using CsMic; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace stdlib.functions +namespace CsMic.StandardLibrary.Functions { public class Min : FunctionBase, ICodedFunction { diff --git a/src/stdlib/functions/Sign.cs b/src/StandardLibrary/functions/Sign.cs similarity index 89% rename from src/stdlib/functions/Sign.cs rename to src/StandardLibrary/functions/Sign.cs index c1910d9..4b02a9d 100644 --- a/src/stdlib/functions/Sign.cs +++ b/src/StandardLibrary/functions/Sign.cs @@ -1,7 +1,7 @@ -using csmic; -using FunctionValueType = csmic.FunctionValueType; +using CsMic; +using FunctionValueType = CsMic.FunctionValueType; -namespace stdlib.functions +namespace CsMic.StandardLibrary.Functions { public class Sign : FunctionBase, ICodedFunction { diff --git a/src/tests/tests.csproj b/src/Tests/CsMic.Tests.csproj similarity index 76% rename from src/tests/tests.csproj rename to src/Tests/CsMic.Tests.csproj index 390ce9d..79d7625 100644 --- a/src/tests/tests.csproj +++ b/src/Tests/CsMic.Tests.csproj @@ -6,6 +6,8 @@ enable enable false + CsMic.Tests + CsMic.Tests @@ -17,8 +19,8 @@ - - + + diff --git a/src/tests/InputInterpreterTests.cs b/src/Tests/InputInterpreterTests.cs similarity index 99% rename from src/tests/InputInterpreterTests.cs rename to src/Tests/InputInterpreterTests.cs index 2622526..18ec19b 100644 --- a/src/tests/InputInterpreterTests.cs +++ b/src/Tests/InputInterpreterTests.cs @@ -1,7 +1,7 @@ using System.Globalization; -using csmic; +using CsMic; -namespace tests; +namespace CsMic.Tests; public class InputInterpreterTests { diff --git a/src/tests/StdlibFunctionsTests.cs b/src/Tests/StdlibFunctionsTests.cs similarity index 97% rename from src/tests/StdlibFunctionsTests.cs rename to src/Tests/StdlibFunctionsTests.cs index b006d70..40685cf 100644 --- a/src/tests/StdlibFunctionsTests.cs +++ b/src/Tests/StdlibFunctionsTests.cs @@ -1,12 +1,11 @@ -using csmic; -using csmic.stdlib; +using CsMic; +using CsMic.StandardLibrary; using NUnit.Framework; -using stdlib; -using stdlib.functions; +using CsMic.StandardLibrary.Functions; using System.Globalization; using System.Reflection.Metadata; -namespace tests; +namespace CsMic.Tests; public class StdlibFunctionsTests {