svn commit: r562665 - in head: cad/verilator/files editors/xcoral/files games/vultures-eye/files lang/ptoc/files math/cvc3/files net/olsrd/files www/qt5-webkit/files x11-clocks/buici-clock/files
Sunpoet Po-Chuan Hsieh
sunpoet at FreeBSD.org
Tue Jan 26 13:59:29 UTC 2021
Author: sunpoet
Date: Tue Jan 26 13:59:25 2021
New Revision: 562665
URL: https://svnweb.freebsd.org/changeset/ports/562665
Log:
Fix build with bison 3.7.4
PR: 248911
Exp-run by: antoine
Added:
head/editors/xcoral/files/patch-Makefile (contents, props changed)
head/games/vultures-eye/files/patch-..-vulture-GNUmakefile (contents, props changed)
head/games/vultures-eye/files/patch-..-vulture-vulture_tileconfig.lexer.l (contents, props changed)
head/math/cvc3/files/patch-src-parser-Makefile (contents, props changed)
head/net/olsrd/files/patch-src-cfgparser-local.mk (contents, props changed)
head/www/qt5-webkit/files/patch-Source_ThirdParty_ANGLE_src_compiler_preprocessor_ExpressionParser.y (contents, props changed)
head/www/qt5-webkit/files/patch-Source_WebCore_css_CSSGrammar.y.in (contents, props changed)
head/www/qt5-webkit/files/patch-Source_WebCore_css_makegrammar.pl (contents, props changed)
head/www/qt5-webkit/files/patch-Source_WebCore_xml_XPathGrammar.y (contents, props changed)
head/x11-clocks/buici-clock/files/patch-xo_res.cxx (contents, props changed)
head/x11-clocks/buici-clock/files/patch-xo_res__l.l (contents, props changed)
Modified:
head/cad/verilator/files/patch-src-verilog.y
head/lang/ptoc/files/patch-main.cxx
head/lang/ptoc/files/patch-makefile.bsd
head/lang/ptoc/files/patch-parser.y
head/lang/ptoc/files/patch-tpexpr.cxx
head/lang/ptoc/files/patch-trnod.cxx
head/x11-clocks/buici-clock/files/patch-xo_Makefile.in
Modified: head/cad/verilator/files/patch-src-verilog.y
==============================================================================
--- head/cad/verilator/files/patch-src-verilog.y Tue Jan 26 13:58:55 2021 (r562664)
+++ head/cad/verilator/files/patch-src-verilog.y Tue Jan 26 13:59:25 2021 (r562665)
@@ -1,14 +1,6 @@
---- src/verilog.y.orig 2020-07-11 01:58:03 UTC
+--- src/verilog.y.orig 2020-08-14 11:38:09 UTC
+++ src/verilog.y
-@@ -17,6 +17,7 @@
- //*************************************************************************
- // clang-format off
-
-+%define parse.error verbose
- %{
- #ifdef NEVER_JUST_FOR_CLANG_FORMAT
- }
-@@ -31,7 +32,6 @@
+@@ -31,7 +31,6 @@
#include <cstdarg>
#include <stack>
Added: head/editors/xcoral/files/patch-Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/editors/xcoral/files/patch-Makefile Tue Jan 26 13:59:25 2021 (r562665)
@@ -0,0 +1,10 @@
+--- Makefile.orig 2008-04-21 19:51:52 UTC
++++ Makefile
+@@ -113,7 +113,6 @@ lint: $(SRCS)
+ BR_Parser.c BR_Parser.h: BR_Parser.y
+ $(BISON) -d -t -p BR_yy BR_Parser.y
+ mv BR_Parser.tab.c BR_Parser.c
+- mv BR_Parser.tab.h BR_Parser.h
+
+ BR_Lexer.c: BR_Lexer.l BR_Parser.h
+ $(FLEX) -8 -PBR_yy -oBR_Lexer.c BR_Lexer.l
Added: head/games/vultures-eye/files/patch-..-vulture-GNUmakefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/vultures-eye/files/patch-..-vulture-GNUmakefile Tue Jan 26 13:59:25 2021 (r562665)
@@ -0,0 +1,13 @@
+--- ../vulture/GNUmakefile.orig 2011-04-04 18:23:51 UTC
++++ ../vulture/GNUmakefile
+@@ -77,9 +77,7 @@ $(OUTPUT_OBJ): $(VOBJ)
+ $(BUILDDIR)/vulture_tileconfig.parser.cpp $(BUILDDIR)/vulture_tileconfig.parser.h: vulture_tileconfig.parser.y
+ @echo generating parser
+ @mkdir -p $(BUILDDIR)/winclass
+- @bison -d vulture_tileconfig.parser.y -o $(BUILDDIR)/vulture_tileconfig.parser.tmp.cpp
+- @mv $(BUILDDIR)/vulture_tileconfig.parser.tmp.cpp $(BUILDDIR)/vulture_tileconfig.parser.cpp
+- @mv $(BUILDDIR)/vulture_tileconfig.parser.tmp.hpp $(BUILDDIR)/vulture_tileconfig.parser.h
++ @bison -d vulture_tileconfig.parser.y -o $(BUILDDIR)/vulture_tileconfig.parser.cpp
+
+ $(BUILDDIR)/vulture_tileconfig.lexer.cpp: vulture_tileconfig.lexer.l
+ @echo generating lexer
Added: head/games/vultures-eye/files/patch-..-vulture-vulture_tileconfig.lexer.l
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/vultures-eye/files/patch-..-vulture-vulture_tileconfig.lexer.l Tue Jan 26 13:59:25 2021 (r562665)
@@ -0,0 +1,11 @@
+--- ../vulture/vulture_tileconfig.lexer.l.orig 2011-04-05 02:23:52.000000000 +0800
++++ ../vulture/vulture_tileconfig.lexer.l 2020-10-01 21:55:27.849177000 +0800
+@@ -7,7 +7,7 @@
+ #include "vulture_types.h"
+ #include "vulture_tile.h"
+ #include "vulture_tileconfig.h"
+-#include "vulture_tileconfig.parser.h"
++#include "vulture_tileconfig.parser.hpp"
+
+ #define YY_SKIP_YYWRAP
+ extern int yywrap();
Modified: head/lang/ptoc/files/patch-main.cxx
==============================================================================
--- head/lang/ptoc/files/patch-main.cxx Tue Jan 26 13:58:55 2021 (r562664)
+++ head/lang/ptoc/files/patch-main.cxx Tue Jan 26 13:59:25 2021 (r562665)
@@ -1,6 +1,6 @@
---- main.cxx.orig Thu Sep 23 23:35:38 1999
-+++ main.cxx Sat Oct 21 04:11:00 2000
-@@ -326,8 +326,8 @@
+--- main.cxx.orig 2002-10-24 15:38:50 UTC
++++ main.cxx
+@@ -345,8 +345,8 @@ int main(int argc, char* argv[])
compile_system_library = TRUE;
#ifdef PREFIX
token::input(turbo_pascal
Modified: head/lang/ptoc/files/patch-makefile.bsd
==============================================================================
--- head/lang/ptoc/files/patch-makefile.bsd Tue Jan 26 13:58:55 2021 (r562664)
+++ head/lang/ptoc/files/patch-makefile.bsd Tue Jan 26 13:59:25 2021 (r562665)
@@ -1,6 +1,6 @@
---- makefile.bsd.orig 1998-11-06 21:10:50.000000000 -0500
-+++ makefile.bsd 2018-05-14 12:46:15.288108000 -0400
-@@ -10,21 +10,21 @@
+--- makefile.bsd.orig 1998-11-07 02:10:50 UTC
++++ makefile.bsd
+@@ -10,21 +10,21 @@ default : all
#
# C/C++ compiler
#
@@ -27,7 +27,7 @@
#
# Local packages directory
-@@ -94,7 +94,7 @@
+@@ -94,7 +94,7 @@ LIB_OBJS = $(LIB_SRCS:.c=.o)
$(CXX) $(CXXFLAGS) $(DEFINES) $(INCLUDES) -o $@ -c $<
.c.o :
@@ -36,7 +36,15 @@
#
# Custom targets.
-@@ -131,7 +131,7 @@
+@@ -106,7 +106,6 @@ $(OBJS) : $(INCS)
+ parser.cxx parser.h : parser.y
+ $(YACC) parser.y
+ mv parser.tab.c parser.cxx
+- mv parser.tab.h parser.h
+
+ lex.cxx : lex.l
+ $(LEX) lex.l
+@@ -131,7 +130,7 @@ ptoc : $(OBJS)
$(LD) $(LDFLAGS) -o $@ $(OBJS)
libXbgi.a:
Modified: head/lang/ptoc/files/patch-parser.y
==============================================================================
--- head/lang/ptoc/files/patch-parser.y Tue Jan 26 13:58:55 2021 (r562664)
+++ head/lang/ptoc/files/patch-parser.y Tue Jan 26 13:59:25 2021 (r562665)
@@ -1,5 +1,5 @@
---- parser.y.orig 2010-05-20 18:31:37.000000000 +0400
-+++ parser.y 2010-05-20 18:38:46.000000000 +0400
+--- parser.y.orig 2008-03-04 11:25:16 UTC
++++ parser.y
@@ -1,4 +1,4 @@
-%{
+%code requires {
@@ -17,7 +17,7 @@
static int zzcnv_table[] = {
#define DEF_TOKEN(mnem, cat, cls, yacc) yacc,
#include "token.dpp"
-@@ -21,7 +25,7 @@
+@@ -21,7 +25,7 @@ void zzerror(char* text)
error(curr_token, "syntax error: %s", text);
}
@@ -26,7 +26,7 @@
%union {
-@@ -281,23 +285,27 @@
+@@ -281,24 +285,28 @@ input_file {
$2->attrib(ctx_program);
$2->translate(ctx_program);
}
@@ -50,21 +50,22 @@
{
$$ = new module_node($1, $2, $3, $4, $5, $6);
}
--
+;
+-
/* Turbo Pascal specific */
-@@ -309,38 +317,46 @@
+ unit: UNIT IDENT ';' INTERFACE unit_decl_list IMPLEMENTATION unit_def_list END '.'
+@@ -309,38 +317,46 @@ unit: UNIT IDENT ';' INTERFACE unit_decl_list IMPLEMEN
{ $$ = new unit_node(NULL, NULL, NULL, $1, $2, $3, $4, NULL, $5, $6); }
| INTERFACE unit_decl_list IMPLEMENTATION unit_def_list compoundst '.'
{ $$ = new unit_node(NULL, NULL, NULL, $1, $2, $3, $4, $5, NULL, $6); }
+ ;
unit_def_list: decl_part_list
--
+ ;
+-
prog_param_list: { $$ = NULL; }
| '(' ident_list ')' { $$ = new import_list_node($1, $2, $3); }
+ ;
@@ -104,7 +105,7 @@
/*
//=============================================================================
-@@ -397,15 +413,20 @@
+@@ -397,15 +413,20 @@ statement: { $$ = new empty_node(curr_token->prev_rele
| ICONST ':' statement { $$ = new label_node($1, $2, $3); }
| IDENT ':' statement { $$ = new label_node($1, $2, $3); }
| compoundst { $$ = $1; }
@@ -125,7 +126,7 @@
case_list: case_items
| case_items otherwise sequence
-@@ -419,20 +440,26 @@
+@@ -419,20 +440,26 @@ case_list: case_items
$$ = new case_node(NULL, $2, $3);
}
}
@@ -152,7 +153,7 @@
/*
//=============================================================================
-@@ -481,6 +508,7 @@
+@@ -481,6 +508,7 @@ expr: simple_expr
| expr OR expr { $$ = new op_node(tn_or, $1, $2, $3); }
| expr XOR expr { $$ = new op_node(tn_xor, $1, $2, $3); }
@@ -160,7 +161,7 @@
| expr GT expr { $$ = new op_node(tn_gt, $1, $2, $3); }
| expr LT expr { $$ = new op_node(tn_lt, $1, $2, $3); }
| expr LE expr { $$ = new op_node(tn_le, $1, $2, $3); }
-@@ -488,6 +516,7 @@
+@@ -488,6 +516,7 @@ expr: simple_expr
| expr EQ expr { $$ = new op_node(tn_eq, $1, $2, $3); }
| expr NE expr { $$ = new op_node(tn_ne, $1, $2, $3); }
| expr IN expr { $$ = new op_node(tn_in, $1, $2, $3); }
@@ -168,7 +169,7 @@
simple_expr: primary
| PLUS simple_expr %prec UPLUS {
-@@ -498,6 +527,7 @@
+@@ -498,6 +527,7 @@ simple_expr: primary
{ $$ = new op_node(tn_not, NULL, $1, $2); }
| '@' primary { $$ = new address_node($1, $2); }
| AND primary %prec ADDRESS { $$ = new address_node($1, $2); }
@@ -176,7 +177,7 @@
primary: constant
| '(' expr_list ')' { $$ = new expr_group_node($1, $2, $3); }
-@@ -506,6 +536,7 @@
+@@ -506,6 +536,7 @@ primary: constant
| primary '^' { $$ = new deref_expr_node($1, $2); }
| primary '[' expr_list ']' { $$ = new idx_expr_node($1, $2, $3, $4); }
| LOOPHOLE '(' type ',' expr ')' { $$ = new loophole_node($1, $2, $3, $4, $5, $6); }
@@ -184,7 +185,7 @@
constant: record_constant
| ICONST { $$ = new integer_node($1); }
-@@ -513,41 +544,49 @@
+@@ -513,42 +544,50 @@ constant: record_constant
| SCONST { $$ = new string_node($1); }
| '[' set_elem_list ']' { $$ = new set_node($1, $2, $3); }
| IDENT { $$ = new atom_expr_node($1); }
@@ -207,9 +208,9 @@
+;
act_param: expr | { $$ = new skipped_node(curr_token->prev_relevant()); }
--
+;
+-
record_constant: '(' field_init_list ')' {
$$ = new record_constant_node($1, $2, $3);
}
@@ -220,25 +221,26 @@
+;
field_init_item: IDENT ':' expr { $$ = new field_init_node($1, $2, $3); }
--
+;
- expr_group: '(' expr_list ')' { $$ = new expr_group_node($1, $2, $3); }
-
+ expr_group: '(' expr_list ')' { $$ = new expr_group_node($1, $2, $3); }
+;
+-
write_list: write_param | write_param ',' write_list { $1->next = $3; $$ = $1; }
+;
write_param: expr { $$ = new write_param_node($1); }
| expr ':' expr { $$ = new write_param_node($1, $2, $3); }
| expr ':' expr ':' expr { $$ = new write_param_node($1, $2, $3, $4, $5); }
--
+;
+-
/*
//=============================================================================
-@@ -590,31 +629,40 @@
+ // Declaration syntax:
+@@ -590,31 +629,40 @@ write_param: expr { $$ = new write_param_node($1); }
label_decl_part: LABEL label_list ';'
{ $$ = new label_decl_part_node($1, $2, $3); }
@@ -279,7 +281,7 @@
var_decl_list: { $$ = NULL; }
| var_decl
-@@ -630,29 +678,33 @@
+@@ -630,29 +678,33 @@ var_decl_list: { $$ = NULL; }
$1->next = $5; $$ = $1;
}
| var_decl ';' var_decl_list { $1->next = $3; $$ = $1; }
@@ -314,7 +316,7 @@
proc_def:
PROCEDURE IDENT formal_params ';' block ';'
-@@ -671,135 +723,166 @@
+@@ -671,135 +723,166 @@ proc_def:
{ $$ = new proc_def_node($1, NULL, NULL, $2, $3, $4, $5, $6, $7, $8, $9, $10); }
| FUNCTION IDENT ';' FAR ';' block ';'
{ $$ = new proc_def_node($1, NULL, NULL, $2, NULL, NULL, NULL, $3, $4, $5, $6, $7); }
@@ -324,9 +326,9 @@
| SCOPE qualifiers { $$ = new token_list($1, $2); }
| IDENT { $$ = new token_list($1); }
| SCOPE { $$ = new token_list($1); }
--
+;
+-
formal_params: { $$ = NULL; }
| '(' formal_param_list ')' { $$ = new param_list_node($1, $2, $3); }
+;
@@ -344,10 +346,10 @@
+;
param_type: simple_type | conformant_array_type
--
--
+;
+-
+-
/* Types definition */
type: simple_type | array_type | record_type | object_type | set_type | file_type
@@ -428,9 +430,9 @@
| proc_fwd_decl object_methods { $1->next = $2; $$ = $1; }
| proc_spec object_methods { $1->next = $2; $$ = $1; }
-
--
+;
+-
file_type: packed FIL OF type { $$ = new file_tpd_node($1, $2, $3, $4); }
+;
@@ -452,9 +454,9 @@
index_spec: simple_type { $$ = new type_index_node($1); }
| expr DOTS expr { $$ = new range_index_node($1, $2, $3); }
--
+;
+-
field_list:
fixed_part variant_part
{ $$ = new field_list_node($1, $2); }
@@ -473,9 +475,9 @@
selector: IDENT ':' type { $$ = new selector_node($1, $2, $3); }
| type { $$ = new selector_node(NULL, NULL, $1); }
--
+;
+-
variant_list: variant
| variant ';' { $$ = $1; }
| variant ';' variant_list { $1->next = $3; $$ = $1; }
Modified: head/lang/ptoc/files/patch-tpexpr.cxx
==============================================================================
--- head/lang/ptoc/files/patch-tpexpr.cxx Tue Jan 26 13:58:55 2021 (r562664)
+++ head/lang/ptoc/files/patch-tpexpr.cxx Tue Jan 26 13:59:25 2021 (r562665)
@@ -1,6 +1,6 @@
---- tpexpr.cxx.old Sat Feb 12 17:24:29 2000
-+++ tpexpr.cxx Sat Feb 12 17:24:41 2000
-@@ -170,7 +170,7 @@
+--- tpexpr.cxx.orig 2001-04-04 15:56:02 UTC
++++ tpexpr.cxx
+@@ -170,7 +170,7 @@ void array_tp::insert_dimensions(expr_node* e, array_t
if (!e->is_parameter() && (base == 0 || base == 1)) {
t->prepend(dprintf("items(%.*s", n, "****************"));
t->copy(e->f_tkn, e->l_tkn);
Modified: head/lang/ptoc/files/patch-trnod.cxx
==============================================================================
--- head/lang/ptoc/files/patch-trnod.cxx Tue Jan 26 13:58:55 2021 (r562664)
+++ head/lang/ptoc/files/patch-trnod.cxx Tue Jan 26 13:59:25 2021 (r562665)
@@ -1,6 +1,6 @@
---- trnod.cxx.orig Sat Oct 21 04:24:34 2000
-+++ trnod.cxx Sat Oct 21 04:45:38 2000
-@@ -460,7 +460,7 @@
+--- trnod.cxx.orig 2008-06-05 08:43:52 UTC
++++ trnod.cxx
+@@ -468,7 +468,7 @@ void read_node::translate(int)
if (language_c) {
if (params) {
char const* format = "";
@@ -9,7 +9,7 @@
expr_node *prm = params->expr;
l_tkn = params->rpar;
-@@ -618,7 +618,7 @@
+@@ -626,7 +626,7 @@ void write_node::translate(int)
write_param_node *prm = params->vals;
l_tkn = params->rpar;
@@ -18,7 +18,7 @@
write_format = NULL;
if (prm->type->tag == tp_file) {
prm->translate(ctx_value);
-@@ -1000,7 +1000,7 @@
+@@ -1008,7 +1008,7 @@ void for_node::translate(int ctx)
from->translate(ctx_value);
from->l_tkn->append(";");
t_to->set_trans(t_ident->out_text);
@@ -27,7 +27,7 @@
till->translate(ctx_value);
till->l_tkn->append(";");
if (t_to->name->tag == TKN_TO) {
-@@ -1069,11 +1069,11 @@
+@@ -1077,11 +1077,11 @@ void repeat_node::translate(int ctx)
bool body_is_block =
body != NULL && body->is_compound() && body->next == NULL;
@@ -41,7 +41,7 @@
expr->translate(ctx_condition);
f_tkn = t_repeat;
l_tkn = expr->l_tkn;
-@@ -1264,7 +1264,7 @@
+@@ -1272,7 +1272,7 @@ void atom_expr_node::translate(int ctx)
} else if (var->type->tag == tp_proc) {
if (turbo_pascal && tkn->name->tag == TKN_HALT) {
@@ -50,7 +50,7 @@
return;
}
proc_tp* prc = (proc_tp*)var->type->get_typedef();
-@@ -1286,8 +1286,8 @@
+@@ -1294,8 +1294,8 @@ void atom_expr_node::translate(int ctx)
if (prm->var->type->tag == tp_file
|| prm->var->type->tag == tp_text)
{
@@ -61,7 +61,7 @@
} else {
t = t->append("0");
}
-@@ -1334,7 +1334,7 @@
+@@ -1342,7 +1342,7 @@ void atom_expr_node::translate(int ctx)
if (with != NULL) {
f_tkn = tkn->prepend(language_c && with->tag == symbol::s_ref
@@ -70,7 +70,7 @@
->prepend(with->out_name->text);
}
-@@ -1750,7 +1750,7 @@
+@@ -1764,7 +1764,7 @@ void set_node::translate(int)
t_lbr->set_trans("set::of(");
}
}
@@ -79,7 +79,7 @@
}
idx_expr_node::idx_expr_node(expr_node* arr, token* t_lbr, expr_node* indices,
-@@ -2181,7 +2181,7 @@
+@@ -2196,7 +2196,7 @@ void op_node::translate(int)
case tn_and:
op->set_trans(((left->type && left->type->tag != tp_bool) ||
(right->type && right->type->tag != tp_bool) || nological)
@@ -88,7 +88,7 @@
if (parent_tag != tn_group && parent_tag != tn_and) {
f_tkn = left->f_tkn->prepend("(");
l_tkn = right->l_tkn->append(")");
-@@ -2201,12 +2201,12 @@
+@@ -2216,12 +2216,12 @@ void op_node::translate(int)
if (parent_tag != tn_group) {
f_tkn = left->f_tkn->prepend(left->type &&
left->type->get_typedef() == &longint_type
@@ -103,7 +103,7 @@
}
op->set_trans(">>");
break;
-@@ -2224,14 +2224,14 @@
+@@ -2239,14 +2239,14 @@ void op_node::translate(int)
}
op->set_trans(((left->type && left->type->tag != tp_bool) ||
(right->type && right->type->tag != tp_bool) ||
@@ -120,7 +120,7 @@
left->l_tkn->append(", ");
l_tkn = right->l_tkn->append(")");
} else {
-@@ -2253,14 +2253,14 @@
+@@ -2268,14 +2268,14 @@ void op_node::translate(int)
if (language_c) {
if (short_set && ((set_tp*)type)->is_short_set()) {
f_tkn = left->f_tkn->prepend(tag == tn_add
@@ -141,7 +141,7 @@
}
l_tkn = right->l_tkn->append(")");
token::disable(left->l_tkn->next, right->f_tkn->prev);
-@@ -2298,9 +2298,9 @@
+@@ -2313,9 +2313,9 @@ void op_node::translate(int)
}
else if (ltype->tag == tp_enum || rtype->size <= ltype->size)
{
@@ -154,7 +154,7 @@
}
} else if (((rtype->tag == tp_range && rtype->min_value >= 0) ||
rtype->tag == tp_enum) &&
-@@ -2313,9 +2313,9 @@
+@@ -2328,9 +2328,9 @@ void op_node::translate(int)
else if (rtype->tag == tp_enum || ltype->size <= rtype->size)
{
f_tkn = left->f_tkn->prepend(
@@ -167,7 +167,7 @@
}
}
}
-@@ -2439,7 +2439,7 @@
+@@ -2454,7 +2454,7 @@ void op_node::translate(int)
op->set_trans(CMP_OP(tag));
break;
case tn_not:
@@ -176,7 +176,7 @@
break;
}
if ((unsigned(tag - tn_add) <= tn_div - tn_add) && type && type->tag == tp_longint)
-@@ -3406,7 +3406,7 @@
+@@ -3440,7 +3440,7 @@ void const_def_node::translate(int)
}
}
} else {
@@ -185,7 +185,7 @@
enumeration = NULL;
if (constant->type->tag == tp_string) {
ident->prepend("char ");
-@@ -3749,16 +3749,16 @@
+@@ -3783,16 +3783,16 @@ void var_decl_node::translate(int ctx)
t = tkn->ident->copy(eltd->f_tkn, eltd->l_tkn);
if (tp->tag == tp_dynarray) {
tkn->ident->prepend(ctx == ctx_varpar
@@ -206,7 +206,7 @@
copy(tpd->f_tkn, tpd->l_tkn);
}
} else {
-@@ -3823,7 +3823,7 @@
+@@ -3857,7 +3857,7 @@ void var_decl_node::translate(int ctx)
// initialize file structure
tkn->ident->append(
(tp->tag == tp_file || tp->tag == tp_text)
@@ -215,7 +215,7 @@
}
if (tkn->var->flags & symbol::f_static) {
is_static = TRUE;
-@@ -3854,8 +3854,8 @@
+@@ -3888,8 +3888,8 @@ void var_decl_node::translate(int ctx)
{
f_tkn = f_tkn->prepend("EXTERN ");
} else if (scope != NULL) {
@@ -226,7 +226,7 @@
}
force_semicolon();
if (is_static) {
-@@ -4215,7 +4215,7 @@
+@@ -4249,7 +4249,7 @@ void proc_fwd_decl_node::translate(int)
if (qualifiers) {
if (is_external) {
f_tkn = f_tkn->prepend(type->is_extern_c && !language_c
@@ -235,7 +235,7 @@
} else if (is_static) {
f_tkn = f_tkn->prepend("static ");
} else if (is_virtual) {
-@@ -4832,7 +4832,7 @@
+@@ -4875,7 +4875,7 @@ void array_tpd_node::translate(int ctx)
t_array->set_trans("conf_matrix");
} else {
t_array->set_trans(indices->next == NULL
Added: head/math/cvc3/files/patch-src-parser-Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/math/cvc3/files/patch-src-parser-Makefile Tue Jan 26 13:59:25 2021 (r562665)
@@ -0,0 +1,35 @@
+--- src/parser/Makefile.orig 2010-06-16 17:55:52 UTC
++++ src/parser/Makefile
+@@ -38,7 +38,7 @@ parsePL_defs.h: parsePL.cpp
+ parsePL.cpp: PL.y
+ $(YACC) $(YFLAGS) -o parsePL.cpp -p PL --debug -v PL.y
+ @if [ -f parsePL.cpp.h ]; then mv parsePL.cpp.h parsePL.hpp; fi
+- @mv parsePL.hpp parsePL_defs.h
++ @cp parsePL.hpp parsePL_defs.h
+
+ lexLisp.cpp: Lisp.lex parseLisp_defs.h
+ $(LEX) $(LFLAGS) -I -PLisp -olexLisp.cpp Lisp.lex
+@@ -48,7 +48,7 @@ parseLisp_defs.h: parseLisp.cpp
+ parseLisp.cpp: Lisp.y
+ $(YACC) $(YFLAGS) -o parseLisp.cpp -p Lisp --debug -v Lisp.y
+ @if [ -f parseLisp.cpp.h ]; then mv parseLisp.cpp.h parseLisp.hpp; fi
+- @mv parseLisp.hpp parseLisp_defs.h
++ @cp parseLisp.hpp parseLisp_defs.h
+
+ lexsmtlib.cpp: smtlib.lex parsesmtlib_defs.h
+ $(LEX) $(LFLAGS) -I -Psmtlib -olexsmtlib.cpp smtlib.lex
+@@ -58,7 +58,7 @@ parsesmtlib_defs.h: parsesmtlib.cpp
+ parsesmtlib.cpp: smtlib.y
+ $(YACC) $(YFLAGS) -o parsesmtlib.cpp -p smtlib --debug -v smtlib.y
+ @if [ -f parsesmtlib.cpp.h ]; then mv parsesmtlib.cpp.h parsesmtlib.hpp; fi
+- @mv parsesmtlib.hpp parsesmtlib_defs.h
++ @cp parsesmtlib.hpp parsesmtlib_defs.h
+
+ lexsmtlib2.cpp: smtlib2.lex parsesmtlib2_defs.h
+ $(LEX) $(LFLAGS) -I -Psmtlib2 -olexsmtlib2.cpp smtlib2.lex
+@@ -68,4 +68,4 @@ parsesmtlib2_defs.h: parsesmtlib2.cpp
+ parsesmtlib2.cpp: smtlib2.y
+ $(YACC) $(YFLAGS) -o parsesmtlib2.cpp -p smtlib2 --debug -v smtlib2.y
+ @if [ -f parsesmtlib2.cpp.h ]; then mv parsesmtlib2.cpp.h parsesmtlib2.hpp; fi
+- @mv parsesmtlib2.hpp parsesmtlib2_defs.h
++ @cp parsesmtlib2.hpp parsesmtlib2_defs.h
Added: head/net/olsrd/files/patch-src-cfgparser-local.mk
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/olsrd/files/patch-src-cfgparser-local.mk Tue Jan 26 13:59:25 2021 (r562665)
@@ -0,0 +1,18 @@
+--- src/cfgparser/local.mk.orig 2019-08-11 08:09:47 UTC
++++ src/cfgparser/local.mk
+@@ -74,12 +74,9 @@ $(C)oparse.c: $(C)oparse.y $(C)olsrd_conf.h $(C)Makefi
+ ifeq ($(VERBOSE),0)
+ @echo "[BISON] $@"
+ endif
+- $(MAKECMDPREFIX)$(BISON) -d -o "$@-tmp" "$<"
+- $(MAKECMDPREFIX)sed -e 's/register //' \
+- -e '/^#line/s/$(call quote,$@-tmp)/$(call quote,$@)/' \
+- < "$@-tmp" >"$@"
+- $(MAKECMDPREFIX)mv "$(subst .c,.h,$@-tmp)" "$(subst .c,.h,$@)"
+- $(MAKECMDPREFIX)$(RM) "$@-tmp" "$(subst .c,.h,$@-tmp)"
++ $(MAKECMDPREFIX)$(BISON) -d -o "$@" "$<"
++ $(MAKECMDPREFIX)sed -e 's/register //' < "$@" >"$@.o"
++ $(MAKECMDPREFIX)mv "$@.o" "$@"
+
+ $(C)oparse.o: CFLAGS := $(filter-out -Wunreachable-code,$(CFLAGS))
+
Added: head/www/qt5-webkit/files/patch-Source_ThirdParty_ANGLE_src_compiler_preprocessor_ExpressionParser.y
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/qt5-webkit/files/patch-Source_ThirdParty_ANGLE_src_compiler_preprocessor_ExpressionParser.y Tue Jan 26 13:59:25 2021 (r562665)
@@ -0,0 +1,11 @@
+--- Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.y.orig 2020-03-04 17:16:37 UTC
++++ Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.y
+@@ -68,7 +68,7 @@ struct Context
+ } // namespace
+ %}
+
+-%pure-parser
++%define api.pure
+ %name-prefix "pp"
+ %parse-param {Context *context}
+ %lex-param {Context *context}
Added: head/www/qt5-webkit/files/patch-Source_WebCore_css_CSSGrammar.y.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/qt5-webkit/files/patch-Source_WebCore_css_CSSGrammar.y.in Tue Jan 26 13:59:25 2021 (r562665)
@@ -0,0 +1,11 @@
+--- Source/WebCore/css/CSSGrammar.y.in.orig 2020-03-04 17:16:37 UTC
++++ Source/WebCore/css/CSSGrammar.y.in
+@@ -21,7 +21,7 @@
+ *
+ */
+
+-%pure-parser
++%define api.pure
+
+ %parse-param { CSSParser* parser }
+ %lex-param { CSSParser* parser }
Added: head/www/qt5-webkit/files/patch-Source_WebCore_css_makegrammar.pl
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/qt5-webkit/files/patch-Source_WebCore_css_makegrammar.pl Tue Jan 26 13:59:25 2021 (r562665)
@@ -0,0 +1,31 @@
+Obtained from: https://github.com/qtwebkit/qtwebkit/commit/d92b11fea65364fefa700249bd3340e0cd4c5b31
+
+--- Source/WebCore/css/makegrammar.pl.orig 2020-03-04 17:16:37 UTC
++++ Source/WebCore/css/makegrammar.pl
+@@ -73,25 +73,6 @@ if ($suffix eq ".y.in") {
+ }
+
+ my $fileBase = File::Spec->join($outputDir, $filename);
+-my @bisonCommand = ($bison, "-d", "-p", $symbolsPrefix, $grammarFilePath, "-o", "$fileBase.cpp");
++my @bisonCommand = ($bison, "--defines=$fileBase.h", "-p", $symbolsPrefix, $grammarFilePath, "-o", "$fileBase.cpp");
+ push @bisonCommand, "--no-lines" if $^O eq "MSWin32"; # Work around bug in bison >= 3.0 on Windows where it puts backslashes into #line directives.
+ system(@bisonCommand) == 0 or die;
+-
+-open HEADER, ">$fileBase.h" or die;
+-print HEADER << "EOF";
+-#ifndef CSSGRAMMAR_H
+-#define CSSGRAMMAR_H
+-EOF
+-
+-open HPP, "<$fileBase.cpp.h" or open HPP, "<$fileBase.hpp" or die;
+-while (<HPP>) {
+- print HEADER;
+-}
+-close HPP;
+-
+-print HEADER "#endif\n";
+-close HEADER;
+-
+-unlink("$fileBase.cpp.h");
+-unlink("$fileBase.hpp");
+-
Added: head/www/qt5-webkit/files/patch-Source_WebCore_xml_XPathGrammar.y
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/qt5-webkit/files/patch-Source_WebCore_xml_XPathGrammar.y Tue Jan 26 13:59:25 2021 (r562665)
@@ -0,0 +1,11 @@
+--- Source/WebCore/xml/XPathGrammar.y.orig 2020-03-04 17:16:37 UTC
++++ Source/WebCore/xml/XPathGrammar.y
+@@ -47,7 +47,7 @@ using namespace XPath;
+
+ %}
+
+-%pure-parser
++%define api.pure
+ %lex-param { parser }
+ %parse-param { Parser& parser }
+
Modified: head/x11-clocks/buici-clock/files/patch-xo_Makefile.in
==============================================================================
--- head/x11-clocks/buici-clock/files/patch-xo_Makefile.in Tue Jan 26 13:58:55 2021 (r562664)
+++ head/x11-clocks/buici-clock/files/patch-xo_Makefile.in Tue Jan 26 13:59:25 2021 (r562665)
@@ -11,3 +11,11 @@
FLEX=@LEX@
YACC=@YACC@
+@@ -104,7 +104,6 @@ $(O_D)%.o: %.s
+
+ %.cxx: %.y
+ $(YACC) -d -o $@ $<
+- mv $(basename $@).hxx $(basename $@).h
+
+ %.i: %.cxx
+ $(CC) -c $(CXXFLAGS) $(CXXFLAGS_) -E -o $(notdir $@) $<
Added: head/x11-clocks/buici-clock/files/patch-xo_res.cxx
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-clocks/buici-clock/files/patch-xo_res.cxx Tue Jan 26 13:59:25 2021 (r562665)
@@ -0,0 +1,11 @@
+--- xo/res.cxx.orig 2012-12-29 18:51:57 UTC
++++ xo/res.cxx
+@@ -43,7 +43,7 @@
+
+ #define IS_PARSER
+ #include "lres.h"
+-#include "res_y.h"
++#include "res_y.hxx"
+
+ #define LONG_PRIME_MAX (LONG_MAX/10)
+ #define LONG_PRIME_MAX_REM (LONG_MAX - LONG_PRIME_MAX*10)
Added: head/x11-clocks/buici-clock/files/patch-xo_res__l.l
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-clocks/buici-clock/files/patch-xo_res__l.l Tue Jan 26 13:59:25 2021 (r562665)
@@ -0,0 +1,11 @@
+--- xo/res_l.l.orig 2012-12-29 18:51:57 UTC
++++ xo/res_l.l
+@@ -33,7 +33,7 @@
+ #include "standard.h"
+ #define IS_PARSER
+ #include "lres.h"
+-#include "res_y.h"
++#include "res_y.hxx"
+ #include <limits.h>
+
+ #if defined (__cplusplus)
More information about the svn-ports-all
mailing list