added identifier class

Author: timmi-on-rails

Demo/Program.cs

@@ -5,58 +5,43 @@
 
 namespace Demo
 {
-	public delegate void Funny();
 	class MainClass
 	{
-		public static void digest(Object del)
-		{ }
+		const string exitCommand = "exit";
+		static string currentLine;
 
-
-
-		public static void Test()
-		{
-		}
 		public static void Main(string[] args)
 		{
-			string line;
 			MathParser.MathParser mathParser = new MathParser.MathParser();
 
 			SymbolManager symbolManager = new SymbolManager();
 			symbolManager.SetTrigonometrySymbols();
 
-			while ((line = Console.ReadLine()) != "exit")
+			Console.WriteLine("Enter {0} to quit calculator.", exitCommand);
+
+			while (ReadNextLine())
 			{
 				try
 				{
-					ExpressionTree e = mathParser.Parse(line);
-					try
-					{
-						//e.Assign();
-					}
-					catch (Exception e1)
-					{
-						Console.WriteLine("parse error: " + e1.Message);
-					}
-
-					try
-					{
-						string detail = e.ToDebug();
-						Console.Write(detail);
-
-						object d = e.Evaluate(symbolManager);
-						Console.WriteLine(" = " + d);
-					}
-					catch (Exception e2)
-					{
-						Console.WriteLine("parse error: " + e2.Message);
-					}
+					ExpressionTree expressionTree = mathParser.Parse(currentLine);
 
+					string detail = expressionTree.ToDebug();
+					Value result = expressionTree.Evaluate(symbolManager);
+
+					Console.WriteLine("{0} = {1}", detail, result);
 				}
-				catch (Exception fe)
+				catch (Exception exception)
 				{
-					Console.WriteLine(fe.Message);
+					Console.WriteLine("error: {0}", exception.Message);
 				}
 			}
 		}
+
+		static bool ReadNextLine()
+		{
+			Console.Write("> ");
+			currentLine = Console.ReadLine();
+			return currentLine != exitCommand;
+		}
 	}
 }

ExpressionTest/ExpressionTest.csproj

@@ -41,6 +41,7 @@
     <Compile Include="TestFunctions.cs" />
     <Compile Include="TestParser.cs" />
     <Compile Include="TestValueClass.cs" />
+    <Compile Include="TestIdentifier.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />

ExpressionTest/TestIdentifier.cs

@@ -0,0 +1,22 @@
+using System;
+using MathParser;
+using NUnit.Framework;
+
+namespace ExpressionTest
+{
+	[TestFixture]
+	public class TestIdentifier
+	{
+		[Test]
+		public void TestComparison()
+		{
+			Identifier identifierX = "x";
+			Identifier identifierY = "y";
+
+			Assert.AreNotSame(identifierX, identifierY);
+			Assert.AreNotEqual(identifierX, identifierY);
+			Assert.IsTrue(identifierX != identifierY);
+			// TODO more checks on valid identifiers
+		}
+	}
+}

ExpressionTest/TestValueClass.cs

@@ -50,5 +50,8 @@ Value someCalculationFunction(params Value[] arguments)
 		{
 			return null;
 		}
+
+		// TODO test exception throwing on conversions
+
 	}
 }

ExpressionTest/TestVariables.cs

@@ -23,8 +23,6 @@ public void TestTernary()
 		{
 			"1<2 ? 5 : 3".ShouldEvaluateTo(5);
 			"2<1 ? 5 : 1<2 ? 22 : 20".ShouldEvaluateTo(22);
-
-
 		}
 	}
 }

ExpressionTest/TokenizerTest.cs

@@ -75,6 +75,11 @@ public void TestSomeOperators()
 				Token(TokenType.Identifier, "y", 4),
 				Token(TokenType.EndOfFile, "", 5));
 
+			AssertTokensMatch("1<=2",
+				Token(TokenType.Numeric, "1", 0),
+				Token(TokenType.LessOrEqual, "<=", 1),
+				Token(TokenType.Numeric, "2", 3),
+				Token(TokenType.EndOfFile, "", 4));
 		}
 
 		Token Token(TokenType tokenType, string value, int position)

README.md

@@ -1,3 +1,11 @@
 [![Build status](https://ci.appveyor.com/api/projects/status/ud2t2nlje0si5grt/branch/master?svg=true)](https://ci.appveyor.com/project/timmi-on-rails/mathparser/branch/master)
 
 Demo: https://ci.appveyor.com/api/projects/timmi-on-rails/mathparser/artifacts/Demo/bin/Demo.zip
+
+TODO
+faculty !
+modulo %
+vector algebra
+evaluate stuff like "3x+2"
+
+not 100% confident with the Identifier solution

shunting_yard/MathParser.csproj

@@ -92,6 +92,7 @@
     <Compile Include="src\symbol_manager\ISymbolManager.cs" />
     <Compile Include="src\symbol_manager\TrigonometrySymbols.cs" />
     <Compile Include="src\expressions\Value.cs" />
+    <Compile Include="src\tokenizer\Identifier.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

shunting_yard/src/expressions/FunctionAssignmentExpression.cs

@@ -5,13 +5,13 @@ namespace MathParser
 {
 	class FunctionAssignmentExpression : IExpression
 	{
-		public IExpression Expression { get; }
-
 		public string FunctionName { get; }
 
-		public IEnumerable<string> ArgumentNames { get; }
+		public IEnumerable<Identifier> ArgumentNames { get; }
+
+		public IExpression Expression { get; }
 
-		public FunctionAssignmentExpression(string functionName, IEnumerable<string> arguments, IExpression expression)
+		public FunctionAssignmentExpression(string functionName, IEnumerable<Identifier> arguments, IExpression expression)
 		{
 			FunctionName = functionName;
 			Expression = expression;

shunting_yard/src/expressions/VariableAssignmentExpression.cs

@@ -2,13 +2,13 @@
 {
 	class VariableAssignmentExpression : IExpression
 	{
-		public IExpression Expression { get; }
+		public Identifier Identifier { get; }
 
-		public string VariableName { get; }
+		public IExpression Expression { get; }
 
-		public VariableAssignmentExpression(string variableName, IExpression expression)
+		public VariableAssignmentExpression(Identifier identifier, IExpression expression)
 		{
-			VariableName = variableName;
+			Identifier = identifier;
 			Expression = expression;
 		}