From b4fef39a40db7783e639436ca2836cfb90c7bde9 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 28 Jul 2005 12:49:31 +0000 Subject: [PATCH] * parse.y (rb_parser_end_seen_p): exclude from ripper. * sprintf.c (clearerr): remove standard macro before re-definition. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8862 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 30 +++++++++++++++++++----------- parse.y | 2 +- sprintf.c | 1 + 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 56ea489a38..1f212d167d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,34 +1,42 @@ +Thu Jul 28 21:49:17 2005 IWATSUKI Hiroyuki + + * parse.y (rb_parser_end_seen_p): exclude from ripper. + + + * sprintf.c (clearerr): remove standard macro before re-definition. + + Thu Jul 28 18:09:55 2005 Hidetoshi NAGAI * ext/tk/stubs.c: When --enable-tcltk-stubs, the initialize - routine creates a Tcl/Tk interpreter and deletes it. However, - init cost of Tk's MainWindow is not so small. And that makes it - impossible to use libraries written with Tcl functions only on + routine creates a Tcl/Tk interpreter and deletes it. However, + init cost of Tk's MainWindow is not so small. And that makes it + impossible to use libraries written with Tcl functions only on an environment without a graphical display. This changes support delaying initalization of Tk_Stubs until the script needs Tk. - * ext/tk/stubs.h: New file. Define prototypes and return codes of + * ext/tk/stubs.h: New file. Define prototypes and return codes of functions on stubs.c. - * ext/tk/tcltklib.c: Support delaying initalization of Tk_Stubs + * ext/tk/tcltklib.c: Support delaying initalization of Tk_Stubs until the script needs Tk. - * ext/tk/tcltklib.c: Show friendly error messages for errors on + * ext/tk/tcltklib.c: Show friendly error messages for errors on initialization. - * ext/tk/tcltklib.c: Avoid SEGV on ip_finalize() when ruby is - exiting and $DEBUG is true. (Not fix. If you know the reason of + * ext/tk/tcltklib.c: Avoid SEGV on ip_finalize() when ruby is + exiting and $DEBUG is true. (Not fix. If you know the reason of why, please fix it.) - * ext/tk/tkutil/tkutil.c (ary2list, ary2list2): bug fix on handling + * ext/tk/tkutil/tkutil.c (ary2list, ary2list2): bug fix on handling of encoding. * ext/tk/lib/multi-tk.rb: MultiTkIp#eval_string and bg_eval_string - don't work propery. + don't work propery. * ext/tk/lib/tk.rb: Forget extending Tk::Encoding module to Tk. - * ext/tk/lib/tk/variable.rb: TkVarAccess fails to initialize the + * ext/tk/lib/tk/variable.rb: TkVarAccess fails to initialize the object for an element of a Tcl's array variable. Thu Jul 28 17:23:37 2005 Yukihiro Matsumoto diff --git a/parse.y b/parse.y index cca7eca2d6..9c3c3e0877 100644 --- a/parse.y +++ b/parse.y @@ -8791,7 +8791,6 @@ rb_parser_new() return Data_Wrap_Struct(0, parser_mark, parser_free, p); } -#endif /* * call-seq: @@ -8809,6 +8808,7 @@ rb_parser_end_seen_p(vparser) Data_Get_Struct(vparser, struct parser_params, parser); return ruby__end__seen ? Qtrue : Qfalse; } +#endif #ifdef RIPPER #ifdef RIPPER_DEBUG diff --git a/sprintf.c b/sprintf.c index c29ca23b22..7e2178e93f 100644 --- a/sprintf.c +++ b/sprintf.c @@ -837,6 +837,7 @@ fmt_setup(buf, c, flags, width, prec) #define __sFILE rb_printf_sfile #undef feof #undef ferror +#undef clearerr #undef fileno #if SIZEOF_LONG < SIZEOF_VOIDP # if SIZEOF_LONG_LONG == SIZEOF_VOIDP