[4.0.0]

Author: Kalashnikovni

.github/workflows/c-cpp.yml

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

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [4.0.0] - 2025-04-11
+### Added
+- Separated parser grammars for lightweight compilation.
+- New implementation of evaluator, cleaner and simpler.
+- Support of sets and pwmaps implementation switching in runtime.
+- Corrected makefiles and test folders code.
+
 ## [3.0.0] - 2024-10-09
 ### Added
 - Implemented Ordered Sets of one-dimensional, compact MDIs.

Makefile.in

@@ -1,6 +1,5 @@
-
 # Target variables
-MODE ?= Debug
+MODE ?= Release
 
 # The Directories, Source, Includes, Objects, Binary 
 ROOT   	      := .
@@ -10,8 +9,9 @@ GTEST_CODE    := $(GTEST_DIR).tar.gz
 OBJ_DIR       := $(ROOT)/obj
 BUILD_DIR    	:= $(OBJ_DIR)/release
 AST_DIR    	  := $(ROOT)/ast
+TEST_DIR    	:= $(ROOT)/test
 BIN_DIR    	  := $(ROOT)/bin
-ifeq ($(MODE),Debug)
+ifeq ($(MODE), Debug)
 BUILD_DIR    	:= $(OBJ_DIR)/debug
 endif
 prefix 			  ?= /usr/local
@@ -20,38 +20,51 @@ includedir    ?= $(prefix)/include
 libdir        ?= $(exec_prefix)/lib
 boost_libdir  ?= $(prefix)
 
+.PHONY: doc clean create-folders install install-folders lib-gtest test
+
+#///////////////////////////////////////////////////////////////////////////////
+# Compilation ------------------------------------------------------------------
+#///////////////////////////////////////////////////////////////////////////////
+
 # Flags, Libraries and Includes
 INCLUDES := -I. -I$(boost_libdir)/include
-CXXFLAGS := -std=c++17 -Wall -Werror -Wno-reorder -O2 -D BOOST_PHOENIX_STL_TUPLE_H_ -D BOOST_MPL_LIMIT_LIST_SIZE=30 -D BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
+CXXFLAGS := -std=c++17 -Wno-reorder -O3
 ifeq ($(MODE),Debug)
-CXXFLAGS 	+= -ggdb  
+CXXFLAGS 	+= -ggdb -Wall -Werror 
 endif
 LIB_SBGRAPH = lib/libsbgraph.a
 
 all: $(LIB_SBGRAPH)
 
+include util/Makefile.include
 include sbg/Makefile.include
 include parser/Makefile.include
-include util/Makefile.include
 include eval/Makefile.include
-include test/Makefile.include
 
-$(BUILD_DIR)/%.o : %.cpp
+create-folders::
+	@mkdir -p $(ROOT)/lib
+	@mkdir -p $(OBJ_DIR)
+	@mkdir -p $(BUILD_DIR)
+	@mkdir -p $(BUILD_DIR)/$(AST_DIR)
+	@mkdir -p $(BIN_DIR)
+
+$(BUILD_DIR)/%.o : %.cpp | create-folders
 	$(CC) $(INCLUDES) $(CXXFLAGS) -MM -MT $@ -MF $(patsubst %.o,%.d,$@) $<
 	$(CC) $(INCLUDES) -c $< -o $@ $(CXXFLAGS)
 
-$(LIB_SBGRAPH): create-folders $(SBG_OBJ) $(UTIL_OBJ) $(PARSER_OBJ) $(EVAL_OBJ)
-	$(AR) rcs $(LIB_SBGRAPH) $(SBG_OBJ) $(UTIL_OBJ) $(PARSER_OBJ) $(EVAL_OBJ)
+LIB_SRC := $(shell find ast parser sbg eval util -type f -name "*.cpp" ! -name "main.cpp")
+LIB_OBJ = $(addprefix $(BUILD_DIR)/, $(LIB_SRC:.cpp=.o))
 
-lib-gtest: | create-folders 
-ifeq ("$(wildcard $(3RD_PARTY_DIR)/gtest/usr/lib)","")
-	cd $(3RD_PARTY_DIR)/gtest; tar xvzf $(GTEST_CODE)
-	mkdir -p $(3RD_PARTY_DIR)/gtest/build
-	cd $(3RD_PARTY_DIR)/gtest/build; cmake ../$(GTEST_DIR) -DCMAKE_INSTALL_PREFIX=../usr  
-	cd $(3RD_PARTY_DIR)/gtest/build; make install 
-	rm -rf $(3RD_PARTY_DIR)/gtest/$(GTEST_DIR)
-	rm -rf $(3RD_PARTY_DIR)/gtest/build
-endif
+$(LIB_SBGRAPH): create-folders $(LIB_OBJ)
+	$(AR) rcs $(LIB_SBGRAPH) $(LIB_OBJ)
+
+DEPS = $(addprefix $(BUILD_DIR)/, $(LIB_SRC:.cpp=.d))
+
+-include $(DEPS)
+
+#///////////////////////////////////////////////////////////////////////////////
+# Library Installation ---------------------------------------------------------
+#///////////////////////////////////////////////////////////////////////////////
 
 install: | install-folders
 	@echo "Installing SBG library headers."
@@ -73,26 +86,41 @@ install-folders:
 	@mkdir -p $(includedir)/parser
 	@mkdir -p $(includedir)/eval
 
-create-folders::
-	@mkdir -p $(ROOT)/lib
-	@mkdir -p $(OBJ_DIR)
-	@mkdir -p $(BUILD_DIR)
-	@mkdir -p $(BUILD_DIR)/$(AST_DIR)
-	@mkdir -p $(BIN_DIR)
+#///////////////////////////////////////////////////////////////////////////////
+# Testing ----------------------------------------------------------------------
+#///////////////////////////////////////////////////////////////////////////////
+
+lib-gtest: | create-folders 
+ifeq ("$(wildcard $(3RD_PARTY_DIR)/gtest/usr/lib)","")
+	cd $(3RD_PARTY_DIR)/gtest; tar xvzf $(GTEST_CODE)
+	mkdir -p $(3RD_PARTY_DIR)/gtest/build
+	cd $(3RD_PARTY_DIR)/gtest/build; cmake ../$(GTEST_DIR) -DCMAKE_INSTALL_PREFIX=../usr  
+	cd $(3RD_PARTY_DIR)/gtest/build; make install 
+	rm -rf $(3RD_PARTY_DIR)/gtest/$(GTEST_DIR)
+	rm -rf $(3RD_PARTY_DIR)/gtest/build
+endif
+
+test: lib-gtest
+	@cd $(TEST_DIR) && ./compile_run_tests.sh
 
-.PHONY: doc
+#///////////////////////////////////////////////////////////////////////////////
+# Documentation ----------------------------------------------------------------
+#///////////////////////////////////////////////////////////////////////////////
 
 doc:
 	@mkdir -p $(ROOT)/doc
 	@mkdir -p $(ROOT)/doc/html
 	@mkdir -p $(ROOT)/doc/latex
+	doxygen eval/EVAL.doxyfile
 	doxygen sbg/SBG.doxyfile
 	doxygen util/UTIL.doxyfile
 
-test: lib-gtest $(SBG_TEST)
+#///////////////////////////////////////////////////////////////////////////////
+# Cleaning ---------------------------------------------------------------------
+#///////////////////////////////////////////////////////////////////////////////
+
+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
 	for dir in $(TEST_DIRS); do \
@@ -101,11 +129,15 @@ clean:
     $(RM) -rf $$dir/test_data; \
   done
 
+#///////////////////////////////////////////////////////////////////////////////
+# Help -------------------------------------------------------------------------
+#///////////////////////////////////////////////////////////////////////////////
+
 help:
 	@echo "make MODE=<Debug|Release> prefix=<PATH> exec_prefix=<PATH> includedir=<PATH> libdir=<PATH> boost_libdir=<PATH>"
 	@echo "Default values:"
 	@echo ""
-	@echo "MODE=Debug"
+	@echo "MODE=Release"
 	@echo "prefix=/usr/local"
 	@echo "exec_prefix=/usr/local"
 	@echo "includedir=/usr/local/include"

README.md

@@ -66,7 +66,8 @@ The simplest way to compile this package is:
 
 The makefile script accepts the following options:
 
-  * MODE = <Debug|Release> 	When set to Debug (default), adds the compiler's debug flags.
+  * MODE = <Debug|Release>  When set to Debug, adds the compiler's debug flags. Set to Release
+    by default.
 
   * prefix = <Installation prefix path> 	Set the prefix installation path, default: /usr/local.
 
@@ -96,9 +97,10 @@ The SBG library is composed by four main modules:
 
   * sbg
 
-The first three were developed to allow for more user-friendly input. The first
-three were developed to allow for more user-friendly input, and the last one
-contains all the logical implementation of structures and operations.
+The library started with only sbg module, but then it was extended with the
+other three to enable faster debugging. While not necessary for client
+applications, these optional tools are useful to grasp SBG concepts and
+operations. 
 
 ## Examples:			   
 
@@ -117,6 +119,13 @@ Report bugs to: marzorati@cifasis-conicet.gov.ar or fernandez@cifasis-conicet.go
 
 # Changelog
 
+## [4.0.0] - 2025-04-11
+### Added
+- Separated parser grammars for lightweight compilation.
+- New implementation of evaluator, cleaner and simpler.
+- Support of sets and pwmaps implementation switching in runtime.
+- Corrected makefiles and test folders code.
+
 ## [3.0.0] - 2024-10-09
 ### Added
 - Implemented Ordered Sets of one-dimensional, compact MDIs.