Separation

ZPyrolink · ZPyrolink · commit 029662bde364 · 2021-04-02T19:41:53.000+02:00
Separation of the application and the library
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <PropertyGroup>
+    <LangVersion>latestMajor</LangVersion>
+  </PropertyGroup>
+</Project>
diff --git a/EvalFinale.sln b/EvalFinale.sln
@@ -5,6 +5,8 @@ VisualStudioVersion = 16.0.30907.101
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EvalFinale", "EvalFinale\EvalFinale.csproj", "{93543486-2D7B-40BA-B266-16CF59E9277B}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TranslatorLibrary", "TranslatorLibrary\TranslatorLibrary.csproj", "{015A118B-0F9F-4883-8770-5EACA35E011F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -15,6 +17,10 @@ Global
 		{93543486-2D7B-40BA-B266-16CF59E9277B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{93543486-2D7B-40BA-B266-16CF59E9277B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{93543486-2D7B-40BA-B266-16CF59E9277B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{015A118B-0F9F-4883-8770-5EACA35E011F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{015A118B-0F9F-4883-8770-5EACA35E011F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{015A118B-0F9F-4883-8770-5EACA35E011F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{015A118B-0F9F-4883-8770-5EACA35E011F}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/EvalFinale/Analyzer/ILanguage.cs b/EvalFinale/Analyzer/ILanguage.cs
diff --git a/EvalFinale/EvalFinale.csproj b/EvalFinale/EvalFinale.csproj
@@ -12,7 +12,6 @@
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
-    <LangVersion>latestMajor</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -47,23 +46,21 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Analyzer\Analyze.cs" />
-    <Compile Include="Analyzer\ILanguage.cs" />
-    <Compile Include="Grammar\Rule.cs" />
-    <Compile Include="Grammar\Symbol.cs" />
-    <Compile Include="Analyzer\Node.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Traductor.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="bin\Debug\Traduction.xml" />
     <Content Include="bin\Release\Traduction.xml" />
-    <Content Include="Traduction.xml" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <ProjectReference Include="..\TranslatorLibrary\TranslatorLibrary.csproj">
+      <Project>{015a118b-0f9f-4883-8770-5eaca35e011f}</Project>
+      <Name>TranslatorLibrary</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/EvalFinale/Program.cs b/EvalFinale/Program.cs
@@ -1,8 +1,9 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Linq;
-using EvalFinale.Analyzer;
-using EvalFinale.Grammar;
+using TranslatorLibrary;
+using TranslatorLibrary.Analyzer;
+using TranslatorLibrary.Grammar;
 using XmlJsonManager.Xml;
 
 namespace EvalFinale
diff --git a/TranslatorLibrary/Analyzer/Analyze.cs b/TranslatorLibrary/Analyzer/Analyze.cs
@@ -1,11 +1,10 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Linq;
-using EvalFinale.Grammar;
+using TranslatorLibrary.Grammar;
+using static TranslatorLibrary.Traductor;
 
-using static EvalFinale.Traductor;
-
-namespace EvalFinale.Analyzer
+namespace TranslatorLibrary.Analyzer
 {
     public static class Analyze
     {
diff --git a/TranslatorLibrary/Analyzer/ILanguage.cs b/TranslatorLibrary/Analyzer/ILanguage.cs
@@ -0,0 +1,10 @@
+﻿using System.Collections.Generic;
+
+namespace TranslatorLibrary.Analyzer
+{
+    public interface ILanguage
+    {
+        (List<string>, List<string>) LexicalAnalysis(string code);
+
+    }
+}
diff --git a/TranslatorLibrary/Analyzer/Node.cs b/TranslatorLibrary/Analyzer/Node.cs
@@ -1,7 +1,7 @@
 ﻿using System.Collections.Generic;
-using EvalFinale.Grammar;
+using TranslatorLibrary.Grammar;
 
-namespace EvalFinale.Analyzer
+namespace TranslatorLibrary.Analyzer
 {
     public class Node
     {
diff --git a/TranslatorLibrary/Grammar/Rule.cs b/TranslatorLibrary/Grammar/Rule.cs
@@ -1,4 +1,4 @@
-﻿namespace EvalFinale.Grammar
+﻿namespace TranslatorLibrary.Grammar
 {
     public class Rule
     {
diff --git a/TranslatorLibrary/Grammar/Symbol.cs b/TranslatorLibrary/Grammar/Symbol.cs
@@ -1,4 +1,4 @@
-﻿namespace EvalFinale.Grammar
+﻿namespace TranslatorLibrary.Grammar
 {
     public class Symbol
     {
diff --git a/TranslatorLibrary/Properties/AssemblyInfo.cs b/TranslatorLibrary/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+﻿using System.Reflection;
+using System.Runtime.CompilerServices;
+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("TranslatorLibrary")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("TranslatorLibrary")]
+[assembly: AssemblyCopyright("Copyright ©  2021")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("015a118b-0f9f-4883-8770-5eaca35e011f")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version
+//      Build Number
+//      Revision
+//
+// 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")]
diff --git a/TranslatorLibrary/Traduction.xml b/TranslatorLibrary/Traduction.xml
diff --git a/TranslatorLibrary/Traductor.cs b/TranslatorLibrary/Traductor.cs
@@ -1,9 +1,9 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Linq;
-using EvalFinale.Analyzer;
+using TranslatorLibrary.Analyzer;
 
-namespace EvalFinale
+namespace TranslatorLibrary
 {
     public static class Traductor
     {
diff --git a/TranslatorLibrary/TranslatorLibrary.csproj b/TranslatorLibrary/TranslatorLibrary.csproj
@@ -0,0 +1,56 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{015A118B-0F9F-4883-8770-5EACA35E011F}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>TranslatorLibrary</RootNamespace>
+    <AssemblyName>TranslatorLibrary</AssemblyName>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <Deterministic>true</Deterministic>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Analyzer\Analyze.cs" />
+    <Compile Include="Analyzer\ILanguage.cs" />
+    <Compile Include="Analyzer\Node.cs" />
+    <Compile Include="Grammar\Rule.cs" />
+    <Compile Include="Grammar\Symbol.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Traductor.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Traduction.xml" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,10 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using System.Linq;`
`4`		`-using EvalFinale.Grammar;`
	`4`	`+using TranslatorLibrary.Grammar;`
	`5`	`+using static TranslatorLibrary.Traductor;`
`5`	`6`
`6`		`-using static EvalFinale.Traductor;`
`7`		`-`
`8`		`-namespace EvalFinale.Analyzer`
	`7`	`+namespace TranslatorLibrary.Analyzer`
`9`	`8`	`{`
`10`	`9`	`public static class Analyze`
`11`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using System.Collections.Generic;`
`2`		`-using EvalFinale.Grammar;`
	`2`	`+using TranslatorLibrary.Grammar;`
`3`	`3`
`4`		`-namespace EvalFinale.Analyzer`
	`4`	`+namespace TranslatorLibrary.Analyzer`
`5`	`5`	`{`
`6`	`6`	`public class Node`
`7`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace EvalFinale.Grammar`
	`1`	`+namespace TranslatorLibrary.Grammar`
`2`	`2`	`{`
`3`	`3`	`public class Rule`
`4`	`4`	`{`