Merge pull request #387 from potassco/feature/aspif

potassco · Sep 7, 2022 · c692aab · c692aab
2 parents c0a2cf9 + 4756d6a
commit c692aab
Show file tree

Hide file tree

Showing 56 changed files with 23,156 additions and 6,647 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,7 +12,6 @@ ReleaseScript
 *.db
 *.vcxproj.user
 x64
-libgringo/generated
 .nfs*
 examples/clingo/pydoc/clingo.ast.html
 examples/clingo/pydoc/clingo.html
@@ -25,6 +24,5 @@ _skbuild/
 dist
 *.egg-info/
 MANIFEST
-libgringo/gen/
 .cache
 .gdb_history
diff --git a/CHANGES.md b/CHANGES.md
@@ -2,12 +2,16 @@
 
 ## clingo 5.6.0
 
+  * add support for parsing files in ASPIF format (#387)
   * add theory related functions to backend (#381)
   * add support for comparisons with more than one relation (#368)
   * extend safety by computing intervals from comparisons (#375)
   * add and ground base part by default in Python API (#378)
   * remove experimental CSP extensions (#367)
   * require at least MSVC 15.0 to build on Windows
+  * large code refactoring (#376)
+  * replace internal hash set implementation by external one (#386)
+  * update clasp
 
 ## clingo 5.5.2
   * fix `parse_files` in C++ API

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -225,7 +225,7 @@ if (CLINGO_BUILD_WITH_LUA)
     endif()
 endif()
 find_package(BISON "2.5")
-find_package(RE2C "0.13")
+find_package(RE2C "0.101")
 if (Python_Development_FOUND)
     # When using CFFI the clingo module has to be compiled with -pthread to
     # avoid linker errors

diff --git a/INSTALL.md b/INSTALL.md
@@ -38,7 +38,7 @@ branch. Releases already include the necessary generated files.
   - version 3.0 produces harmless warnings
     (to stay backwards-compatible)
 - the [re2c](https://re2c.org/) lexer generator
-  - *at least* version 0.13 is required
+  - *at least* version 1.1.1 is required
 
 ## Optional Dependencies
 

diff --git a/Makefile b/Makefile
@@ -39,6 +39,11 @@ test: build/$(BUILD_TYPE)
 	$(MAKE) -C build/$(BUILD_TYPE)
 	$(MAKE) -C build/$(BUILD_TYPE) $@ CTEST_OUTPUT_ON_FAILURE=TRUE
 
+gen: build/$(BUILD_TYPE)
+	$(MAKE) -C build/$(BUILD_TYPE) gen
+	mkdir -p libgringo/gen/src/
+	rsync -ra build/debug/libgringo/src/input libgringo/gen/src/
+
 web: lua
 	mkdir -p build/web
 	current="$$(pwd -P)" && cd build/web && cd "$$(pwd -P)" && source emsdk_env.sh && emcmake cmake \

diff --git a/app/pyclingo/_clingo.c b/app/pyclingo/_clingo.c
diff --git a/clasp b/clasp
diff --git a/examples/c/ast.c b/examples/c/ast.c
@@ -159,7 +159,7 @@ int main(int argc, char const **argv) {
   if (!clingo_control_new(argv+1, argc-1, NULL, NULL, 20, &ctl) != 0) { goto error; }
 
   // get the program builder
-  if (!clingo_control_program_builder(ctl, &data.builder)) { goto error; }
+  if (!clingo_program_builder_init(ctl, &data.builder)) { goto error; }
 
   // initialize the location
   location.begin_line   = location.end_line   = 0;
@@ -181,7 +181,7 @@ int main(int argc, char const **argv) {
   if (!clingo_program_builder_begin(data.builder)) { goto error; }
 
   // get the AST of the program
-  if (!clingo_ast_parse_string("a :- not b. b :- not a.", (clingo_ast_callback_t)on_statement, &data, NULL, NULL, 20)) { goto error; }
+  if (!clingo_ast_parse_string("a :- not b. b :- not a.", (clingo_ast_callback_t)on_statement, &data, NULL, NULL, NULL, 20)) { goto error; }
 
   // finish building a program
   if (!clingo_program_builder_end(data.builder)) { goto error; }
+6 −2		src/logic_program.cpp
+3 −2		src/solver.cpp
+16 −0		tests/dlp_builder_test.cpp
+14 −0		tests/facade_test.cpp