added bool as value type

timmi-on-rails · timmi-on-rails · commit 8697ce7b8f3e · 2017-01-22T22:21:14.000+01:00
diff --git a/Demo/Program.cs b/Demo/Program.cs
@@ -1,6 +1,4 @@
 ﻿using System;
-using System.Diagnostics;
-using System.IO;
 using MathParser;
 
 namespace Demo
diff --git a/shunting_yard/MathParser.csproj b/shunting_yard/MathParser.csproj
@@ -93,6 +93,7 @@
     <Compile Include="src\symbol_manager\TrigonometrySymbols.cs" />
     <Compile Include="src\expressions\Value.cs" />
     <Compile Include="src\tokenizer\Identifier.cs" />
+    <Compile Include="src\parser\parselets\FixValueParselet.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. 
diff --git a/shunting_yard/src/expressions/BinaryExpressionType.cs b/shunting_yard/src/expressions/BinaryExpressionType.cs
@@ -2,10 +2,11 @@
 {
 	enum BinaryExpressionType
 	{
-		Add,
-		Sub,
-		Mul,
-		Div,
-		Pow
+		Addition,
+		Substraction,
+		Multiplication,
+		Division,
+		Power,
+		Modulo
 	}
 }
diff --git a/shunting_yard/src/parser/Associativity.cs b/shunting_yard/src/parser/Associativity.cs
@@ -15,7 +15,7 @@ static class AssociativityExtensions
 		/// is done by parsing the right hand side expression with a lower precedence.
 		/// </summary>
 		/// <returns>The precedence increment.</returns>
-		public static int ToPrecedence(this Associativity associativity)
+		public static int ToPrecedenceIncrement(this Associativity associativity)
 		{
 			switch (associativity)
 			{
diff --git a/shunting_yard/src/parser/ExpressionParser.cs b/shunting_yard/src/parser/ExpressionParser.cs
@@ -12,6 +12,8 @@ static ExpressionParser()
 		{
 			registerPrefixParselet(TokenType.Identifier, new VariableParselet());
 			registerPrefixParselet(TokenType.Numeric, new NumberParselet());
+			registerPrefixParselet(TokenType.False, new FixValueParselet(Value.Boolean(false)));
+			registerPrefixParselet(TokenType.True, new FixValueParselet(Value.Boolean(true)));
 			registerPrefixParselet(TokenType.LeftParenthesis, new GroupParselet());
 			registerPrefixParselet(TokenType.Minus, new PrefixOperatorParselet(PrefixExpressionType.Negation, Precedences.PREFIX));
 			registerPrefixParselet(TokenType.Plus, new PrefixOperatorParselet(PrefixExpressionType.Positive, Precedences.PREFIX));
@@ -21,11 +23,13 @@ static ExpressionParser()
 			registerInfixParselet(TokenType.Greater, new ComparisonParselet(ComparisonExpressionType.Bigger, Precedences.COMPARISON, Associativity.Left));
 			registerInfixParselet(TokenType.QuestionMark, new TernaryParselet());
 			registerInfixParselet(TokenType.LeftParenthesis, new CallParselet());
-			registerInfixParselet(TokenType.Plus, new BinaryOperatorParselet(BinaryExpressionType.Add, Precedences.SUM, Associativity.Left));
-			registerInfixParselet(TokenType.Minus, new BinaryOperatorParselet(BinaryExpressionType.Sub, Precedences.SUM, Associativity.Left));
-			registerInfixParselet(TokenType.Star, new BinaryOperatorParselet(BinaryExpressionType.Mul, Precedences.PRODUCT, Associativity.Left));
-			registerInfixParselet(TokenType.Slash, new BinaryOperatorParselet(BinaryExpressionType.Div, Precedences.PRODUCT, Associativity.Left));
-			registerInfixParselet(TokenType.Pow, new BinaryOperatorParselet(BinaryExpressionType.Pow, Precedences.EXPONENT, Associativity.Right));
+			registerInfixParselet(TokenType.Plus, new BinaryOperatorParselet(BinaryExpressionType.Addition, Precedences.SUM, Associativity.Left));
+			registerInfixParselet(TokenType.Minus, new BinaryOperatorParselet(BinaryExpressionType.Substraction, Precedences.SUM, Associativity.Left));
+			registerInfixParselet(TokenType.Star, new BinaryOperatorParselet(BinaryExpressionType.Multiplication, Precedences.PRODUCT, Associativity.Left));
+			registerInfixParselet(TokenType.Identifier, new BinaryOperatorParselet(BinaryExpressionType.Multiplication, Precedences.PRODUCT, Associativity.Left));
+			registerInfixParselet(TokenType.Slash, new BinaryOperatorParselet(BinaryExpressionType.Division, Precedences.PRODUCT, Associativity.Left));
+			registerInfixParselet(TokenType.Pow, new BinaryOperatorParselet(BinaryExpressionType.Power, Precedences.EXPONENT, Associativity.Right));
+			registerInfixParselet(TokenType.Percent, new BinaryOperatorParselet(BinaryExpressionType.Modulo, Precedences.PRODUCT, Associativity.Left));
 		}
 
 		static void registerPrefixParselet(TokenType tokenType, IPrefixParselet prefixParselet)
diff --git a/shunting_yard/src/parser/parselets/AssignParselet.cs b/shunting_yard/src/parser/parselets/AssignParselet.cs
@@ -7,7 +7,7 @@ class AssignParselet : IInfixParselet
 	{
 		public IExpression Parse(ParseExpressionDelegate parseExpression, TokenStream tokenStream, IExpression leftExpression)
 		{
-			IExpression rightExpression = parseExpression(tokenStream, Precedences.ASSIGNMENT + Associativity.Right.ToPrecedence());
+			IExpression rightExpression = parseExpression(tokenStream, Precedences.ASSIGNMENT + Associativity.Right.ToPrecedenceIncrement());
 
 			if (leftExpression is VariableExpression)
 			{
diff --git a/shunting_yard/src/parser/parselets/BinaryOperatorParselet.cs b/shunting_yard/src/parser/parselets/BinaryOperatorParselet.cs
@@ -14,7 +14,7 @@ public BinaryOperatorParselet(BinaryExpressionType binaryExpressionType, int pre
 
 		public IExpression Parse(ParseExpressionDelegate parseExpression, TokenStream tokenStream, IExpression leftExpression)
 		{
-			IExpression rightExpression = parseExpression(tokenStream, Precedence + _associativity.ToPrecedence());
+			IExpression rightExpression = parseExpression(tokenStream, Precedence + _associativity.ToPrecedenceIncrement());
 			return new BinaryExpression(_binaryExpressionType, leftExpression, rightExpression);
 		}
 
diff --git a/shunting_yard/src/parser/parselets/ComparisonParselet.cs b/shunting_yard/src/parser/parselets/ComparisonParselet.cs
@@ -14,7 +14,7 @@ public ComparisonParselet(ComparisonExpressionType comparisonExpressionType, int
 
 		public IExpression Parse(ParseExpressionDelegate parseExpression, TokenStream tokenStream, IExpression leftExpression)
 		{
-			IExpression rightExpression = parseExpression(tokenStream, Precedence + _associativity.ToPrecedence());
+			IExpression rightExpression = parseExpression(tokenStream, Precedence + _associativity.ToPrecedenceIncrement());
 			return new ComparisonExpression(_comparisonExpressionType, leftExpression, rightExpression);
 		}
 
diff --git a/shunting_yard/src/parser/parselets/FixValueParselet.cs b/shunting_yard/src/parser/parselets/FixValueParselet.cs
@@ -0,0 +1,17 @@
+﻿namespace MathParser
+{
+	class FixValueParselet : IPrefixParselet
+	{
+		readonly Value _value;
+
+		public FixValueParselet(Value value)
+		{
+			_value = value;
+		}
+
+		public IExpression Parse(ParseExpressionDelegate parseExpression, TokenStream tokenStream, Token token)
+		{
+			return new ValueExpression(_value);
+		}
+	}
+}
diff --git a/shunting_yard/src/parser/parselets/TernaryParselet.cs b/shunting_yard/src/parser/parselets/TernaryParselet.cs
@@ -6,7 +6,7 @@ public IExpression Parse(ParseExpressionDelegate parseExpression, TokenStream to
 		{
 			IExpression trueExpression = parseExpression(tokenStream);
 			tokenStream.Consume(TokenType.Colon);
-			IExpression falseExpression = parseExpression(tokenStream, Precedences.CONDITIONAL + Associativity.Right.ToPrecedence());
+			IExpression falseExpression = parseExpression(tokenStream, Precedences.CONDITIONAL + Associativity.Right.ToPrecedenceIncrement());
 			return new TernaryExpression(leftExpression, trueExpression, falseExpression);
 		}
 
diff --git a/shunting_yard/src/tokenizer/TokenType.cs b/shunting_yard/src/tokenizer/TokenType.cs
@@ -25,6 +25,7 @@ enum TokenType
 		GreaterOrEqual,
 		WhiteSpace,
 		True,
-		False
+		False,
+		Percent
 	}
 }
diff --git a/shunting_yard/src/tokenizer/Tokenizer.cs b/shunting_yard/src/tokenizer/Tokenizer.cs
@@ -66,7 +66,6 @@ void Advance()
 			}
 		}
 
-		bool alreadyPeeked;
 		char? Peek()
 		{
 			if (_reachedEndOfFile)
@@ -123,7 +122,7 @@ bool IsLetterOrDigit()
 
 		bool IsPunctuation()
 		{
-			return Peek().HasValue && "<>()!^*+-=/,?:".Contains(Peek().Value);
+			return Peek().HasValue && "<>()!^*+-=/%,?:".Contains(Peek().Value);
 		}
 
 		bool IsWhiteSpace()
@@ -283,6 +282,9 @@ Token ScanPunctuation()
 				case '/':
 					Consume();
 					return CreateToken(TokenType.Slash);
+				case '%':
+					Consume();
+					return CreateToken(TokenType.Percent);
 				case ',':
 					Consume();
 					return CreateToken(TokenType.Comma);
diff --git a/shunting_yard/src/visitors/EvaluationVisitor.cs b/shunting_yard/src/visitors/EvaluationVisitor.cs
@@ -48,21 +48,24 @@ public void Visit(BinaryExpression binaryExpression)
 
 				switch (binaryExpression.BinaryExpressionType)
 				{
-					case BinaryExpressionType.Add:
+					case BinaryExpressionType.Addition:
 						result = leftValue + rightValue;
 						break;
-					case BinaryExpressionType.Sub:
+					case BinaryExpressionType.Substraction:
 						result = leftValue - rightValue;
 						break;
-					case BinaryExpressionType.Mul:
+					case BinaryExpressionType.Multiplication:
 						result = leftValue * rightValue;
 						break;
-					case BinaryExpressionType.Div:
+					case BinaryExpressionType.Division:
 						result = leftValue / rightValue;
 						break;
-					case BinaryExpressionType.Pow:
+					case BinaryExpressionType.Power:
 						result = Math.Pow(leftValue, rightValue);
 						break;
+					case BinaryExpressionType.Modulo:
+						result = leftValue % rightValue;
+						break;
 					default:
 						string message = String.Format("Unhandled binary operation {0}.", binaryExpression.BinaryExpressionType);
 						throw new EvaluationException(message);
diff --git a/shunting_yard/src/visitors/PrintVisitor.cs b/shunting_yard/src/visitors/PrintVisitor.cs
@@ -26,23 +26,26 @@ public override void Visit(BinaryExpression binaryExpression)
 			string infix;
 			switch (binaryExpression.BinaryExpressionType)
 			{
-				case BinaryExpressionType.Add:
+				case BinaryExpressionType.Addition:
 					infix = "+";
 					break;
-				case BinaryExpressionType.Div:
+				case BinaryExpressionType.Division:
 					infix = "/";
 					break;
-				case BinaryExpressionType.Mul:
+				case BinaryExpressionType.Multiplication:
 					infix = "*";
 					break;
-				case BinaryExpressionType.Pow:
+				case BinaryExpressionType.Power:
 					infix = "^";
 					break;
-				case BinaryExpressionType.Sub:
+				case BinaryExpressionType.Substraction:
 					infix = "-";
 					break;
+				case BinaryExpressionType.Modulo:
+					infix = "%";
+					break;
 				default:
-					throw new ArgumentException("unhandled infix expression type");
+					throw new ArgumentException("unhandled binary expression type");
 			}
 
 			string right = _stack.Pop();

Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,11 @@`
`2`	`2`	`{`
`3`	`3`	`enum BinaryExpressionType`
`4`	`4`	`{`
`5`		`- Add,`
`6`		`- Sub,`
`7`		`- Mul,`
`8`		`- Div,`
`9`		`- Pow`
	`5`	`+ Addition,`
	`6`	`+ Substraction,`
	`7`	`+ Multiplication,`
	`8`	`+ Division,`
	`9`	`+ Power,`
	`10`	`+ Modulo`
`10`	`11`	`}`
`11`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ static class AssociativityExtensions`
`15`	`15`	`/// is done by parsing the right hand side expression with a lower precedence.`
`16`	`16`	`/// </summary>`
`17`	`17`	`/// <returns>The precedence increment.</returns>`
`18`		`- public static int ToPrecedence(this Associativity associativity)`
	`18`	`+ public static int ToPrecedenceIncrement(this Associativity associativity)`
`19`	`19`	`{`
`20`	`20`	`switch (associativity)`
`21`	`21`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ class AssignParselet : IInfixParselet`
`7`	`7`	`{`
`8`	`8`	`public IExpression Parse(ParseExpressionDelegate parseExpression, TokenStream tokenStream, IExpression leftExpression)`
`9`	`9`	`{`
`10`		`- IExpression rightExpression = parseExpression(tokenStream, Precedences.ASSIGNMENT + Associativity.Right.ToPrecedence());`
	`10`	`+ IExpression rightExpression = parseExpression(tokenStream, Precedences.ASSIGNMENT + Associativity.Right.ToPrecedenceIncrement());`
`11`	`11`
`12`	`12`	`if (leftExpression is VariableExpression)`
`13`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public BinaryOperatorParselet(BinaryExpressionType binaryExpressionType, int pre`
`14`	`14`
`15`	`15`	`public IExpression Parse(ParseExpressionDelegate parseExpression, TokenStream tokenStream, IExpression leftExpression)`
`16`	`16`	`{`
`17`		`- IExpression rightExpression = parseExpression(tokenStream, Precedence + _associativity.ToPrecedence());`
	`17`	`+ IExpression rightExpression = parseExpression(tokenStream, Precedence + _associativity.ToPrecedenceIncrement());`
`18`	`18`	`return new BinaryExpression(_binaryExpressionType, leftExpression, rightExpression);`
`19`	`19`	`}`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public ComparisonParselet(ComparisonExpressionType comparisonExpressionType, int`
`14`	`14`
`15`	`15`	`public IExpression Parse(ParseExpressionDelegate parseExpression, TokenStream tokenStream, IExpression leftExpression)`
`16`	`16`	`{`
`17`		`- IExpression rightExpression = parseExpression(tokenStream, Precedence + _associativity.ToPrecedence());`
	`17`	`+ IExpression rightExpression = parseExpression(tokenStream, Precedence + _associativity.ToPrecedenceIncrement());`
`18`	`18`	`return new ComparisonExpression(_comparisonExpressionType, leftExpression, rightExpression);`
`19`	`19`	`}`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ public IExpression Parse(ParseExpressionDelegate parseExpression, TokenStream to`
`6`	`6`	`{`
`7`	`7`	`IExpression trueExpression = parseExpression(tokenStream);`
`8`	`8`	`tokenStream.Consume(TokenType.Colon);`
`9`		`- IExpression falseExpression = parseExpression(tokenStream, Precedences.CONDITIONAL + Associativity.Right.ToPrecedence());`
	`9`	`+ IExpression falseExpression = parseExpression(tokenStream, Precedences.CONDITIONAL + Associativity.Right.ToPrecedenceIncrement());`
`10`	`10`	`return new TernaryExpression(leftExpression, trueExpression, falseExpression);`
`11`	`11`	`}`
`12`	`12`