RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: syck Date: 23-Feb-2015 10:13:25
Branch: rpm-5_4 Handle: 2015022309132500
Modified files: (Branch: rpm-5_4)
syck/lib Makefile.am gram.y syck.h token.c
Log:
- syck: repair bison damage.
Summary:
Revision Changes Path
1.6.8.2 +19 -19 syck/lib/Makefile.am
1.3.8.1 +1 -0 syck/lib/gram.y
1.5.8.1 +1 -1 syck/lib/syck.h
1.7.6.1 +8 -7 syck/lib/token.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: syck/lib/Makefile.am
============================================================================
$ cvs diff -u -r1.6.8.1 -r1.6.8.2 Makefile.am
--- syck/lib/Makefile.am 8 Aug 2013 21:58:58 -0000 1.6.8.1
+++ syck/lib/Makefile.am 23 Feb 2015 09:13:25 -0000 1.6.8.2
@@ -49,25 +49,25 @@
token.c \
implicit.c
-gram.c: gram.y
- $(YACC) -d -t -v -p syck -o $@ $<
- -@if test -f gram.c; then \
- { echo "/*@-globs -mods -modnomods -moduncon -modunconnomods @*/";\
- echo "/*@-noeffect -noeffectuncon @*/";\
- echo "/*@-nullassign @*/";\
- echo "/*@-readonlytrans @*/";\
- echo "/*@-uniondef @*/";\
- echo "/*@-warnlintcomments @*/";\
- cat gram.c;\
- echo "/*@=warnlintcomments @*/";\
- echo "/*@=uniondef @*/";\
- echo "/*@=readonlytrans @*/";\
- echo "/*@=nullassign @*/";\
- echo "/*@=noeffect =noeffectuncon @*/";\
- echo "/*@=globs =mods =modnomods =moduncon =modunconnomods @*/";\
- } > _gram.c ;\
- mv -f _gram.c gram.c; \
- fi
+#gram.c: gram.y
+# $(YACC) -d -t -v -p syck -o $@ $<
+# -@if test -f gram.c; then \
+# { echo "/*@-globs -mods -modnomods -moduncon -modunconnomods @*/";\
+# echo "/*@-noeffect -noeffectuncon @*/";\
+# echo "/*@-nullassign @*/";\
+# echo "/*@-readonlytrans @*/";\
+# echo "/*@-uniondef @*/";\
+# echo "/*@-warnlintcomments @*/";\
+# cat gram.c;\
+# echo "/*@=warnlintcomments @*/";\
+# echo "/*@=uniondef @*/";\
+# echo "/*@=readonlytrans @*/";\
+# echo "/*@=nullassign @*/";\
+# echo "/*@=noeffect =noeffectuncon @*/";\
+# echo "/*@=globs =mods =modnomods =moduncon =modunconnomods @*/";\
+# } > _gram.c ;\
+# mv -f _gram.c gram.c; \
+# fi
BUILT_SOURCES = gram.c gram.h
@@ .
patch -p0 <<'@@ .'
Index: syck/lib/gram.y
============================================================================
$ cvs diff -u -r1.3 -r1.3.8.1 gram.y
--- syck/lib/gram.y 31 Mar 2009 23:05:59 -0000 1.3
+++ syck/lib/gram.y 23 Feb 2015 09:13:25 -0000 1.3.8.1
@@ -9,6 +9,7 @@
%start doc
%pure-parser
+%param {void *parser}
%{
@@ .
patch -p0 <<'@@ .'
Index: syck/lib/syck.h
============================================================================
$ cvs diff -u -r1.5 -r1.5.8.1 syck.h
--- syck/lib/syck.h 2 Apr 2009 13:23:49 -0000 1.5
+++ syck/lib/syck.h 23 Feb 2015 09:13:25 -0000 1.5.8.1
@@ -619,7 +619,7 @@
/*
* Lexer prototypes
*/
-void syckerror( char *msg )
+void syckerror( void *, char *msg )
/*@*/;
int syckparse( void * )
/*@globals fileSystem @*/
@@ .
patch -p0 <<'@@ .'
Index: syck/lib/token.c
============================================================================
$ cvs diff -u -r1.7 -r1.7.6.1 token.c
--- syck/lib/token.c 3 Apr 2009 11:16:57 -0000 1.7
+++ syck/lib/token.c 23 Feb 2015 09:13:25 -0000 1.7.6.1
@@ -270,11 +270,11 @@
return sycklex_yaml_utf8( sycklval, parser );
case syck_yaml_utf16:
- syckerror( "UTF-16 is not currently supported in Syck.\nPlease
contribute code to help this happen!" );
+ syckerror( parser, "UTF-16 is not currently supported in
Syck.\nPlease contribute code to help this happen!" );
break;
case syck_yaml_utf32:
- syckerror( "UTF-32 is not currently supported in Syck.\nPlease
contribute code to help this happen!" );
+ syckerror( parser, "UTF-32 is not currently supported in
Syck.\nPlease contribute code to help this happen!" );
break;
case syck_bytecode_utf8:
@@ -2739,14 +2739,15 @@
}
void
-syckerror( char *msg )
+syckerror( void *p, char *msg )
{
+ SyckParser * parser = (SyckParser *)p;
/*@-mods@*/
- if ( syck_parser_ptr->error_handler == NULL )
- syck_parser_ptr->error_handler = syck_default_error_handler;
+ if ( parser->error_handler == NULL )
+ parser->error_handler = syck_default_error_handler;
- syck_parser_ptr->root = syck_parser_ptr->root_on_error;
+ parser->root = parser->root_on_error;
/*@=mods@*/
- (syck_parser_ptr->error_handler)(syck_parser_ptr, msg);
+ (parser->error_handler)(parser, msg);
}
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
