removed comparison expression and added factorial

timmi-on-rails · timmi-on-rails · commit 90ab5de00368 · 2017-01-23T22:39:33.000+01:00
diff --git a/ExpressionTest/TokenizerTest.cs b/ExpressionTest/TokenizerTest.cs
@@ -33,7 +33,7 @@ public void TestEveryTokenType()
 			AssertTokensMatch("false", Token(TokenType.False, "false", 0), Token(TokenType.EndOfFile, "", 5));
 			AssertTokensMatch("365", Token(TokenType.Numeric, "365", 0), Token(TokenType.EndOfFile, "", 3));
 			AssertTokensMatch("x", Token(TokenType.Identifier, "x", 0), Token(TokenType.EndOfFile, "", 1));
-			AssertTokensMatch("!", Token(TokenType.Unknown, "!", 0), Token(TokenType.EndOfFile, "", 1));
+			AssertTokensMatch("!", Token(TokenType.Exclamation, "!", 0), Token(TokenType.EndOfFile, "", 1));
 			AssertTokensMatch("  ", Token(TokenType.WhiteSpace, "  ", 0), Token(TokenType.EndOfFile, "", 2));
 			AssertTokensMatch("\t ", Token(TokenType.WhiteSpace, "\t ", 0), Token(TokenType.EndOfFile, "", 2));
 		}
diff --git a/README.md b/README.md
@@ -4,8 +4,7 @@ Demo: https://ci.appveyor.com/api/projects/timmi-on-rails/mathparser/artifacts/D
 
 TODO
 faculty !
-modulo %
+
 vector algebra
-evaluate stuff like "3x+2"
 
 not 100% confident with the Identifier solution
diff --git a/shunting_yard/MathParser.csproj b/shunting_yard/MathParser.csproj
@@ -56,8 +56,6 @@
     <Compile Include="src\expressions\PostfixExpressionType.cs" />
     <Compile Include="src\parser\Associativity.cs" />
     <Compile Include="src\expressions\TernaryExpression.cs" />
-    <Compile Include="src\expressions\ComparisonExpression.cs" />
-    <Compile Include="src\expressions\ComparisonExpressionType.cs" />
     <Compile Include="src\expressions\FunctionAssignmentExpression.cs" />
     <Compile Include="src\visitors\BottomUpExpressionVisitor.cs" />
     <Compile Include="src\visitors\AssignVisitor.cs" />
@@ -75,7 +73,6 @@
     <Compile Include="src\parser\parselets\PostfixOperatorParselet.cs" />
     <Compile Include="src\parser\parselets\PrefixOperatorParselet.cs" />
     <Compile Include="src\parser\parselets\BinaryOperatorParselet.cs" />
-    <Compile Include="src\parser\parselets\ComparisonParselet.cs" />
     <Compile Include="src\parser\parselets\GroupParselet.cs" />
     <Compile Include="src\parser\parselets\TernaryParselet.cs" />
     <Compile Include="src\parser\parselets\NumberParselet.cs" />
diff --git a/shunting_yard/src/expressions/BinaryExpressionType.cs b/shunting_yard/src/expressions/BinaryExpressionType.cs
@@ -7,6 +7,12 @@ enum BinaryExpressionType
 		Multiplication,
 		Division,
 		Power,
-		Modulo
+		Modulo,
+		Equal,
+		NotEqual,
+		Less,
+		LessOrEqual,
+		Greater,
+		GreaterOrEqual
 	}
 }
diff --git a/shunting_yard/src/expressions/CallExpression.cs b/shunting_yard/src/expressions/CallExpression.cs
@@ -5,19 +5,20 @@ namespace MathParser
 {
 	class CallExpression : IExpression
 	{
-		public string FunctionName { get; }
+		public IExpression FunctionExpression { get; }
 
 		public IEnumerable<IExpression> Arguments { get; }
 
-		public CallExpression(string functionName, IEnumerable<IExpression> arguments)
+		public CallExpression(IExpression functionExpression, IEnumerable<IExpression> arguments)
 		{
-			FunctionName = functionName;
+			FunctionExpression = functionExpression;
 			Arguments = arguments.ToArray();
 		}
 
 		public void Accept(IExpressionVisitor visitor)
 		{
-			visitor.Traverse(() => visitor.Visit(this), Arguments.ToArray());
+			IExpression[] children = new[] { FunctionExpression }.Concat(Arguments).ToArray();
+			visitor.Traverse(() => visitor.Visit(this), children);
 		}
 	}
 }
diff --git a/shunting_yard/src/expressions/ComparisonExpression.cs b/shunting_yard/src/expressions/ComparisonExpression.cs
diff --git a/shunting_yard/src/expressions/ComparisonExpressionType.cs b/shunting_yard/src/expressions/ComparisonExpressionType.cs
diff --git a/shunting_yard/src/expressions/PostfixExpressionType.cs b/shunting_yard/src/expressions/PostfixExpressionType.cs
@@ -2,5 +2,6 @@
 {
 	enum PostfixExpressionType
 	{
+		Factorial
 	}
 }
diff --git a/shunting_yard/src/expressions/TernaryExpression.cs b/shunting_yard/src/expressions/TernaryExpression.cs
@@ -2,7 +2,7 @@
 {
 	class TernaryExpression : IExpression
 	{
-		public IExpression Condition { get; } //differ between value expressions and conditionexpressions?! or is condition just some value
+		public IExpression Condition { get; }
 
 		public IExpression TrueCase { get; }
 
diff --git a/shunting_yard/src/expressions/Value.cs b/shunting_yard/src/expressions/Value.cs
@@ -57,7 +57,7 @@ public static Value Boolean(bool b)
 		{
 			return new Value(ValueType.Boolean, b);
 		}
-
+		// TODO function with identifier and argument names
 		public static Value Function(Function function)
 		{
 			return new Value(ValueType.Function, function);
diff --git a/shunting_yard/src/parser/ExpressionParser.cs b/shunting_yard/src/parser/ExpressionParser.cs
@@ -18,9 +18,14 @@ static ExpressionParser()
 			registerPrefixParselet(TokenType.Minus, new PrefixOperatorParselet(PrefixExpressionType.Negation, Precedences.PREFIX));
 			registerPrefixParselet(TokenType.Plus, new PrefixOperatorParselet(PrefixExpressionType.Positive, Precedences.PREFIX));
 
+			registerInfixParselet(TokenType.Exclamation, new PostfixOperatorParselet(PostfixExpressionType.Factorial, Precedences.POSTFIX));
 			registerInfixParselet(TokenType.Assignment, new AssignParselet());
-			registerInfixParselet(TokenType.Less, new ComparisonParselet(ComparisonExpressionType.Less, Precedences.COMPARISON, Associativity.Left));
-			registerInfixParselet(TokenType.Greater, new ComparisonParselet(ComparisonExpressionType.Bigger, Precedences.COMPARISON, Associativity.Left));
+			registerInfixParselet(TokenType.Equal, new BinaryOperatorParselet(BinaryExpressionType.Equal, Precedences.COMPARISON, Associativity.Left));
+			registerInfixParselet(TokenType.NotEqual, new BinaryOperatorParselet(BinaryExpressionType.NotEqual, Precedences.COMPARISON, Associativity.Left));
+			registerInfixParselet(TokenType.Less, new BinaryOperatorParselet(BinaryExpressionType.Less, Precedences.COMPARISON, Associativity.Left));
+			registerInfixParselet(TokenType.Greater, new BinaryOperatorParselet(BinaryExpressionType.Greater, Precedences.COMPARISON, Associativity.Left));
+			registerInfixParselet(TokenType.LessOrEqual, new BinaryOperatorParselet(BinaryExpressionType.LessOrEqual, Precedences.COMPARISON, Associativity.Left));
+			registerInfixParselet(TokenType.GreaterOrEqual, new BinaryOperatorParselet(BinaryExpressionType.GreaterOrEqual, Precedences.COMPARISON, Associativity.Left));
 			registerInfixParselet(TokenType.QuestionMark, new TernaryParselet());
 			registerInfixParselet(TokenType.LeftParenthesis, new CallParselet());
 			registerInfixParselet(TokenType.Plus, new BinaryOperatorParselet(BinaryExpressionType.Addition, Precedences.SUM, Associativity.Left));
@@ -79,7 +84,7 @@ IExpression ParseExpression(TokenStream tokenStream, int precedence)
 				{
 					break;
 				}
-
+				// todo handle juxtaposition multiplication for constants with brackets
 				if (isInfix)
 				{
 					tokenStream.Consume();
diff --git a/shunting_yard/src/parser/parselets/AssignParselet.cs b/shunting_yard/src/parser/parselets/AssignParselet.cs
@@ -18,11 +18,11 @@ public IExpression Parse(ParseExpressionDelegate parseExpression, TokenStream to
 			{
 				CallExpression callExpression = (CallExpression)leftExpression;
 
-				IEnumerable<VariableExpression> arguments = callExpression.Arguments.Select(argument => (argument as VariableExpression));
+				IEnumerable<VariableExpression> arguments = callExpression.Arguments.Concat(new[] { callExpression.FunctionExpression }).Select(argument => (argument as VariableExpression));
 
 				if (arguments.All(arg => arg != null))
 				{
-					return new FunctionAssignmentExpression(callExpression.FunctionName, arguments.Select(argument => argument.Identifier), rightExpression);
+					return new FunctionAssignmentExpression(((VariableExpression)callExpression.FunctionExpression).Identifier, arguments.Select(argument => argument.Identifier), rightExpression);
 				}
 				else
 				{
diff --git a/shunting_yard/src/parser/parselets/CallParselet.cs b/shunting_yard/src/parser/parselets/CallParselet.cs
@@ -6,14 +6,6 @@ class CallParselet : IInfixParselet
 	{
 		public IExpression Parse(ParseExpressionDelegate parseExpression, TokenStream tokenStream, IExpression leftExpression)
 		{
-			// TODO look up why some people store the left expression instead of verifying a variable name
-			VariableExpression variableExpression = (leftExpression as VariableExpression);
-
-			if (variableExpression == null)
-			{
-				throw new ParserException("Expected identifier as function name.");
-			}
-
 			List<IExpression> arguments = new List<IExpression>();
 
 			if (!tokenStream.Match(TokenType.RightParenthesis))
@@ -26,7 +18,7 @@ public IExpression Parse(ParseExpressionDelegate parseExpression, TokenStream to
 				tokenStream.Consume(TokenType.RightParenthesis);
 			}
 
-			return new CallExpression(variableExpression.Identifier, arguments);
+			return new CallExpression(leftExpression, arguments);
 		}
 
 		public int Precedence
diff --git a/shunting_yard/src/parser/parselets/ComparisonParselet.cs b/shunting_yard/src/parser/parselets/ComparisonParselet.cs
diff --git a/shunting_yard/src/tokenizer/TokenType.cs b/shunting_yard/src/tokenizer/TokenType.cs
@@ -26,6 +26,7 @@ enum TokenType
 		WhiteSpace,
 		True,
 		False,
-		Percent
+		Percent,
+		Exclamation
 	}
 }
diff --git a/shunting_yard/src/tokenizer/Tokenizer.cs b/shunting_yard/src/tokenizer/Tokenizer.cs
@@ -275,7 +275,7 @@ Token ScanPunctuation()
 						Consume();
 						return CreateToken(TokenType.NotEqual);
 					}
-					return ScanWord();
+					return CreateToken(TokenType.Exclamation);
 				case '*':
 					Consume();
 					return CreateToken(TokenType.Star);
diff --git a/shunting_yard/src/visitors/BottomUpExpressionVisitor.cs b/shunting_yard/src/visitors/BottomUpExpressionVisitor.cs
@@ -16,10 +16,6 @@ public virtual void Visit(VariableAssignmentExpression variableAssignmentExpress
 		{
 		}
 
-		public virtual void Visit(ComparisonExpression comparisonExpression)
-		{
-		}
-
 		public virtual void Visit(GroupExpression groupExpression)
 		{
 		}
diff --git a/shunting_yard/src/visitors/EvaluationVisitor.cs b/shunting_yard/src/visitors/EvaluationVisitor.cs
diff --git a/shunting_yard/src/visitors/GraphvizVisitor.cs b/shunting_yard/src/visitors/GraphvizVisitor.cs
diff --git a/shunting_yard/src/visitors/IExpressionVisitor.cs b/shunting_yard/src/visitors/IExpressionVisitor.cs
diff --git a/shunting_yard/src/visitors/PrintVisitor.cs b/shunting_yard/src/visitors/PrintVisitor.cs

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public void TestEveryTokenType()`
`33`	`33`	`AssertTokensMatch("false", Token(TokenType.False, "false", 0), Token(TokenType.EndOfFile, "", 5));`
`34`	`34`	`AssertTokensMatch("365", Token(TokenType.Numeric, "365", 0), Token(TokenType.EndOfFile, "", 3));`
`35`	`35`	`AssertTokensMatch("x", Token(TokenType.Identifier, "x", 0), Token(TokenType.EndOfFile, "", 1));`
`36`		`- AssertTokensMatch("!", Token(TokenType.Unknown, "!", 0), Token(TokenType.EndOfFile, "", 1));`
	`36`	`+ AssertTokensMatch("!", Token(TokenType.Exclamation, "!", 0), Token(TokenType.EndOfFile, "", 1));`
`37`	`37`	`AssertTokensMatch(" ", Token(TokenType.WhiteSpace, " ", 0), Token(TokenType.EndOfFile, "", 2));`
`38`	`38`	`AssertTokensMatch("\t ", Token(TokenType.WhiteSpace, "\t ", 0), Token(TokenType.EndOfFile, "", 2));`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,12 @@ enum BinaryExpressionType`
`7`	`7`	`Multiplication,`
`8`	`8`	`Division,`
`9`	`9`	`Power,`
`10`		`- Modulo`
	`10`	`+ Modulo,`
	`11`	`+ Equal,`
	`12`	`+ NotEqual,`
	`13`	`+ Less,`
	`14`	`+ LessOrEqual,`
	`15`	`+ Greater,`
	`16`	`+ GreaterOrEqual`
`11`	`17`	`}`
`12`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,19 +5,20 @@ namespace MathParser`
`5`	`5`	`{`
`6`	`6`	`class CallExpression : IExpression`
`7`	`7`	`{`
`8`		`- public string FunctionName { get; }`
	`8`	`+ public IExpression FunctionExpression { get; }`
`9`	`9`
`10`	`10`	`public IEnumerable<IExpression> Arguments { get; }`
`11`	`11`
`12`		`- public CallExpression(string functionName, IEnumerable<IExpression> arguments)`
	`12`	`+ public CallExpression(IExpression functionExpression, IEnumerable<IExpression> arguments)`
`13`	`13`	`{`
`14`		`- FunctionName = functionName;`
	`14`	`+ FunctionExpression = functionExpression;`
`15`	`15`	`Arguments = arguments.ToArray();`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`public void Accept(IExpressionVisitor visitor)`
`19`	`19`	`{`
`20`		`- visitor.Traverse(() => visitor.Visit(this), Arguments.ToArray());`
	`20`	`+ IExpression[] children = new[] { FunctionExpression }.Concat(Arguments).ToArray();`
	`21`	`+ visitor.Traverse(() => visitor.Visit(this), children);`
`21`	`22`	`}`
`22`	`23`	`}`
`23`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,6 @@`
`2`	`2`	`{`
`3`	`3`	`enum PostfixExpressionType`
`4`	`4`	`{`
	`5`	`+ Factorial`
`5`	`6`	`}`
`6`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`{`
`3`	`3`	`class TernaryExpression : IExpression`
`4`	`4`	`{`
`5`		`- public IExpression Condition { get; } //differ between value expressions and conditionexpressions?! or is condition just some value`
	`5`	`+ public IExpression Condition { get; }`
`6`	`6`
`7`	`7`	`public IExpression TrueCase { get; }`
`8`	`8`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public static Value Boolean(bool b)`
`57`	`57`	`{`
`58`	`58`	`return new Value(ValueType.Boolean, b);`
`59`	`59`	`}`
`60`		`-`
	`60`	`+ // TODO function with identifier and argument names`
`61`	`61`	`public static Value Function(Function function)`
`62`	`62`	`{`
`63`	`63`	`return new Value(ValueType.Function, function);`