Rename Interpreter namespaces and projects to Engine

NTERA.Compiler/Compiler.cs

@@ -5,8 +5,8 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using NTERA.Interpreter;
-using NTERA.Interpreter.Compiler;
+using NTERA.Engine;
+using NTERA.Engine.Compiler;
 
 namespace NTERA.Compiler
 {

NTERA.Compiler/HTMLWriter.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
-using NTERA.Interpreter.Compiler;
+using NTERA.Engine.Compiler;
 
 namespace NTERA.Compiler
 {

NTERA.Compiler/NTERA.Compiler.csproj

@@ -53,17 +53,17 @@
     <None Include="App.config" />
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\NTERA.Interpreter\NTERA.Interpreter.csproj">
-      <Project>{f3b58ef3-e3ff-4b76-92b8-2ab87663fc4d}</Project>
-      <Name>NTERA.Interpreter</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <Content Include="FodyWeavers.xml">
       <SubType>Designer</SubType>
     </Content>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\NTERA.Engine\NTERA.Engine.csproj">
+      <Project>{f3b58ef3-e3ff-4b76-92b8-2ab87663fc4d}</Project>
+      <Name>NTERA.Engine</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>

NTERA.Compiler/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("NTERA.Compiler")]
-[assembly: AssemblyCopyright("Copyright ©  2018")]
+[assembly: AssemblyCopyright("Copyright © Bepis 2018")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("0.1.0.0")]
+[assembly: AssemblyFileVersion("0.1.0.0")]

NTERA.Engine.Tests/Common.cs

@@ -0,0 +1,7 @@
+namespace NTERA.Engine.Tests
+{
+    public static class Common
+    {
+
+    }
+}

NTERA.Engine.Tests/KeywordTests.cs

@@ -0,0 +1,10 @@
+using NUnit.Framework;
+
+namespace NTERA.Engine.Tests
+{
+	[TestFixture]
+	public class KeywordTests
+	{
+
+	}
+}

NTERA.Interpreter.Tests/NTERA.Interpreter.Tests.csproj → NTERA.Engine.Tests/NTERA.Engine.Tests.csproj

@@ -8,8 +8,8 @@
     <ProjectGuid>{F55AC007-A763-4869-9529-4324CF28A9DE}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>NTERA.Interpreter.Tests</RootNamespace>
-    <AssemblyName>NTERA.Interpreter.Tests</AssemblyName>
+    <RootNamespace>NTERA.Engine.Tests</RootNamespace>
+    <AssemblyName>NTERA.Engine.Tests</AssemblyName>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -84,10 +84,6 @@
       <Project>{62A2B84E-9207-46B0-8A8D-28B5931FCB6E}</Project>
       <Name>NTERA.Core</Name>
     </ProjectReference>
-    <ProjectReference Include="..\NTERA.Interpreter\NTERA.Interpreter.csproj">
-      <Project>{F3B58EF3-E3FF-4B76-92B8-2AB87663FC4D}</Project>
-      <Name>NTERA.Interpreter</Name>
-    </ProjectReference>
   </ItemGroup>
   <Choose>
     <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">

NTERA.Interpreter.Tests/Properties/AssemblyInfo.cs → NTERA.Engine.Tests/Properties/AssemblyInfo.cs

@@ -5,12 +5,12 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("NTERA.Interpreter.Tests")]
+[assembly: AssemblyTitle("NTERA.Engine.Tests")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("NTERA.Interpreter.Tests")]
-[assembly: AssemblyCopyright("Copyright ©  2018")]
+[assembly: AssemblyProduct("NTERA.Engine.Tests")]
+[assembly: AssemblyCopyright("Copyright © Bepis 2018")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

NTERA.Interpreter/Attributes.cs → NTERA.Engine/Attributes.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace NTERA.Interpreter
+namespace NTERA.Engine
 {
 	[AttributeUsage(AttributeTargets.Field, AllowMultiple = true)]
 	public class LexerCharacterAttribute : Attribute

NTERA.Interpreter/Compiler/CSVDefinition.cs → NTERA.Engine/Compiler/CSVDefinition.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace NTERA.Interpreter.Compiler
+namespace NTERA.Engine.Compiler
 {
 	public class CSVDefinition
 	{

NTERA.Interpreter/Compiler/ExecutionNode.cs → NTERA.Engine/Compiler/ExecutionNode.cs

@@ -3,7 +3,7 @@ using System.Diagnostics;
 using System.Linq;
 using System.Xml;
 
-namespace NTERA.Interpreter.Compiler
+namespace NTERA.Engine.Compiler
 {
 	[DebuggerDisplay("{Type}")]
 	public class ExecutionNode

NTERA.Interpreter/Compiler/FunctionDefinition.cs → NTERA.Engine/Compiler/FunctionDefinition.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Diagnostics;
 
-namespace NTERA.Interpreter.Compiler
+namespace NTERA.Engine.Compiler
 {
 	[DebuggerDisplay("{Name} ({Parameters.Length})")]
 	public class FunctionDefinition

NTERA.Interpreter/Compiler/Keyword.cs → NTERA.Engine/Compiler/Keyword.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace NTERA.Interpreter.Compiler
+namespace NTERA.Engine.Compiler
 {
 	public class Keyword
 	{

NTERA.Interpreter/Compiler/Lexer.cs → NTERA.Engine/Compiler/Lexer.cs

@@ -5,7 +5,7 @@ using System.Globalization;
 using System.Text;
 using System.Text.RegularExpressions;
 
-namespace NTERA.Interpreter.Compiler
+namespace NTERA.Engine.Compiler
 {
 	public class Lexer : IEnumerable<Token>
 	{

NTERA.Interpreter/Compiler/Parser.cs → NTERA.Engine/Compiler/Parser.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace NTERA.Interpreter.Compiler
+namespace NTERA.Engine.Compiler
 {
 	public class Parser
 	{

NTERA.Interpreter/Compiler/ParserError.cs → NTERA.Engine/Compiler/ParserError.cs

@@ -1,4 +1,4 @@
-namespace NTERA.Interpreter.Compiler
+namespace NTERA.Engine.Compiler
 {
 	public class ParserError
 	{

NTERA.Interpreter/Compiler/ParserException.cs → NTERA.Engine/Compiler/ParserException.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace NTERA.Interpreter.Compiler
+namespace NTERA.Engine.Compiler
 {
 	public class ParserException : Exception
 	{

NTERA.Interpreter/Compiler/Preprocessor.cs → NTERA.Engine/Compiler/Preprocessor.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace NTERA.Interpreter.Compiler
+namespace NTERA.Engine.Compiler
 {
 	public static class Preprocessor
 	{

NTERA.Interpreter/Compiler/Token.cs → NTERA.Engine/Compiler/Token.cs

@@ -1,4 +1,4 @@
-namespace NTERA.Interpreter.Compiler
+namespace NTERA.Engine.Compiler
 {
 	public enum Token
 	{

NTERA.Interpreter/Marker.cs → NTERA.Engine/Marker.cs

@@ -1,4 +1,4 @@
-namespace NTERA.Interpreter
+namespace NTERA.Engine
 {
 	public struct Marker
 	{

NTERA.Interpreter/NTERA.Interpreter.csproj → NTERA.Engine/NTERA.Engine.csproj

@@ -7,8 +7,8 @@
     <ProjectGuid>{F3B58EF3-E3FF-4B76-92B8-2AB87663FC4D}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>NTERA.Interpreter</RootNamespace>
-    <AssemblyName>NTERA.Interpreter</AssemblyName>
+    <RootNamespace>NTERA.Engine</RootNamespace>
+    <AssemblyName>NTERA.Engine</AssemblyName>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
@@ -63,7 +63,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Interpreter\" />
+    <Folder Include="Runtime\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

NTERA.Interpreter/Properties/AssemblyInfo.cs → NTERA.Engine/Properties/AssemblyInfo.cs

@@ -4,12 +4,12 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("NTERA.Interpereter")]
+[assembly: AssemblyTitle("NTERA.Engine")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("NTERA.Interpereter")]
-[assembly: AssemblyCopyright("Copyright ©  2018")]
+[assembly: AssemblyProduct("NTERA.Engine")]
+[assembly: AssemblyCopyright("Copyright © Bepis 2018")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

NTERA.Interpreter/Utility.cs → NTERA.Engine/Utility.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace NTERA.Interpreter
+namespace NTERA.Engine
 {
 	public static class Utility
 	{

NTERA.Interpreter/Value.cs → NTERA.Engine/Value.cs

@@ -1,7 +1,7 @@
 using System;
-using NTERA.Interpreter.Compiler;
+using NTERA.Engine.Compiler;
 
-namespace NTERA.Interpreter
+namespace NTERA.Engine
 {
 	public enum ValueType
 	{

NTERA.Interpreter/Variable.cs → NTERA.Engine/Variable.cs

@@ -1,4 +1,4 @@
-namespace NTERA.Interpreter
+namespace NTERA.Engine
 {
 	public class Variable
 	{

NTERA.Interpreter/VariableDictionary.cs → NTERA.Engine/VariableDictionary.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace NTERA.Interpreter
+namespace NTERA.Engine
 {
 	public class VariableDictionary : Dictionary<string, Dictionary<int, Value>>
 	{

NTERA.Interpreter.Tests/Common.cs

@@ -1,22 +0,0 @@
-using NTERA.Core;
-using NUnit.Framework;
-
-namespace NTERA.Interpreter.Tests
-{
-    public static class Common
-    {
-        public static void AssertLocal(Interpreter interpreter, double value)
-        {
-            Assert.AreEqual(value, interpreter.Variables["LOCAL"].Real);
-        }
-
-        public static Interpreter Run(string code, IConsole console = null)
-        {
-            Interpreter interpreter = new Interpreter(console, code);
-
-            interpreter.Exec();
-
-            return interpreter;
-        }
-    }
-}

NTERA.Interpreter.Tests/KeywordTests.cs

@@ -1,140 +0,0 @@
-using Moq;
-using NTERA.Core;
-using NUnit.Framework;
-
-namespace NTERA.Interpreter.Tests
-{
-    [TestFixture]
-    public class KeywordTests
-    {
-        #region Console
-
-        [TestCase("PRINTV")]
-        public void WriteV(string keyword)
-        {
-            var console = new Mock<IConsole>();
-
-            string code = $@"{keyword} 69";
-
-            Common.Run(code, console.Object);
-
-            console.Verify(x => x.Write("69"), Moq.Times.Once);
-        }
-        
-        [TestCase("PRINTFORM", "%LOCALS%")]
-        public void WriteS(string keyword, string operand)
-        {
-            var console = new Mock<IConsole>();
-
-            string code =
-                $@"LOCALS = big guy 4 u
-                  {keyword} {operand}";
-
-            Common.Run(code, console.Object);
-
-            console.Verify(x => x.Write("big guy 4 u"), Moq.Times.Once);
-        }
-
-        [TestCase("PRINT", "{LOCALS}", "{LOCALS}")]
-        [TestCase("PRINTFORMS", "\"TEXT\"", "TEXT")]
-        public void WriteLiteral(string keyword, string input, string output)
-        {
-            var console = new Mock<IConsole>();
-
-            string code = $"{keyword} {input}";
-
-            Common.Run(code, console.Object);
-            
-            console.Verify(x => x.Write(output), Moq.Times.Once);
-        }
-        
-        [TestCase("PRINTFORML", "{LOCALS}")]
-        public void Print(string keyword, string operand)
-        {
-            var console = new Mock<IConsole>();
-
-            string code =
-                $@"LOCALS = big guy 4 u
-                  {keyword} {operand}";
-
-            Common.Run(code, console.Object);
-
-            console.Verify(x => x.PrintSingleLine("big guy 4 u", false), Moq.Times.Once);
-        }
-
-        [Test]
-        public void PrintImg()
-        {
-            var console = new Mock<IConsole>();
-
-            Common.Run("PRINT_IMG image", console.Object);
-
-            console.Verify(x => x.PrintImg("image"), Moq.Times.Once);
-        }
-
-        [Test]
-        public void PrintButton()
-        {
-            var console = new Mock<IConsole>();
-
-            Common.Run("PRINTBUTTON \"button to press\", 50", console.Object);
-
-            console.Verify(x => x.PrintButton("button to press", 50), Moq.Times.Once);
-        }
-        
-        public void ClearLine(string keyword, string operand)
-        {
-            var console = new Mock<IConsole>();
-
-            string code =
-                  @"PRINT something
-                    CLEARLINE 1";
-
-            Common.Run(code, console.Object);
-
-            console.Verify(x => x.Write("something"), Moq.Times.Once);
-            console.Verify(x => x.deleteLine(1), Moq.Times.Once);
-        }
-
-        [Test]
-        public void DrawLine()
-        {
-            var console = new Mock<IConsole>();
-
-            Common.Run("DRAWLINE", console.Object);
-
-            console.Verify(x => x.PrintBar(), Moq.Times.Once);
-        }
-
-        [TestCase("-")]
-        [TestCase("=")]
-        [TestCase("━")]
-        public void DrawLineCustom(string character)
-        {
-            var console = new Mock<IConsole>();
-
-            Common.Run($"CUSTOMDRAWLINE {character}", console.Object);
-
-            console.Verify(x => x.printCustomBar(character), Moq.Times.Once);
-        }
-
-        #endregion
-
-        #region Arithmetic
-
-        [Test]
-
-        public void Times()
-        {
-            string code =
-                @"LOCAL = 5
-                  TIMES LOCAL, 1.5";
-
-            var interpreter = Common.Run(code);
-
-            Common.AssertLocal(interpreter, 7.5);
-        }
-
-        #endregion
-    }
-}

NTERA.sln

@@ -9,11 +9,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NTERA.EmuEra", "NTERA.EmuEr
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NTERA.Core", "NTERA.Core\NTERA.Core.csproj", "{62A2B84E-9207-46B0-8A8D-28B5931FCB6E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NTERA.Interpreter", "NTERA.Interpreter\NTERA.Interpreter.csproj", "{F3B58EF3-E3FF-4B76-92B8-2AB87663FC4D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NTERA.Compiler", "NTERA.Compiler\NTERA.Compiler.csproj", "{3E7BF6CC-3227-4C84-8D85-7ADA597288C1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NTERA.Interpreter.Tests", "NTERA.Interpreter.Tests\NTERA.Interpreter.Tests.csproj", "{F55AC007-A763-4869-9529-4324CF28A9DE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NTERA.Engine.Tests", "NTERA.Engine.Tests\NTERA.Engine.Tests.csproj", "{F55AC007-A763-4869-9529-4324CF28A9DE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NTERA.Compiler", "NTERA.Compiler\NTERA.Compiler.csproj", "{3E7BF6CC-3227-4C84-8D85-7ADA597288C1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NTERA.Engine", "NTERA.Engine\NTERA.Engine.csproj", "{F3B58EF3-E3FF-4B76-92B8-2AB87663FC4D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -33,18 +33,18 @@ Global
 		{62A2B84E-9207-46B0-8A8D-28B5931FCB6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{62A2B84E-9207-46B0-8A8D-28B5931FCB6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{62A2B84E-9207-46B0-8A8D-28B5931FCB6E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F3B58EF3-E3FF-4B76-92B8-2AB87663FC4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F3B58EF3-E3FF-4B76-92B8-2AB87663FC4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F3B58EF3-E3FF-4B76-92B8-2AB87663FC4D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F3B58EF3-E3FF-4B76-92B8-2AB87663FC4D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F55AC007-A763-4869-9529-4324CF28A9DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F55AC007-A763-4869-9529-4324CF28A9DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F55AC007-A763-4869-9529-4324CF28A9DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F55AC007-A763-4869-9529-4324CF28A9DE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3E7BF6CC-3227-4C84-8D85-7ADA597288C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3E7BF6CC-3227-4C84-8D85-7ADA597288C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3E7BF6CC-3227-4C84-8D85-7ADA597288C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3E7BF6CC-3227-4C84-8D85-7ADA597288C1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F55AC007-A763-4869-9529-4324CF28A9DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F55AC007-A763-4869-9529-4324CF28A9DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F55AC007-A763-4869-9529-4324CF28A9DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F55AC007-A763-4869-9529-4324CF28A9DE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F3B58EF3-E3FF-4B76-92B8-2AB87663FC4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F3B58EF3-E3FF-4B76-92B8-2AB87663FC4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F3B58EF3-E3FF-4B76-92B8-2AB87663FC4D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F3B58EF3-E3FF-4B76-92B8-2AB87663FC4D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

NTERA/NTERA.csproj

@@ -105,9 +105,9 @@
       <Project>{8cdf43e9-301c-42aa-b752-ff42fa10dd6f}</Project>
       <Name>NTERA.EmuEra</Name>
     </ProjectReference>
-    <ProjectReference Include="..\NTERA.Interpreter\NTERA.Interpreter.csproj">
-      <Project>{F3B58EF3-E3FF-4B76-92B8-2AB87663FC4D}</Project>
-      <Name>NTERA.Interpreter</Name>
+    <ProjectReference Include="..\NTERA.Engine\NTERA.Engine.csproj">
+      <Project>{f3b58ef3-e3ff-4b76-92b8-2ab87663fc4d}</Project>
+      <Name>NTERA.Engine</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

NTERA/formMain.cs

@@ -3,7 +3,7 @@ using System.Windows.Forms;
 using NTERA.Console;
 using NTERA.Core;
 using NTERA.EmuEra;
-using NTERA.Interpreter;
+using NTERA.Engine;
 
 namespace NTERA
 {