#236 - Rework parser (remove RPN)

sys27 · Jul 30, 2019 · 43f4f73 · 43f4f73
1 parent 14a1c29
commit 43f4f73
Show file tree

Hide file tree

Showing 4 changed files with 565 additions and 18 deletions.
diff --git a/xFunc.DotnetTool/Program.cs b/xFunc.DotnetTool/Program.cs
@@ -6,6 +6,7 @@
 using xFunc.Maths.Analyzers.TypeAnalyzers;
 using xFunc.Maths.Expressions;
 using xFunc.Maths.Expressions.Collections;
+using xFunc.Maths.Tokenization;
 
 namespace xFunc.DotnetTool
 {
@@ -141,12 +142,21 @@ private static void PrintError(DebugInfoOptions options, Exception e)
 
         public static void Main(string[] args)
         {
-            CommandLine.Parser.Default
-                .ParseArguments<TokenizeOptions, ParseOptions, SolveOptions, InteractiveOptions>(args)
-                .WithParsed<TokenizeOptions>(Tokenize)
-                .WithParsed<ParseOptions>(Parse)
-                .WithParsed<SolveOptions>(Solve)
-                .WithParsed<InteractiveOptions>(Interactive);
+            //CommandLine.Parser.Default
+            //    .ParseArguments<TokenizeOptions, ParseOptions, SolveOptions, InteractiveOptions>(args)
+            //    .WithParsed<TokenizeOptions>(Tokenize)
+            //    .WithParsed<ParseOptions>(Parse)
+            //    .WithParsed<SolveOptions>(Solve)
+            //    .WithParsed<InteractiveOptions>(Interactive);
+
+            var l = new Lexer();
+            var p = new Maths.Parser();
+
+            var tokens = l.Tokenize("1+1+1");
+            var exp = p.Parse(tokens);
+
+            Console.WriteLine(exp);
+            Console.WriteLine(exp.Execute());
         }
     }
 }
diff --git a/xFunc.Maths/Parser.cs b/xFunc.Maths/Parser.cs
@@ -22,7 +22,6 @@
 
 namespace xFunc.Maths
 {
-
     /// <summary>
     /// The parser for mathematical expressions.
     /// </summary>