Modified evaluator

Author: Kalashnikovni

Makefile.in

@@ -31,7 +31,7 @@ all: $(LIB_SBGRAPH)
 
 include sbg/Makefile.include
 include parser/Makefile.include
-#include eval/Makefile.include
+include eval/Makefile.include
 #include test/Makefile.include
 
 $(BUILD_DIR)/%.o : %.cpp

ast/statement.cpp

@@ -39,7 +39,7 @@ std::ostream &operator<<(std::ostream &out, const Assign &asgn)
 ConfigDims::ConfigDims() : nmbr_dims_() {}
 ConfigDims::ConfigDims(LIB::NAT nmbr_dims) : nmbr_dims_() {
   if (nmbr_dims > 0)
-    set_nmbr_dims(nmbr_dims);
+    nmbr_dims_ = nmbr_dims;
 
   else
     Util::ERROR("ConfigDims: dimension should be greater than 0\n");

eval/Makefile.include

@@ -14,15 +14,7 @@ EVAL_SRC := \
     $(VISIT_DIR)/program_visitor.cpp \
     $(VISIT_DIR)/stm_visitor.cpp \
     $(VISIT_DIR)/eval_expr.cpp \
-    $(VISIT_DIR)/eval_dsbg.cpp \
-    $(VISIT_DIR)/eval_sbg.cpp \
-    $(VISIT_DIR)/eval_pw.cpp \
-    $(VISIT_DIR)/eval_map.cpp \
-    $(VISIT_DIR)/eval_mdle.cpp \
     $(VISIT_DIR)/eval_le.cpp \
-    $(VISIT_DIR)/eval_set.cpp \
-    $(VISIT_DIR)/eval_mdi.cpp \
-    $(VISIT_DIR)/eval_interval.cpp \
     $(VISIT_DIR)/eval_rat.cpp \
     $(VISIT_DIR)/eval_int.cpp \
     $(VISIT_DIR)/eval_nat.cpp \

eval/defs.cpp

@@ -23,6 +23,22 @@ namespace SBG {
 
 namespace Eval {
 
+// Types -----------------------------------------------------------------------
+
+Boolean::Boolean() : b_() {}
+Boolean::Boolean(bool b) : b_(b) {}
+
+std::ostream &operator<<(std::ostream &out, const Boolean &b)
+{
+  if (b.b_)
+    out << "true";
+
+  else
+    out << "false";
+
+  return out;
+}
+
 // Environments ----------------------------------------------------------------
 
 VarEnv::VarEnv() : mapping_() {}

eval/defs.hpp

@@ -40,7 +40,17 @@ namespace Eval {
 
 // Type definitions ------------------------------------------------------------
 
-typedef std::variant<LIB::MD_NAT
+struct Boolean {
+  bool b_;
+
+  Boolean();
+  Boolean(bool b);
+};
+std::ostream &operator<<(std::ostream &out, const Boolean &b);
+
+typedef std::variant<Boolean
+  , LIB::NAT
+  , LIB::MD_NAT
   , LIB::RATIONAL
   , LIB::Interval
   , LIB::SetPiece

eval/main.cpp

@@ -83,7 +83,7 @@ void parseEvalProgramFromFile(std::string fname, Impl impl, bool debug)
         break;
     }
 
-    SBG::Eval::ProgramVisitor program_visit(fact, debug); 
+    SBG::Eval::ProgramVisitor program_visit(*fact, debug); 
     SBG::Eval::ProgramIO visit_result = boost::apply_visitor(
       program_visit, parser_result
     );