Parser debugging and restructure

Author: Kalashnikovni

.github/workflows/c-cpp.yml

@@ -27,7 +27,7 @@ jobs:
       run: |
         autoconf
         ./configure 
-        make
+        make MODE=Release
 
     - name: Tests
       working-directory: ./

Makefile.in

@@ -1,4 +1,3 @@
-
 # Target variables
 MODE ?= Debug
 
@@ -11,7 +10,7 @@ OBJ_DIR       := $(ROOT)/obj
 BUILD_DIR    	:= $(OBJ_DIR)/release
 AST_DIR    	  := $(ROOT)/ast
 BIN_DIR    	  := $(ROOT)/bin
-ifeq ($(MODE),Debug)
+ifeq ($(MODE), Debug)
 BUILD_DIR    	:= $(OBJ_DIR)/debug
 endif
 prefix 			  ?= /usr/local
@@ -24,16 +23,16 @@ boost_libdir  ?= $(prefix)
 INCLUDES := -I. -I$(boost_libdir)/include
 CXXFLAGS := -std=c++17 -Wall -Werror -Wno-reorder -O3 -D BOOST_PHOENIX_STL_TUPLE_H_ -D BOOST_MPL_LIMIT_LIST_SIZE=30 -D BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
 ifeq ($(MODE),Debug)
-CXXFLAGS 	+= -ggdb  
+CXXFLAGS 	+= -ggdb
 endif
 LIB_SBGRAPH = lib/libsbgraph.a
 
 all: $(LIB_SBGRAPH)
 
 include sbg/Makefile.include
 include parser/Makefile.include
-include eval/Makefile.include
-include test/Makefile.include
+#include eval/Makefile.include
+#include test/Makefile.include
 
 $(BUILD_DIR)/%.o : %.cpp
 	$(CC) $(INCLUDES) $(CXXFLAGS) -MM -MT $@ -MF $(patsubst %.o,%.d,$@) $<
@@ -91,7 +90,7 @@ doc:
 
 test: lib-gtest $(SBG_TEST)
 
-TEST_DIRS         := test/parser test/performance test/performance/boost test/eval
+TEST_DIRS := test/parser test/performance test/performance/boost test/eval
 
 clean:
 	$(RM) -rf $(BIN_DIR) $(OBJ_DIR) $(LIB_SBGRAPH) $(ROOT)/lib $(ROOT)/include $(3RD_PARTY_DIR)/gtest/usr

ast/expr.cpp

@@ -304,7 +304,7 @@ std::ostream &operator<<(std::ostream &out, const DSBG &g)
 std::ostream &operator<<(std::ostream &out, const UnOp &op)
 {
   switch (op) {
-    case UnOp::neg:
+    case UnOp::oppo:
       out << "-";
       break;
 

ast/expr.hpp

@@ -218,7 +218,7 @@ std::ostream &operator<<(std::ostream &out, const DSBG &g);
 // Composite expressions -------------------------------------------------------
 ////////////////////////////////////////////////////////////////////////////////
 
-enum class UnOp { neg, card, comp };
+enum class UnOp { oppo, card, comp };
 std::ostream &operator<<(std::ostream &out, const UnOp &op);
 
 struct UnaryOp {

parser/Makefile.include

@@ -8,6 +8,7 @@ all: $(PARSER)
 
 PARSER_SRC := \
 	  $(PARSER_DIR)/main.cpp \
+	  $(PARSER_DIR)/parser.cpp \
     $(AST_DIR)/expr.cpp \
     $(PARSER_DIR)/expr.cpp \
     $(AST_DIR)/statement.cpp \

parser/README.md

@@ -1,3 +1,6 @@
 # Set-Based Graph Parser
 
-This module was intended to provide the user with a tool that would allow for easy testing of the library. Currently, when compiled, the executable /parser/sbg-parser is created that allows files as input. Many test cases are presented in the /test folder. 
+The SBG library started with only the /sbg directory. Then the project was
+extended with a parser and evaluator to test algorithms independently of any
+client application. As such, to make use of the SBG algorithms this module is
+not necessary, but a developing tool used for debugging.