From 9ceae7c5c2756cbfd1bca2d06969fb1cad5c63c6 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Tue, 28 Jun 2011 00:47:28 -0400 Subject: [PATCH] Expressions - Eliminated % modulus operator - who cares? - Found a potential problem with argv[0]. --- src/Arguments.cpp | 4 ++-- src/Expression.cpp | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/Arguments.cpp b/src/Arguments.cpp index a240abaa8..5807d9c4f 100644 --- a/src/Arguments.cpp +++ b/src/Arguments.cpp @@ -119,7 +119,7 @@ static struct // { "-", 15, 'u', 1, 'r' }, // Unary minus { "*", 13, 'b', 1, 'l' }, // Multiplication { "/", 13, 'b', 1, 'l' }, // Division - { "%", 13, 'b', 1, 'l' }, // Modulus +// { "%", 13, 'b', 1, 'l' }, // Modulus { "+", 12, 'b', 1, 'l' }, // Addition { "-", 12, 'b', 1, 'l' }, // Subtraction { "<", 10, 'b', 1, 'l' }, // Less than @@ -288,7 +288,7 @@ void Arguments::categorize () // program else if (arg == this->begin ()) { - arg->second = "program"; + arg->second = "program"; // TODO Is this a problem for expressions that do not contain a program name? } // command diff --git a/src/Expression.cpp b/src/Expression.cpp index 95656f0a0..17ca29027 100644 --- a/src/Expression.cpp +++ b/src/Expression.cpp @@ -29,7 +29,6 @@ #include #include #include -#include #include #include #include @@ -336,11 +335,6 @@ bool Expression::eval (Task& task) value_stack.push_back (left); } - else if (arg->first == "%") - { - // TODO Implement modulus. - } - else if (arg->first == "+") { left = left + right;