now whitespace/no operator counts as multiplication

Author: timmi-on-rails

Demo/Program.cs

@@ -27,6 +27,7 @@ public static void Main(string[] args)
 					Value result = expressionTree.Evaluate(symbolManager);
 
 					Console.WriteLine("{0} = {1}", detail, result);
+					expressionTree.Assign(symbolManager);
 				}
 				catch (Exception exception)
 				{

shunting_yard/src/parser/ExpressionParser.cs

@@ -59,11 +59,32 @@ IExpression ParseExpression(TokenStream tokenStream, int precedence)
 			}
 			IExpression leftExpression = prefixParselet.Parse(ParseExpression, tokenStream, token);
 
-			IInfixParselet infixParselet;
-			while (_infixParselets.TryGetValue(tokenStream.Peek().TokenType, out infixParselet)
-				   	&& (precedence < infixParselet.Precedence))
+			while (true)
 			{
-				tokenStream.Consume();
+				IInfixParselet infixParselet;
+				bool isInfix = _infixParselets.TryGetValue(tokenStream.Peek().TokenType, out infixParselet);
+				if (!isInfix)
+				{
+					if (_prefixParselets.ContainsKey(tokenStream.Peek().TokenType))
+					{
+						infixParselet = _infixParselets[TokenType.Star];
+					}
+					else
+					{
+						break;
+					}
+				}
+
+				if (precedence >= infixParselet.Precedence)
+				{
+					break;
+				}
+
+				if (isInfix)
+				{
+					tokenStream.Consume();
+				}
+
 				leftExpression = infixParselet.Parse(ParseExpression, tokenStream, leftExpression);
 			}
 

shunting_yard/src/visitors/ExpressionTree.cs

@@ -21,11 +21,11 @@ public Value Evaluate(ISymbolManager symbolProvider)
 			return evaluationVisitor.GetResult();
 		}
 
-		/*public void Assign()
+		public void Assign(ISymbolManager symbolManager)
 		{
-			AssignVisitor assignVisitor = new AssignVisitor(_parser.FunctionsManager, _parser.VariablesManager);
+			AssignVisitor assignVisitor = new AssignVisitor(symbolManager);
 			_rootExpression.Accept(assignVisitor);
-		}*/
+		}
 
 		public string ToDebug()
 		{