using an updated version to generate code via bison

Author: sjanssen2

makefiles/lexyaccxx.mf

@@ -2,37 +2,24 @@
 # disable _this_ implicit rule
 %.c: %.y
 
-%.cc: %.y
-	mkdir -p bisontmp ; \
-	  rm -f bisontmp/* ; \
-	  cd bisontmp ; \
-	  x=`$(YACC) $(YFLAGS) -o $(notdir $@) ../$< 2>&1` ; \
-	  if [[ "$<" == "src/parser.y" ]]; then \
-	    # patch parser.y file, if older version of bison is used. Since 3.3.2, synatx changed. \
-	    if [[ "$$x" =~ "error: %define variable 'api.parser.class' is not used" ]]; then \
-	      # push and pop is necessary, as GNU patch does not accept ../ as file paths \
-	      pushd . && cd ../ && patch $< < src/parser.y_apiparserclass.patch && popd; \
-	      x=`$(YACC) $(YFLAGS) -o $(notdir $@) ../$< 2>&1` ; \
-	    fi; \
-	  fi; \
-	  r=$$? ; \
-	  printf "$$x\n" ; \
-	  if [ "$$r" != 0 ]; then \
-            echo Bison exit status: $$r ; \
-	    cd ..; \
-	    rm -rf bisontmp; \
-            exit 1;\
-          fi ; \
-	  y=`echo $$x | grep -v conflict` ; \
-	  r=$$? ; \
-	  if [ "$$r" != 0 ]; then \
-		cd ..; rm -rf bisontmp;  exit 2; fi ; \
-	  for i in *; do cmp $$i ../$(dir $@)/$$i; if [ "$$?" != 0 ]; then echo copying $$i; cp $$i ../$(dir $@)$$i; fi; done ; \
-	  touch ../$@; \
-	  cd ..; \
-	  rm -rf bisontmp;
-
 %.c: %.l
 
 %.cc: %.l
 	$(LEX) -o $@ $(LFAGS) $<
+
+%.cc: %.y
+	$(call bold,>>> Creating parser via bison ...)
+	# create a new temporary directory
+	$(eval tmpdir := $(shell mktemp -d 2>/dev/null || mktemp -d -t 'gapc_XXXXXXXX'))
+	# copy input file into temporary directory
+	cp $< $(tmpdir)/
+	# use bison to generate parser source files
+	#   we have a breaking change since Bison 3.3.2, which only effects src/parser.y
+	#   if first bison attempt fails, we will try to apply a patch to the input in the tmpdir and rerun the code generation
+	$(YACC) $(YFLAGS) -o $(tmpdir)/$(notdir $@) $(tmpdir)/$(notdir $<) 2>&1 \
+	|| (echo "failed to generate parser, trying to patch input .y file..." && (patch $(tmpdir)/$(notdir $<) < $<_apiparserclass.patch && $(YACC) $(YFLAGS) -o $(tmpdir)/$(notdir $@) $(tmpdir)/$(notdir $<) 2>&1)) \
+	|| (echo "failed to generate parser, trying another patch on input .y file..." && (patch $(tmpdir)/$(notdir $<) < $<_osx.patch && $(YACC) $(YFLAGS) -o $(tmpdir)/$(notdir $@) $(tmpdir)/$(notdir $<) 2>&1))
+	# remove source file from temporary directiry
+	rm $(tmpdir)/$(notdir $<)
+	# copy all generated files into working directory
+	cp $(tmpdir)/* $(dir $@)

src/parser.y_osx.patch

@@ -0,0 +1,21 @@
+--- parser.y	2020-07-07 15:39:39.403691645 +0200
++++ /media/vbox/Users/sjanssen/Git/jlab/gapc/src/parser.y	2020-07-07 15:01:57.000000000 +0200
+@@ -68,15 +68,15 @@
+
+ %skeleton "lalr1.cc"
+ %defines  /* yacc -d */
+-%define api.parser.class {Parser}
+-%define api.location.type { Loc }
++%define "parser_class_name" "Parser"
++%define "location_type" "Loc"
+ %parse-param { Driver& driver }
+ %parse-param { yy::Parser::token_type start_symbol }
+ %lex-param   { yy::Parser::token_type start_symbol }
+ %locations
+ %debug    /* yacc -t */ /* FIXME */
+ %verbose  /* yacc -v */
+-%define parse.error verbose
++%error-verbose
+
+ %initial-action
+ {