Makefile for parser

Author: Kalashnikovni

Makefile.in

@@ -50,8 +50,11 @@ $(BUILD_DIR)/%.o : %.cpp | create-folders
 	$(CC) $(INCLUDES) $(CXXFLAGS) -MM -MT $@ -MF $(patsubst %.o,%.d,$@) $<
 	$(CC) $(INCLUDES) -c $< -o $@ $(CXXFLAGS)
 
-$(LIB_SBGRAPH): create-folders $(UTIL_OBJ) $(SBG_OBJ) $(PARSER_OBJ) $(EVAL_OBJ)
-	$(AR) rcs $(LIB_SBGRAPH) $(UTIL_OBJ) $(SBG_OBJ) $(PARSER_OBJ) $(EVAL_OBJ)
+LIB_SRC := $(shell find ast parser sbg eval util -type f -name "*.cpp")
+LIB_OBJ = $(addprefix $(BUILD_DIR)/, $(LIB_SRC:.cpp=.o))
+
+$(LIB_SBGRAPH): create-folders $(LIB_OBJ)
+	$(AR) rcs $(LIB_SBGRAPH) $(LIB_OBJ)
 
 #///////////////////////////////////////////////////////////////////////////////
 # Library Installation ---------------------------------------------------------
@@ -92,7 +95,7 @@ ifeq ("$(wildcard $(3RD_PARTY_DIR)/gtest/usr/lib)","")
 endif
 
 test: lib-gtest
-	@cd $(TEST_DIR) && make
+	@cd $(TEST_DIR) && ./compile_run_tests.sh
 
 #///////////////////////////////////////////////////////////////////////////////
 # Documentation ----------------------------------------------------------------

eval/visitors/eval_expr.cpp

@@ -184,12 +184,12 @@ auto diff_visitor_ = Overload{
 };
 
 auto empty_visitor_ = Overload {
-  [](LIB::Interval a) { return a.isEmpty(); },
-  [](LIB::MultiDimInter a) { return a.isEmpty(); },
-  [](LIB::Set a) { return a.isEmpty(); },
+  [](LIB::Interval a) { return Boolean(a.isEmpty()); },
+  [](LIB::MultiDimInter a) { return Boolean(a.isEmpty()); },
+  [](LIB::Set a) { return Boolean(a.isEmpty()); },
   [](auto a) { 
     Util::ERROR("empty_visitor_: wrong argument ", a, " for isEmpty\n"); 
-    return false;
+    return Boolean();
   }
 };
 
@@ -556,25 +556,20 @@ ExprBaseType EvalExpression::operator()(AST::Call v) const
       case Eval::Func::empty: 
         if (eval_args.size() == 1) {
           arity_ok = true;
-
-          bool res = std::visit(empty_visitor_, eval_args[0]);
-          return LIB::MD_NAT(res);
+          return std::visit(empty_visitor_, eval_args[0]);
         }
         break;
 
       case Eval::Func::min:
         if (eval_args.size() == 1) {
           arity_ok = true;
-
-          LIB::MD_NAT result = std::visit(min_visitor_, eval_args[0]);
-          return result;
+          return std::visit(min_visitor_, eval_args[0]);
         }
         break;
 
       case Eval::Func::max:
         if (eval_args.size() == 1) {
           arity_ok = true;
-
           return std::visit(max_visitor_, eval_args[0]);
         }
         break;

parser/expr_def.hpp

@@ -20,7 +20,9 @@
 #ifndef EXPR_DEF_PARSER_HPP
 #define EXPR_DEF_PARSER_HPP
 
-#include <boost/phoenix.hpp>
+#include <boost/phoenix/core.hpp>
+#include <boost/phoenix/operator.hpp>
+#include <boost/phoenix/object.hpp>
 
 #include "ast/expr.hpp"
 #include "sbg/rational.hpp"

parser/sbg_program_def.hpp

@@ -20,7 +20,9 @@
 #ifndef PROGRAM_DEF_PARSER_HPP
 #define PROGRAM_DEF_PARSER_HPP
 
-#include <boost/phoenix.hpp>
+#include <boost/phoenix/core.hpp>
+#include <boost/phoenix/operator.hpp>
+#include <boost/phoenix/object.hpp>
 
 #include "ast/sbg_program.hpp"
 

parser/statement_def.hpp

@@ -20,7 +20,10 @@
 #ifndef STATEMENT_DEF_PARSER_HPP
 #define STATEMENT_DEF_PARSER_HPP
 
-#include <boost/phoenix.hpp>
+#include <boost/phoenix/stl/container.hpp>
+#include <boost/phoenix/core.hpp>
+#include <boost/phoenix/operator.hpp>
+#include <boost/phoenix/object.hpp>
 
 #include "ast/statement.hpp"
 

test/parser/Makefile

@@ -34,19 +34,24 @@ TEST_P(ParserTests, Parser)
 {
   const std::string NAME = GetParam();
   std::cout << "Testing program: " << NAME << std::endl;
-  const std::string PARSER_CMD = "./compile_and_run.sh " + NAME;
-  const std::string RESULT_FILE = "./test_data/" + NAME + "/" + NAME + ".passed";
-  const std::string TEST_CMD = "./results.sh " + NAME;
 
+  const std::string TEST_DIR = "./test_data/" + NAME;
+  const std::string DIR_CMD = "mkdir -p " + TEST_DIR;
+  std::system(DIR_CMD.c_str());
+  const std::string PARSER_CMD = "../../bin/sbg-parser -f ../" + NAME
+    + ".test > " + TEST_DIR + "/SBG.log 2>&1";
   std::system(PARSER_CMD.c_str());
+  const std::string TEST_CMD = "./results.sh " + NAME;
   std::system(TEST_CMD.c_str());
 
+  const std::string RESULT_FILE = "./test_data/" + NAME + "/" + NAME + ".passed";
   std::ifstream result(RESULT_FILE.c_str());
   EXPECT_TRUE(result.good());
 }
 
 const char* parser_program[] = {"arithmetic", "interval", "set", "lexp", "map"};
 
-INSTANTIATE_TEST_SUITE_P(ParserInst, ParserTests, testing::ValuesIn(parser_program));
+INSTANTIATE_TEST_SUITE_P(ParserInst, ParserTests
+  , testing::ValuesIn(parser_program));
 
 /// @}