Skip to content

Commit

Permalink
update minimum requirement to bison 3.2 (#2449)
Browse files Browse the repository at this point in the history
get rid of `Mov` workaround in the parser
  • Loading branch information
quentin authored Dec 4, 2023
1 parent 85bb047 commit 3d1851a
Show file tree
Hide file tree
Showing 5 changed files with 98 additions and 284 deletions.
4 changes: 3 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
cmake_minimum_required(VERSION 3.15)

set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)

include(CMakeDependentOption)

Expand Down Expand Up @@ -217,7 +219,7 @@ if (CMAKE_HOST_SYSTEM_NAME MATCHES "Darwin")
endif()
endif()
find_package(FLEX REQUIRED)
find_package(BISON "3.0.4" REQUIRED)
find_package(BISON "3.2" REQUIRED)

# --------------------------------------------------
# mcpp
Expand Down
4 changes: 4 additions & 0 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -380,6 +380,10 @@ target_compile_features(souffleprof
PUBLIC cxx_std_17)

if (MSVC)
target_compile_options(libsouffle PUBLIC /Zc:__cplusplus)
target_compile_options(compiled PUBLIC /Zc:__cplusplus)
target_compile_options(souffleprof PUBLIC /Zc:__cplusplus)

target_compile_options(libsouffle PUBLIC /bigobj)
target_compile_options(compiled PUBLIC /bigobj)

Expand Down
192 changes: 0 additions & 192 deletions src/parser/Helper.h

This file was deleted.

4 changes: 0 additions & 4 deletions src/parser/ParserUtils.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,6 @@ namespace souffle {

class RuleBody {
public:
RuleBody() = default;
RuleBody(RuleBody&&) = default;
RuleBody& operator=(RuleBody&&) = default;

RuleBody negated() const;

void conjunct(RuleBody other);
Expand Down
Loading

0 comments on commit 3d1851a

Please sign in to comment.