Upload WizToolKit v2.1.0

Author: redbow-kimee

.gitignore

@@ -6,3 +6,5 @@ src/deps/deps.success
 **/dist/
 tests/**/temp.out
 *.html
+__pycache__/
+result

.gitlab-ci.yml

@@ -1,40 +1,67 @@
-# Copyright (C) 2021 Stealth Software Technologies, Inc.
+# Copyright (C) 2021-2022 Stealth Software Technologies, Inc.
 # FOR SIEVE PROGRAM USE ONLY
 
 test-ubuntu-18:
-  tags: [shared, t3-xlarge]
   image: registry.stealthsoftwareinc.com/stealth/builder-images/ubuntu:18.04
   script:
     - make BUILD_TYPE=CI test
     - make clean
     - make BUILD_TYPE=CI CXX=clang++ test
+    - make regression-test
+
 test-ubuntu-20:
   image: registry.stealthsoftwareinc.com/stealth/builder-images/ubuntu:20.04
   script:
     - make BUILD_TYPE=CI test
     - make clean
     - make BUILD_TYPE=CI CXX=clang++ test
+    - make regression-test
+
 test-centos-stream8:
   image: registry.stealthsoftwareinc.com/stealth/builder-images/centos:stream8
   script:
     - make BUILD_TYPE=CI test
     - make clean
     - make BUILD_TYPE=CI CXX=clang++ test
+    - make regression-test
+
 test-rockylinux-8:
   image: registry.stealthsoftwareinc.com/stealth/builder-images/rockylinux:8
   script:
     - make BUILD_TYPE=CI test
     - make clean
     - make BUILD_TYPE=CI CXX=clang++ test
+    - make regression-test
+
 test-centos-7:
   image: registry.stealthsoftwareinc.com/stealth/builder-images/centos:7
   script:
     - make ENABLE_ANTLR=0 CMAKE_CMD=cmake3 BUILD_TYPE=CI test
+    - PYTHONPATH="src/main/python" python3 src/test/python/regression_tests.py
+
+test-nixos:
+  image: registry.stealthsoftwareinc.com/stealth/wiztoolkit/wtk-nix
+  script:
+    - nix-build
+    - 'nix-shell -p "python3.withPackages(ps: with ps; [numpy])" --run "PYTHONPATH=src/main/python python3 src/test/python/regression_tests.py result/bin/"'
+
 static-analysis-centos-stream8:
   image: registry.stealthsoftwareinc.com/stealth/builder-images/centos:stream8
   script:
     - make static-analysis
+
 static-analysis-rockylinux-8:
   image: registry.stealthsoftwareinc.com/stealth/builder-images/rockylinux:8
   script:
     - make static-analysis
+
+pages:
+  image: registry.stealthsoftwareinc.com/kimee/stealth-pages-theme
+  script:
+    - cd pages/
+    - ./_scripts/download_content.sh
+    - jekyll build -d ../public
+  artifacts:
+    paths:
+      - public
+  when: manual

CMakeLists.txt

@@ -1,37 +1,26 @@
-cmake_minimum_required(VERSION 3.0)
-project(wiztoolkit)
+cmake_minimum_required(VERSION 3.1)
+project(wiztoolkit VERSION 2.0.0)
 
-if(${ENABLE_ANTLR} EQUAL 0)
-  set(ANTLR_CXX_FLAGS "")
-else()
-  set(ANTLR_CXX_FLAGS " \
-    -Wno-conversion \
-    -Wno-unknown-pragmas \
-    -Wno-attributes \
-    -Wno-implicit-fallthrough")
-endif()
-
-if(${ENABLE_FLATBUFFER} EQUAL 0)
-  set(FLATBUFFER_CXX_FLAGS "")
-else()
-  set(FLATBUFFER_CXX_FLAGS " \
-    -Wno-conversion")
-endif()
+set(CMAKE_CXX_EXTENSIONS OFF)
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 set(CMAKE_CXX_FLAGS_RELEASE " -DNDEBUG -O2 -Werror ")
-set(CMAKE_CXX_FLAGS_PROFILE " -DNDEBUG -pg -O2 -Werror ")
-set(CMAKE_CXX_FLAGS_CI " -Werror ")
-set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} \
-  --std=c++11 \
-  -Wall \
-  -Wextra \
-  -Wconversion \
-  -Wcast-align \
-  ${ANTLR_CXX_FLAGS} \
-  ${FLATBUFFER_CXX_FLAGS} \
-  -DENABLE_ANTLR=${ENABLE_ANTLR} \
-  -DENABLE_FLATBUFFER=${ENABLE_FLATBUFFER} \
-  ")
+set(CMAKE_CXX_FLAGS_DEBUG " -O0 -g -DLOG_OPT_FILE_LINE " )
+set(CMAKE_CXX_FLAGS_CI " -O1 -Werror ")
+
+
+list(APPEND wtk_cxx_flags
+  -Wall
+  -Wextra
+  -Wconversion
+  -Wsign-conversion
+  -Wcast-align
+)
+
+if(${ENABLE_FLATBUFFER} EQUAL 1)
+  list(APPEND wtk_cxx_flags -Wno-sign-conversion)
+endif()
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 	if(NOT DEFINED OPENSSL_ROOT_DIR)
@@ -47,16 +36,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 	endif()
 endif()
 
-
-if(${ENABLE_ANTLR} EQUAL 1)
-  FILE(GLOB gen_antlr_cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/target/generated/wtk/antlr/*.cpp
-  )
-
-  FILE(GLOB gen_antlr_h
-    ${CMAKE_CURRENT_SOURCE_DIR}/target/generated/wtk/antlr/*.h
-  )
-endif()
+find_package(OpenSSL REQUIRED)
 
 FILE(GLOB gen_irregular_cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/target/generated/wtk/irregular/*.cpp
@@ -72,4 +52,9 @@ if(${ENABLE_FLATBUFFER} EQUAL 1)
   )
 endif()
 
-add_subdirectory(src)
+add_subdirectory(src/deps)
+add_subdirectory(src/main/cpp)
+
+if(${ENABLE_GTEST} EQUAL 1)
+  add_subdirectory(src/test/cpp)
+endif()

Makefile

@@ -5,32 +5,37 @@ GEN_DIR=$(TARGET_DIR)/generated
 BUILD_DIR=$(TARGET_DIR)/build
 DEPS_DIR=$(SRC_DIR)/deps
 
-ANTLR_TOOL=java -jar $(DEPS_DIR)/antlr4/antlr-tool.jar -Dlanguage=Cpp -no-visitor -no-listener
-FLATC_TOOL=$(DEPS_DIR)/flatbuffer/build/flatc --cpp --cpp-std c++11
 CMAKE_CMD=cmake
 CMAKE_GENERATOR=Unix Makefiles
 MAKE_CMD=make
 CXX=g++
 BUILD_TYPE=Release
 
+ENABLE_FLATBUFFER=1
+ENABLE_GTEST=1
+
 PREFIX=/usr/local
 
-ENABLE_ANTLR=1
-ENABLE_FLATBUFFER=1
+ifeq ($(ENABLE_GTEST), 0)
 
 test: build
-	cd target/build/src/test/cpp/ && ./wtk-test
-	python3 -u src/main/python/test_suite.py
 
-static-analysis: | configure
-	cd $(BUILD_DIR) && $(MAKE_CMD) static-analysis
+else
+
+test: build ${BUILD_DIR}/src/test/cpp/wtk-test
+	${BUILD_DIR}/src/test/cpp/wtk-test
+
+endif
 
 build: gen_parser | configure $(BUILD_DIR)
 	cd $(BUILD_DIR) && $(MAKE_CMD) -j4
 	cp $(BUILD_DIR)/src/main/cpp/wtk-* $(TARGET_DIR)/
-	echo 'success' > $(BUILD_DIR)/build.success
 
-configure: | $(TARGET_DIR)/configure.success
+static-analysis: | configure
+	cd $(BUILD_DIR) && $(MAKE_CMD) static-analysis
+
+regression-test: build
+	PYTHONPATH=src/main/python python3 src/test/python/regression_tests.py
 
 ifeq ($(ENABLE_FLATBUFFER), 0)
 FLATBUFFER_CONFIG=""
@@ -42,66 +47,28 @@ FLATBUFFER_CONFIG= \
   -DFLATBUFFERS_BUILD_SHAREDLIB=OFF
 endif
 
+configure: | $(TARGET_DIR)/configure.success
+
 $(TARGET_DIR)/configure.success: | gen_parser $(BUILD_DIR)
 	cd $(BUILD_DIR) && \
 		$(CMAKE_CMD) -G "$(CMAKE_GENERATOR)" \
-			-DCMAKE_BUILD_TYPE=$(BUILD_TYPE) \
-			-DCMAKE_CXX_COMPILER=$(shell which $(CXX)) \
-			-DCMAKE_INSTALL_PREFIX=$(PREFIX) \
-			-DENABLE_ANTLR=$(ENABLE_ANTLR) \
-			-DENABLE_FLATBUFFER=$(ENABLE_FLATBUFFER) \
-			-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-			$(FLATBUFFER_CONFIG) \
-			$(BASE_DIR) \
+		-DCMAKE_BUILD_TYPE="$(BUILD_TYPE)" \
+		-DCMAKE_CXX_COMPILER=$(shell which $(CXX)) \
+		-DCMAKE_INSTALL_PREFIX=$(PREFIX) \
+		-DENABLE_FLATBUFFER=$(ENABLE_FLATBUFFER) \
+		-DENABLE_GTEST=$(ENABLE_GTEST) \
+		-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
+		$(FLATBUFFER_CONFIG) \
+		$(BASE_DIR) \
 	;
 	echo 'success' > $(TARGET_DIR)/configure.success
 
-install:
-	cd $(BUILD_DIR) && $(MAKE_CMD) install
-
-clean:
-	rm -rf $(TARGET_DIR)
-
-deps-clean: clean
-	cd $(DEPS_DIR) && \
-	rm -rf */ && \
-	rm -f deps.success
-
-deps: | $(DEPS_DIR)/deps.success
-
-$(DEPS_DIR)/deps.success: | $(DEPS_DIR)
-	cd $(DEPS_DIR) && \
-		mkdir -p sst_bignum && \
-		cd sst_bignum && \
-		../sst_bignum_only.sh
-	cd $(DEPS_DIR) && \
-	./antlr4-install.sh $(ENABLE_ANTLR) && \
-	./gtest-install.sh && \
-	./logging-install.sh && \
-	./flatbuffer-install.sh $(ENABLE_FLATBUFFER) $(CMAKE_CMD) && \
-	echo 'success' > deps.success
-
-gen_parser: deps \
-	$(GEN_DIR)/wtk/irregular/Automatas.h \
-	gen_antlr \
-	gen_flatbuffer
-
-ifeq ($(ENABLE_ANTLR), 0)
-
-gen_antlr:
-	true
-
-else
-
-gen_antlr: $(GEN_DIR)/wtk/antlr/SIEVEIRParser.h
-
-$(GEN_DIR)/wtk/antlr/SIEVEIRParser.h: \
-	src/main/g4/SIEVEIR.g4 \
-	| $(GEN_DIR)/wtk/antlr
-	cd src/main/g4 && \
-		$(ANTLR_TOOL) -package wtk_gen_antlr -o $(GEN_DIR)/wtk/antlr SIEVEIR.g4
+gen_parser: deps $(GEN_DIR)/wtk/irregular/automatas.i.h gen_flatbuffer
 
-endif
+$(GEN_DIR)/wtk/irregular/automatas.i.h: src/main/python/automatagen.py \
+	src/main/python/dfa.py \
+	| $(GEN_DIR)/wtk/irregular
+	python3 src/main/python/automatagen.py
 
 ifeq ($(ENABLE_FLATBUFFER), 0)
 
@@ -112,36 +79,57 @@ else
 
 gen_flatbuffer: $(GEN_DIR)/wtk/flatbuffer/sieve_ir_generated.h
 
+FLATC_TOOL=$(DEPS_DIR)/flatbuffer/build/flatc --cpp --cpp-std c++11
+
 $(GEN_DIR)/wtk/flatbuffer/sieve_ir_generated.h: \
 	$(SRC_DIR)/main/fbs/sieve_ir.fbs \
 	| $(GEN_DIR)/wtk/flatbuffer
-	cd $(GEN_DIR)/wtk/flatbuffer/ && \
+	cd $(GEN_DIR)/wtk/flatbuffer && \
 		$(FLATC_TOOL) $(SRC_DIR)/main/fbs/sieve_ir.fbs
 
+$(GEN_DIR)/wtk/flatbuffer: | $(GEN_DIR)
+	mkdir -p $(GEN_DIR)/wtk/flatbuffer/
+
 endif
 
-$(GEN_DIR)/wtk/irregular/Automatas.h: \
-	src/main/python/automatagen.py \
-	| $(GEN_DIR)/wtk/irregular
-	python3 src/main/python/automatagen.py
+$(DEPS_DIR):
+	mkdir -p $(DEPS_DIR)
+
+$(BUILD_DIR): | $(TARGET_DIR)
+	mkdir -p $(BUILD_DIR)
 
 $(TARGET_DIR):
 	mkdir -p $(TARGET_DIR)
 
 $(GEN_DIR): | $(TARGET_DIR)
 	mkdir -p $(GEN_DIR)
 
-$(GEN_DIR)/wtk/antlr: | $(GEN_DIR)
-	mkdir -p $(GEN_DIR)/wtk/antlr
-
 $(GEN_DIR)/wtk/irregular: | $(GEN_DIR)
 	mkdir -p $(GEN_DIR)/wtk/irregular
 
-$(GEN_DIR)/wtk/flatbuffer: | $(GEN_DIR)
-	mkdir -p $(GEN_DIR)/wtk/flatbuffer
+install:
+	cd $(BUILD_DIR) && $(MAKE_CMD) install
 
-$(BUILD_DIR): | $(TARGET_DIR)
-	mkdir -p $(BUILD_DIR)
+uninstall:
+	xargs rm < $(BUILD_DIR)/install_manifest.txt
 
-$(DEPS_DIR):
-	mkdir -p $(DEPS_DIR)
+clean:
+	rm -rf $(TARGET_DIR)
+
+deps-clean: clean
+	cd $(DEPS_DIR) && \
+	rm -rf */ && \
+	rm -f deps.success
+
+deps: | $(DEPS_DIR)/deps.success
+
+$(DEPS_DIR)/deps.success: | $(DEPS_DIR)
+	cd $(DEPS_DIR) && \
+		./logging-install.sh && \
+		./gtest-install.sh $(ENABLE_GTEST) && \
+		mkdir sst_bignum && \
+		cd sst_bignum && \
+		../sst_bignum_only.sh && \
+	  cd ../ && \
+		./flatbuffer-install.sh $(ENABLE_FLATBUFFER) $(CMAKE_CMD) && \
+		echo 'success' > deps.success