1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* common.mk (parse.c): depends on tool/ytab.sed.

Browse Source 
* tool/ytab.sed: hack for bison 2.1.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14697 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2007-12-25 12:26:11 +00:00
parent 42643e482e
commit d050e46b8c
3 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Tue Dec 25 21:26:09 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk (parse.c): depends on tool/ytab.sed.
* tool/ytab.sed: hack for bison 2.1.
Tue Dec 25 20:24:58 2007 Technorama Ltd. <oss-ruby@technorama.net> Tue Dec 25 20:24:58 2007 Technorama Ltd. <oss-ruby@technorama.net>
* ext/openssl/ossl_ssl.c: Only show a warning if the default * ext/openssl/ossl_ssl.c: Only show a warning if the default

2
common.mk
View File

@ -368,7 +368,7 @@ enc.mk: $(srcdir)/enc/make_encmake.rb $(srcdir)/enc/Makefile.in $(srcdir)/enc/de
PHONY: PHONY:
{$(VPATH)}parse.c: {$(VPATH)}parse.y {$(VPATH)}parse.c: {$(VPATH)}parse.y $(srcdir)/tool/ytab.sed
{$(srcdir)}.y.c: {$(srcdir)}.y.c:
$(YACC) $(YFLAGS) -o y.tab.c $< $(YACC) $(YFLAGS) -o y.tab.c $<

22
tool/ytab.sed
View File

@ -5,6 +5,26 @@ i\
a\ a\
#endif #endif
} }
s/^[ ]*\(yyerror[ ]*([ ]*parser,\)/parser_\1/ /^yydestruct/,/#endif/{
/^yydestruct/{
/parser/!{
h
s/^/ruby_parser_&/
s/)$/, parser)/
/\*/s/parser)$/struct parser_params *&/
}
}
/^#endif/{
x
/^./{
i\
struct parser_params *parser;
a\
#define yydestruct(m, t, v) ruby_parser_yydestruct(m, t, v, parser)
}
x
}
}
s/^\([ ]*\)\(yyerror[ ]*([ ]*parser,\)/\1parser_\2/
s!^ *extern char \*getenv();!/* & */! s!^ *extern char \*getenv();!/* & */!
s/^\(#.*\)".*\.tab\.c"/\1"parse.c"/ s/^\(#.*\)".*\.tab\.c"/\1"parse.c"/