refactor: move QuantumParser out of View

mnm-team · Feb 21, 2024 · 4ebc28d · 4ebc28d
1 parent 002bc25
commit 4ebc28d
Show file tree

Hide file tree

Showing 33 changed files with 39 additions and 47 deletions.
diff --git a/QuIDE/CodeHelpers/CodeGenerator.cs b/QuIDE/CodeHelpers/CodeGenerator.cs
@@ -9,7 +9,7 @@
 using System.Text;
 using QuIDE.QuantumModel;
 using QuIDE.QuantumModel.Gates;
-using QuIDE.ViewModels.MainModels.QuantumParser;
+using QuIDE.QuantumParser;
 
 #endregion
 

diff --git a/QuIDE/QuIDE.csproj b/QuIDE/QuIDE.csproj
@@ -13,7 +13,6 @@
     <ItemGroup>
         <Folder Include="Models"/>
         <AvaloniaResource Include="Assets\**"/>
-        <Folder Include="ViewModels\MainModels\QuantumModel\Gates\" />
         <None Remove="Assets\Images\CopyHS.png"/>
         <AvaloniaResource Include="Assets\Images\CopyHS.png"/>
         <None Remove="Assets\Images\CutHS.png"/>

diff --git a/...nModels/QuantumParser/CircuitEvaluator.cs → QuIDE/QuantumParser/CircuitEvaluator.cs b/...nModels/QuantumParser/CircuitEvaluator.cs → QuIDE/QuantumParser/CircuitEvaluator.cs
@@ -30,7 +30,7 @@ You should have received a copy of the GNU General Public License
 
 #endregion
 
-namespace QuIDE.ViewModels.MainModels.QuantumParser
+namespace QuIDE.QuantumParser
 {
     public class CircuitEvaluator
     {

diff --git a/...nModels/QuantumParser/IQuantumComputer.cs → QuIDE/QuantumParser/IQuantumComputer.cs b/...nModels/QuantumParser/IQuantumComputer.cs → QuIDE/QuantumParser/IQuantumComputer.cs
@@ -25,7 +25,7 @@ You should have received a copy of the GNU General Public License
 
 #endregion
 
-namespace QuIDE.ViewModels.MainModels.QuantumParser
+namespace QuIDE.QuantumParser
 {
     interface IQuantumComputer
     {

diff --git a/...els/MainModels/QuantumParser/IRegister.cs → QuIDE/QuantumParser/IRegister.cs b/...els/MainModels/QuantumParser/IRegister.cs → QuIDE/QuantumParser/IRegister.cs
@@ -25,7 +25,7 @@ You should have received a copy of the GNU General Public License
 
 #endregion
 
-namespace QuIDE.ViewModels.MainModels.QuantumParser
+namespace QuIDE.QuantumParser
 {
     interface IRegister
     {

diff --git a/...ls/MainModels/QuantumParser/MethodCode.cs → QuIDE/QuantumParser/MethodCode.cs b/...ls/MainModels/QuantumParser/MethodCode.cs → QuIDE/QuantumParser/MethodCode.cs
@@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace QuIDE.ViewModels.MainModels.QuantumParser
+namespace QuIDE.QuantumParser
 {
     public class MethodCode
     {

diff --git a/.../QuantumParser/Operations/AddExtension.cs → .../QuantumParser/Operations/AddExtension.cs b/.../QuantumParser/Operations/AddExtension.cs → .../QuantumParser/Operations/AddExtension.cs
@@ -24,7 +24,7 @@ You should have received a copy of the GNU General Public License
 
 #endregion
 
-namespace QuIDE.ViewModels.MainModels.QuantumParser.Operations
+namespace QuIDE.QuantumParser.Operations
 {
     public static class AddExtension
     {

diff --git a/...umParser/Operations/AddModuloExtension.cs → ...umParser/Operations/AddModuloExtension.cs b/...umParser/Operations/AddModuloExtension.cs → ...umParser/Operations/AddModuloExtension.cs
@@ -24,7 +24,7 @@ You should have received a copy of the GNU General Public License
 
 #endregion
 
-namespace QuIDE.ViewModels.MainModels.QuantumParser.Operations
+namespace QuIDE.QuantumParser.Operations
 {
     public static class AddModuloExtension
     {

diff --git a/...arser/Operations/AddModuloQFTExtension.cs → ...arser/Operations/AddModuloQFTExtension.cs b/...arser/Operations/AddModuloQFTExtension.cs → ...arser/Operations/AddModuloQFTExtension.cs
@@ -25,7 +25,7 @@ You should have received a copy of the GNU General Public License
 
 #endregion
 
-namespace QuIDE.ViewModels.MainModels.QuantumParser.Operations
+namespace QuIDE.QuantumParser.Operations
 {
     public static class AddModuloQFTExtension
     {

diff --git a/...antumParser/Operations/AddQFTExtension.cs → ...antumParser/Operations/AddQFTExtension.cs b/...antumParser/Operations/AddQFTExtension.cs → ...antumParser/Operations/AddQFTExtension.cs
@@ -27,7 +27,7 @@ You should have received a copy of the GNU General Public License
 
 #endregion
 
-namespace QuIDE.ViewModels.MainModels.QuantumParser.Operations
+namespace QuIDE.QuantumParser.Operations
 {
     public static class AddQFTExtension
     {

diff --git a/...er/Operations/ControlledUGateExtension.cs → ...er/Operations/ControlledUGateExtension.cs b/...er/Operations/ControlledUGateExtension.cs → ...er/Operations/ControlledUGateExtension.cs
@@ -25,7 +25,7 @@ You should have received a copy of the GNU General Public License
 
 #endregion
 
-namespace QuIDE.ViewModels.MainModels.QuantumParser.Operations
+namespace QuIDE.QuantumParser.Operations
 {
     public static class ControlledUGateExtension
     {

diff --git a/...umParser/Operations/ExpModuloExtension.cs → ...umParser/Operations/ExpModuloExtension.cs b/...umParser/Operations/ExpModuloExtension.cs → ...umParser/Operations/ExpModuloExtension.cs
@@ -24,7 +24,7 @@ You should have received a copy of the GNU General Public License
 
 #endregion
 
-namespace QuIDE.ViewModels.MainModels.QuantumParser.Operations
+namespace QuIDE.QuantumParser.Operations
 {
     // Quantum networks for elementary arithmetic operations
     // Vlatko Vedral, Adriano Barenco, and Artur Ekert

diff --git a/...uantumParser/Operations/GatesExtension.cs → ...uantumParser/Operations/GatesExtension.cs b/...uantumParser/Operations/GatesExtension.cs → ...uantumParser/Operations/GatesExtension.cs
@@ -25,7 +25,7 @@ You should have received a copy of the GNU General Public License
 
 #endregion
 
-namespace QuIDE.ViewModels.MainModels.QuantumParser.Operations
+namespace QuIDE.QuantumParser.Operations
 {
     public static class GatesExtension
     {

diff --git a/...mParser/Operations/LoadNumberExtension.cs → ...mParser/Operations/LoadNumberExtension.cs b/...mParser/Operations/LoadNumberExtension.cs → ...mParser/Operations/LoadNumberExtension.cs
@@ -24,7 +24,7 @@ You should have received a copy of the GNU General Public License
 
 #endregion
 
-namespace QuIDE.ViewModels.MainModels.QuantumParser.Operations
+namespace QuIDE.QuantumParser.Operations
 {
     public static class LoadNumberExtension
     {

diff --git a/...mParser/Operations/MultModuloExtension.cs → ...mParser/Operations/MultModuloExtension.cs b/...mParser/Operations/MultModuloExtension.cs → ...mParser/Operations/MultModuloExtension.cs
@@ -24,7 +24,7 @@ You should have received a copy of the GNU General Public License
 
 #endregion
 
-namespace QuIDE.ViewModels.MainModels.QuantumParser.Operations
+namespace QuIDE.QuantumParser.Operations
 {
     public static class MultModuloExtension
     {

diff --git a/...rser/Operations/MultModuloQFTExtension.cs → ...rser/Operations/MultModuloQFTExtension.cs b/...rser/Operations/MultModuloQFTExtension.cs → ...rser/Operations/MultModuloQFTExtension.cs
@@ -25,7 +25,7 @@ You should have received a copy of the GNU General Public License
 
 #endregion
 
-namespace QuIDE.ViewModels.MainModels.QuantumParser.Operations
+namespace QuIDE.QuantumParser.Operations
 {
     public static class MultModuloQFTExtension
     {

diff --git a/.../QuantumParser/Operations/QFTExtension.cs → .../QuantumParser/Operations/QFTExtension.cs b/.../QuantumParser/Operations/QFTExtension.cs → .../QuantumParser/Operations/QFTExtension.cs
@@ -22,7 +22,7 @@ You should have received a copy of the GNU General Public License
 
 #endregion
 
-namespace QuIDE.ViewModels.MainModels.QuantumParser.Operations
+namespace QuIDE.QuantumParser.Operations
 {
     public static class QFTExtension
     {

diff --git a/...uantumParser/Operations/ResetExtension.cs → ...uantumParser/Operations/ResetExtension.cs b/...uantumParser/Operations/ResetExtension.cs → ...uantumParser/Operations/ResetExtension.cs
@@ -22,7 +22,7 @@ You should have received a copy of the GNU General Public License
 
 #endregion
 
-namespace QuIDE.ViewModels.MainModels.QuantumParser.Operations
+namespace QuIDE.QuantumParser.Operations
 {
     public static class ResetExtension
     {

diff --git a/...QuantumParser/Operations/SwapExtension.cs → ...QuantumParser/Operations/SwapExtension.cs b/...QuantumParser/Operations/SwapExtension.cs → ...QuantumParser/Operations/SwapExtension.cs
@@ -24,7 +24,7 @@ You should have received a copy of the GNU General Public License
 
 #endregion
 
-namespace QuIDE.ViewModels.MainModels.QuantumParser.Operations
+namespace QuIDE.QuantumParser.Operations
 {
     public static class SwapExtension
     {

diff --git a/...uantumParser/Operations/WalshExtension.cs → ...uantumParser/Operations/WalshExtension.cs b/...uantumParser/Operations/WalshExtension.cs → ...uantumParser/Operations/WalshExtension.cs
@@ -22,7 +22,7 @@ You should have received a copy of the GNU General Public License
 
 #endregion
 
-namespace QuIDE.ViewModels.MainModels.QuantumParser.Operations
+namespace QuIDE.QuantumParser.Operations
 {
     public static class WalshExtension
     {

diff --git a/...Models/MainModels/QuantumParser/Parser.cs → QuIDE/QuantumParser/Parser.cs b/...Models/MainModels/QuantumParser/Parser.cs → QuIDE/QuantumParser/Parser.cs
@@ -24,17 +24,17 @@ You should have received a copy of the GNU General Public License
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using System.Reflection.Metadata;
 using System.Runtime.CompilerServices;
 using System.Runtime.Loader;
 using System.Text;
 using System.Text.RegularExpressions;
-using QuIDE.ViewModels.MainModels.QuantumParser.Operations;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
-using System.Reflection.Metadata;
 using QuIDE.QuantumModel;
+using QuIDE.QuantumParser.Operations;
 
-namespace QuIDE.ViewModels.MainModels.QuantumParser;
+namespace QuIDE.QuantumParser;
 
 public class KeywordNotAllowedException(string keyword) : Exception(
     "Code cannot contain some special keywords. Please remove them. \nForbidden keyword found: " +
@@ -271,7 +271,7 @@ public static Dictionary<string, List<MethodCode>> GetMethodsCodes(string code)
 
     private static string Preprocess(string code)
     {
-        const string parserLocation = "using QuIDE.ViewModels.MainModels.QuantumParser";
+        const string parserLocation = "using QuIDE.QuantumParser";
 
         // Delete "using Quantum{.Operations};" with QuantumParser equivalents
         var pattern = @"using\s+Quantum\s*;";

diff --git a/...inModels/QuantumParser/QuantumComputer.cs → QuIDE/QuantumParser/QuantumComputer.cs b/...inModels/QuantumParser/QuantumComputer.cs → QuIDE/QuantumParser/QuantumComputer.cs
@@ -32,7 +32,7 @@ You should have received a copy of the GNU General Public License
 
 #endregion
 
-namespace QuIDE.ViewModels.MainModels.QuantumParser
+namespace QuIDE.QuantumParser
 {
     public class QuantumComputer : IQuantumComputer
     {

diff --git a/...dels/MainModels/QuantumParser/Register.cs → QuIDE/QuantumParser/Register.cs b/...dels/MainModels/QuantumParser/Register.cs → QuIDE/QuantumParser/Register.cs
@@ -27,11 +27,11 @@ You should have received a copy of the GNU General Public License
 using System.Text;
 using QuIDE.QuantumModel;
 using QuIDE.QuantumModel.Gates;
-using QuIDE.ViewModels.MainModels.QuantumParser.Validation;
+using QuIDE.QuantumParser.Validation;
 
 #endregion
 
-namespace QuIDE.ViewModels.MainModels.QuantumParser
+namespace QuIDE.QuantumParser
 {
     public class Register : IRegister
     {

diff --git a/...s/MainModels/QuantumParser/RegisterRef.cs → QuIDE/QuantumParser/RegisterRef.cs b/...s/MainModels/QuantumParser/RegisterRef.cs → QuIDE/QuantumParser/RegisterRef.cs
@@ -24,7 +24,7 @@ You should have received a copy of the GNU General Public License
 
 #endregion
 
-namespace QuIDE.ViewModels.MainModels.QuantumParser
+namespace QuIDE.QuantumParser
 {
     public struct RegisterRef
     {

diff --git a/...MainModels/QuantumParser/StepEvaluator.cs → QuIDE/QuantumParser/StepEvaluator.cs b/...MainModels/QuantumParser/StepEvaluator.cs → QuIDE/QuantumParser/StepEvaluator.cs
@@ -28,7 +28,7 @@ You should have received a copy of the GNU General Public License
 
 #endregion
 
-namespace QuIDE.ViewModels.MainModels.QuantumParser
+namespace QuIDE.QuantumParser
 {
     public class StepEvaluator
     {

diff --git a/...antumParser/Validation/MatrixValidator.cs → ...antumParser/Validation/MatrixValidator.cs b/...antumParser/Validation/MatrixValidator.cs → ...antumParser/Validation/MatrixValidator.cs
@@ -24,7 +24,7 @@ You should have received a copy of the GNU General Public License
 
 #endregion
 
-namespace QuIDE.ViewModels.MainModels.QuantumParser.Validation
+namespace QuIDE.QuantumParser.Validation
 {
     public static class MatrixValidator
     {

diff --git a/QuIDE/ViewModels/Controls/OutputGridViewModel.cs b/QuIDE/ViewModels/Controls/OutputGridViewModel.cs
@@ -7,8 +7,8 @@
 using Avalonia.Interactivity;
 using QuIDE.CodeHelpers;
 using QuIDE.QuantumModel;
+using QuIDE.QuantumParser;
 using QuIDE.ViewModels.Helpers;
-using QuIDE.ViewModels.MainModels.QuantumParser;
 
 #endregion
 

diff --git a/QuIDE/ViewModels/Controls/PropertiesViewModel.cs b/QuIDE/ViewModels/Controls/PropertiesViewModel.cs
@@ -14,11 +14,11 @@
 using QuIDE.CodeHelpers;
 using QuIDE.Properties;
 using QuIDE.ViewModels.Helpers;
-using QuIDE.ViewModels.MainModels.QuantumParser;
-using QuIDE.ViewModels.MainModels.QuantumParser.Validation;
 using Quantum.Helpers;
 using QuIDE.QuantumModel;
 using QuIDE.QuantumModel.Gates;
+using QuIDE.QuantumParser;
+using QuIDE.QuantumParser.Validation;
 
 #endregion
 

diff --git a/QuIDE/ViewModels/Dialog/MatrixInputViewModel.cs b/QuIDE/ViewModels/Dialog/MatrixInputViewModel.cs
@@ -3,7 +3,7 @@
 using System.Numerics;
 using QuIDE.CodeHelpers;
 using QuIDE.Properties;
-using QuIDE.ViewModels.MainModels.QuantumParser.Validation;
+using QuIDE.QuantumParser.Validation;
 
 #endregion
 

diff --git a/QuIDE/ViewModels/Dialog/ParametricInputViewModel.cs b/QuIDE/ViewModels/Dialog/ParametricInputViewModel.cs
@@ -7,8 +7,8 @@
 using System.Text;
 using QuIDE.QuantumModel;
 using QuIDE.QuantumModel.Gates;
+using QuIDE.QuantumParser;
 using QuIDE.ViewModels.Helpers;
-using QuIDE.ViewModels.MainModels.QuantumParser;
 
 #endregion
 

diff --git a/QuIDE/ViewModels/Helpers/GateViewModel.cs b/QuIDE/ViewModels/Helpers/GateViewModel.cs
@@ -13,9 +13,9 @@
 using QuIDE.CodeHelpers;
 using QuIDE.QuantumModel;
 using QuIDE.QuantumModel.Gates;
+using QuIDE.QuantumParser;
 using QuIDE.ViewModels.Controls;
 using QuIDE.ViewModels.Dialog;
-using QuIDE.ViewModels.MainModels.QuantumParser;
 using QuIDE.Views.Dialog;
 
 #endregion

diff --git a/QuIDE/ViewModels/Helpers/ParameterViewModel.cs b/QuIDE/ViewModels/Helpers/ParameterViewModel.cs
@@ -4,7 +4,7 @@
 using System.ComponentModel;
 using System.Text;
 using QuIDE.QuantumModel;
-using QuIDE.ViewModels.MainModels.QuantumParser;
+using QuIDE.QuantumParser;
 
 #endregion
 

diff --git a/QuIDE/ViewModels/MainWindowViewModel.cs b/QuIDE/ViewModels/MainWindowViewModel.cs
@@ -1,20 +1,17 @@
-#region
-
-using System;
+using System;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Windows.Input;
 using Avalonia.Controls;
 using QuIDE.CodeHelpers;
 using QuIDE.ViewModels.Controls;
 using QuIDE.ViewModels.Dialog;
-using QuIDE.ViewModels.MainModels.QuantumParser;
 using QuIDE.Views;
 using QuIDE.Views.Dialog;
 using CommunityToolkit.Mvvm.Input;
 using QuIDE.QuantumModel;
-
-#endregion
+using QuIDE.QuantumParser;
+using Parser = QuIDE.QuantumParser.Parser;
 
 namespace QuIDE.ViewModels;
 
@@ -392,8 +389,6 @@ public ICommand RunCommand
     #endregion // Commands
 
 
-    #region Public Methods
-
     public static void CompositeSelected()
     {
         SelectedAction = ActionName.Composite;
@@ -654,8 +649,6 @@ private async void ShowAbout(object o)
         await new AboutWindow().ShowDialog(_window);
     }
 
-    #endregion // Public Methods
-
 
     #region Private Helpers