Merge pull request #7220 from tautschnig/cleanup/remove-useless-rule

C parser: Remove unused rule cprover_contract_frees_opt

Author: TGWDB

src/CMakeLists.txt

@@ -29,11 +29,14 @@ macro(generic_bison name)
         message(FATAL_ERROR "Generated file ${bison_source} found in source tree. If you previously built with `make`, run `make clean` and try again")
     endif()
 
+    if(${BISON_VERSION} VERSION_GREATER "2.3")
+      set(bison_warnings_as_errors "-Werror")
+    endif()
     bison_target(
         parser
         "${CMAKE_CURRENT_SOURCE_DIR}/parser.y"
         "${CMAKE_CURRENT_BINARY_DIR}/${bison_source}"
-        COMPILE_FLAGS "-pyy${name}"
+        COMPILE_FLAGS "${bison_warnings_as_errors} -pyy${name}"
     )
     set(renamed_parser_header "${CMAKE_CURRENT_BINARY_DIR}/${bison_header}")
     add_custom_command(OUTPUT "${renamed_parser_header}"

src/ansi-c/Makefile

@@ -83,7 +83,7 @@ all: ansi-c$(LIBEXT)
 ###############################################################################
 
 ansi_c_y.tab.cpp: parser.y
-	$(YACC) $(YFLAGS) $$flags -pyyansi_c parser.y --defines=ansi_c_y.tab.h -o $@
+	$(YACC) $(YFLAGS) -pyyansi_c parser.y --defines=ansi_c_y.tab.h -o $@
 
 ansi_c_y.tab.h: ansi_c_y.tab.cpp
 

src/ansi-c/parser.y

@@ -3413,12 +3413,6 @@ cprover_contract_frees:
         }
         ;
 
-cprover_contract_frees_opt:
-        /* nothing */
-        { init($$); parser_stack($$).make_nil(); }
-        | cprover_contract_frees
-        ;
-
 cprover_function_contract_sequence:
           cprover_function_contract
         | cprover_function_contract_sequence cprover_function_contract

src/common

@@ -61,6 +61,7 @@ ifeq ($(filter-out OSX OSX_Universal,$(BUILD_ENV_)),)
   ifeq ($(origin CXX),default)
     CXX    = clang++
   endif
+  YFLAGS ?= -v
 else ifeq ($(filter-out FreeBSD,$(BUILD_ENV_)),)
   CP_CXXFLAGS +=
   LINKLIB = ar rcT $@ $^
@@ -72,6 +73,7 @@ else ifeq ($(filter-out FreeBSD,$(BUILD_ENV_)),)
   ifeq ($(origin CXX),default)
     CXX    = clang++
   endif
+  YFLAGS ?= -v -Werror
 else
   LINKLIB = ar rcT $@ $^
   LINKBIN = $(CXX) $(LINKFLAGS) -o $@ -Wl,--start-group $^ -Wl,--end-group $(LIBS)
@@ -84,11 +86,11 @@ else
     CXX    = g++
     #CXX    = icpc
   endif
+  YFLAGS ?= -v -Werror
 endif
 ifeq ($(origin YACC),default)
   YACC   = bison
 endif
-  YFLAGS ?= -v
 ifeq ($(origin LEX),default)
   LEX    = flex
 endif
@@ -119,9 +121,9 @@ ifeq ($(origin CXX),default)
   CXX = x86_64-w64-mingw32-g++
 endif
 ifeq ($(origin YACC),default)
-  YACC   = bison -y
+  YACC   = bison -y -Wno-error=yacc
 endif
-  YFLAGS ?= -v
+  YFLAGS ?= -v -Werror
 ifeq ($(origin LEX),default)
   LEX    = flex
 endif
@@ -147,9 +149,9 @@ ifeq ($(origin CXX),default)
   CXX = cl
 endif
 ifeq ($(origin YACC),default)
-  YACC   = win_bison -y
+  YACC   = win_bison -y -Wno-error=yacc
 endif
-  YFLAGS ?= -v
+  YFLAGS ?= -v -Werror
 ifeq ($(origin LEX),default)
   LEX    = win_flex
 endif

src/jsil/Makefile

@@ -28,7 +28,7 @@ jsil$(LIBEXT): $(OBJ)
 	$(LINKLIB)
 
 jsil_y.tab.cpp: parser.y
-	$(YACC) $(YFLAGS) $$flags -pyyjsil parser.y --defines=jsil_y.tab.h -o $@
+	$(YACC) $(YFLAGS) -pyyjsil parser.y --defines=jsil_y.tab.h -o $@
 
 jsil_y.tab.h: jsil_y.tab.cpp
 

src/json/Makefile

@@ -19,7 +19,7 @@ json$(LIBEXT): $(OBJ)
 	$(LINKLIB)
 
 json_y.tab.cpp: parser.y
-	$(YACC) $(YFLAGS) $$flags -pyyjson parser.y --defines=json_y.tab.h -o $@
+	$(YACC) $(YFLAGS) -pyyjson parser.y --defines=json_y.tab.h -o $@
 
 json_y.tab.h: json_y.tab.cpp
 

src/statement-list/Makefile

@@ -30,7 +30,7 @@ all: statement-list$(LIBEXT)
 ###############################################################################
 
 statement_list_y.tab.cpp: parser.y
-	$(YACC) $(YFLAGS) $$flags -pyystatement_list parser.y --defines=statement_list_y.tab.h -o $@
+	$(YACC) $(YFLAGS) -pyystatement_list parser.y --defines=statement_list_y.tab.h -o $@
 
 statement_list_y.tab.h: statement_list_y.tab.cpp
 

src/xmllang/Makefile

@@ -21,7 +21,7 @@ xmllang$(LIBEXT): $(OBJ)
 	$(LINKLIB)
 
 xml_y.tab.cpp: parser.y
-	$(YACC) $(YFLAGS) $$flags -pyyxml parser.y --defines=xml_y.tab.h -o $@
+	$(YACC) $(YFLAGS) -pyyxml parser.y --defines=xml_y.tab.h -o $@
 
 xml_y.tab.h: xml_y.tab.cpp