Fixed empty expression list bug

antoniojkim · Jul 22, 2020 · db50298 · db50298
1 parent 651f906
commit db50298
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/MathEngine/Makefile b/MathEngine/Makefile
@@ -1,7 +1,7 @@
 CXX := g++
 
 mode := release
-optflag.release := -Ofast
+optflag.release := -Ofast -g
 optflag.debug := -g
 OPT_FLAG := ${optflag.${mode}}
 

diff --git a/MathEngine/Parser/modifiedShuntingYard.cc b/MathEngine/Parser/modifiedShuntingYard.cc
@@ -89,6 +89,9 @@ expression postfix_to_expression(FixedStack<Token*>& outputStack){
                 }
                 continue;
             case RPAREN:
+                if (expressionLists.empty()){
+                    throw Exception("Cannot construct Tuple from empty list of expressions");
+                }
                 if (!expressionStacks.back().empty()){
                     expressionLists.back().emplace_back(expressionStacks.back().pop());
                     if (!expressionStacks.back().empty()){

diff --git a/MathEngine/Utils/FixedStack.h b/MathEngine/Utils/FixedStack.h
@@ -75,8 +75,18 @@ class FixedStack { // Fixed Size Stack
             }
             fs.clear();
         }
-        T& peek(){ return data[tail-1]; }
-        T pop(){ return data[--tail]; }
+        T& peek(){
+            if (tail == 0){
+                throw std::out_of_range("FixedStack::peek out of range");
+            }
+            return data[tail-1];
+        }
+        T pop(){
+            if (tail == 0){
+                throw std::out_of_range("FixedStack::pop out of range");
+            }
+            return data[--tail];
+        }
         void clear(){ tail = 0; }
 
         T* begin(){ return data.get(); }

diff --git a/Tests/Tests/SyntaxTests/syntaxTests.cc b/Tests/Tests/SyntaxTests/syntaxTests.cc
@@ -14,4 +14,9 @@ TEST_CASE("Syntax Error Tests", "[syntax]" ) {
     requireErrorIsEqual("{{", "Matrix must be two dimensional");
 
     requireErrorIsEqual("TEST(3)", "Invalid Function: TEST");
+
+    requireErrorIsEqual("integral(e^(-", "Cannot construct Tuple from empty list of expressions");
+    requireErrorIsEqual("integral(e^(-x", "integral: non-default argument follows default argument");
+    requireErrorIsEqual("integral(e^(-x^", "Insufficient Number of Arguments for Binary Operator: ^");
+    requireErrorIsEqual("integral(e^(-x^2", "integral: non-default argument follows default argument");
 }