From f40556afabbb393cede9f81576b6765c350683c2 Mon Sep 17 00:00:00 2001
From: Rene Gollent <rene@gollent.com>
Date: Sat, 1 Nov 2014 16:42:49 -0400
Subject: [PATCH] Debugger: Cleanups, no functional change.

---
 .../CLanguageExpressionEvaluator.cpp          | 35 ++-----------------
 .../CLanguageExpressionEvaluator.h            |  1 -
 2 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/src/apps/debugger/source_language/expression_evaluators/CLanguageExpressionEvaluator.cpp b/src/apps/debugger/source_language/expression_evaluators/CLanguageExpressionEvaluator.cpp
index 8d4305acd9..4d6574e722 100644
--- a/src/apps/debugger/source_language/expression_evaluators/CLanguageExpressionEvaluator.cpp
+++ b/src/apps/debugger/source_language/expression_evaluators/CLanguageExpressionEvaluator.cpp
@@ -363,7 +363,6 @@ class CLanguageExpressionEvaluator::Tokenizer {
 			}
 		}
 
-//printf("next token: '%s'\n", fCurrentToken.string.String());
 		return fCurrentToken;
 	}
 
@@ -569,7 +568,7 @@ CLanguageExpressionEvaluator::Evaluate(const char* expressionString,
 	fTokenizer->SetType(type);
 	fTokenizer->SetTo(expressionString);
 
-	Number value = _ParseBinary();
+	Number value = _ParseSum();
 	Token token = fTokenizer->NextToken();
 	if (token.type != TOKEN_END_OF_LINE)
 		throw ParseException("parse error", token.position);
@@ -578,37 +577,9 @@ CLanguageExpressionEvaluator::Evaluate(const char* expressionString,
 }
 
 
-Number
-CLanguageExpressionEvaluator::_ParseBinary()
-{
-	return _ParseSum();
-	// binary operation appearantly not supported by m_apm library,
-	// should not be too hard to implement though....
-
-//	double value = _ParseSum();
-//
-//	while (true) {
-//		Token token = fTokenizer->NextToken();
-//		switch (token.type) {
-//			case TOKEN_AND:
-//				value = (uint64)value & (uint64)_ParseSum();
-//				break;
-//			case TOKEN_OR:
-//				value = (uint64)value | (uint64)_ParseSum();
-//				break;
-//
-//			default:
-//				fTokenizer->RewindToken();
-//				return value;
-//		}
-//	}
-}
-
-
 Number
 CLanguageExpressionEvaluator::_ParseSum()
 {
-	// TODO: check isnan()...
 	Number value = _ParseProduct();
 
 	while (true) {
@@ -896,7 +867,7 @@ CLanguageExpressionEvaluator::_ParseAtom()
 
 	_EatToken(TOKEN_OPENING_BRACKET);
 
-	Number value = _ParseBinary();
+	Number value = _ParseSum();
 
 	_EatToken(TOKEN_CLOSING_BRACKET);
 
@@ -1069,5 +1040,3 @@ CLanguageExpressionEvaluator::_CoerceTypeIfNeeded(const Token& token,
 
 	_number.SetTo(value);
 }
-
-
diff --git a/src/apps/debugger/source_language/expression_evaluators/CLanguageExpressionEvaluator.h b/src/apps/debugger/source_language/expression_evaluators/CLanguageExpressionEvaluator.h
index 14e22e5859..bd5f414a17 100644
--- a/src/apps/debugger/source_language/expression_evaluators/CLanguageExpressionEvaluator.h
+++ b/src/apps/debugger/source_language/expression_evaluators/CLanguageExpressionEvaluator.h
@@ -67,7 +67,6 @@ class CLanguageExpressionEvaluator {
 			class Tokenizer;
 
  private:
-			Number				_ParseBinary();
 			Number				_ParseSum();
 			Number				_ParseProduct();
 			Number				_ParsePower();