[135019] trunk/dports/textproc/zorba

[ryandesign at macports.org]

Revision: 135019
          https://trac.macports.org/changeset/135019
Author:   ryandesign at macports.org
Date:     2015-04-13 04:56:03 -0700 (Mon, 13 Apr 2015)
Log Message:
-----------
zorba: add patch for bison 3

Modified Paths:
--------------
    trunk/dports/textproc/zorba/Portfile

Added Paths:
-----------
    trunk/dports/textproc/zorba/files/patch-bison-3.0.diff

Modified: trunk/dports/textproc/zorba/Portfile
===================================================================
--- trunk/dports/textproc/zorba/Portfile	2015-04-13 09:19:33 UTC (rev 135018)
+++ trunk/dports/textproc/zorba/Portfile	2015-04-13 11:56:03 UTC (rev 135019)
@@ -47,6 +47,7 @@
 }
 
 patchfiles      patch-src-types-schema-SchemaValidatorFilter.h.diff
+patchfiles-append   patch-bison-3.0.diff
 
 depends_lib \
     port:boost \

Added: trunk/dports/textproc/zorba/files/patch-bison-3.0.diff
===================================================================
--- trunk/dports/textproc/zorba/files/patch-bison-3.0.diff	                        (rev 0)
+++ trunk/dports/textproc/zorba/files/patch-bison-3.0.diff	2015-04-13 11:56:03 UTC (rev 135019)
@@ -0,0 +1,51 @@
+Fix build with bison 3
+https://bugs.launchpad.net/zorba/+bug/1227047
+--- src/compiler/parser/parser.y.orig	2013-11-06 01:20:44.000000000 -0600
++++ src/compiler/parser/parser.y	2015-04-13 06:51:08.000000000 -0500
+@@ -31,8 +31,7 @@
+ %skeleton "lalr1.cc"  /*  -*- C++ -*- */
+ %require "2.4"
+ %defines
+-%name-prefix="zorba"
+-%pure-parser
++%name-prefix "zorba"
+ %error-verbose
+ 
+ 
+@@ -45,9 +44,9 @@
+ 
+ 
+ #ifdef XQUERY_PARSER
+-%define "parser_class_name" "xquery_parser"
++%define "parser_class_name" { xquery_parser }
+ #else
+-%define "parser_class_name" "jsoniq_parser"
++%define "parser_class_name" { jsoniq_parser }
+ #endif
+ 
+ 
+@@ -4635,21 +4634,21 @@
+             $$ = NumericLiteral::new_literal(
+                 LOC(@$), ParseConstants::num_decimal, *$1
+             );
+-            delete yylval.decval;
++            delete yylhs.value.decval;
+         }
+     |   INTEGER_LITERAL
+         {
+             $$ = NumericLiteral::new_literal(
+                 LOC(@$), ParseConstants::num_integer, *$1
+             );
+-            delete yylval.ival;
++            delete yylhs.value.ival;
+         }
+     |   DOUBLE_LITERAL
+         {
+             $$ = NumericLiteral::new_literal(
+                 LOC(@$), ParseConstants::num_double, *$1
+             );
+-            delete yylval.dval;
++            delete yylhs.value.dval;
+         }
+     ;
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150413/6d47d331/attachment-0001.html>