Merge branch 'master' into 'master'

stack_underflow_error

See merge request !19

test/test.cpp

@@ -52,12 +52,12 @@ TEST_CASE( "Basic power function test", "[calc]") {
 }
 
 TEST_CASE( "Stack underflow exception test", "[calc]") {
-//   REQUIRE_THROWS( evaluate("40*/") );
-//   REQUIRE_THROWS( evaluate("14--") );
-//   REQUIRE_THROWS( evaluate("1+1") );
-//   REQUIRE_THROWS( evaluate("+11") );
-//   REQUIRE_THROWS( evaluate("11+3-+4") );
-//   REQUIRE_THROWS( evaluate("11/3*+4") );
+//   REQUIRE_THROWS( evaluate("40*/") , std::stack_underflow_error );
+//   REQUIRE_THROWS( evaluate("14--") , std::stack_underflow_error );
+//   REQUIRE_THROWS( evaluate("1+1") , std::stack_underflow_error );
+//   REQUIRE_THROWS( evaluate("+11") , std::stack_underflow_error );
+//   REQUIRE_THROWS( evaluate("11+3-+4") , std::stack_underflow_error );
+//   REQUIRE_THROWS( evaluate("11/3*+4") , std::stack_underflow_error );
 }