* include/ruby/{intern,ruby}.h, compile.[ch], error.c, eval.c,

  eval_load.c, gc.c, iseq.c, main.c, parse.y, re.c, ruby.c,
  yarvcore.[ch] (ruby_eval_tree, ruby_sourcefile, ruby_sourceline,
  ruby_nerrs): purge global variables.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12700 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 9 insertions, 8 deletions

diff --git a/include/ruby/intern.h b/include/ruby/intern.h
index 9c597f0f64..77663fd5f0 100644
--- a/include/ruby/intern.h
+++ b/include/ruby/intern.h
@@ -160,14 +160,13 @@ VALUE rb_enumeratorize(VALUE, VALUE, int, VALUE *);
 				    argc, argv);			\
     } while (0)
 /* error.c */
-RUBY_EXTERN int ruby_nerrs;
 VALUE rb_exc_new(VALUE, const char*, long);
 VALUE rb_exc_new2(VALUE, const char*);
 VALUE rb_exc_new3(VALUE, VALUE);
 PRINTF_ARGS(NORETURN(void rb_loaderror(const char*, ...)), 1, 2);
 PRINTF_ARGS(NORETURN(void rb_name_error(ID, const char*, ...)), 2, 3);
 NORETURN(void rb_invalid_str(const char*, const char*));
-PRINTF_ARGS(void rb_compile_error(const char*, ...), 1, 2);
+PRINTF_ARGS(void rb_compile_error(const char*, int, const char*, ...), 3, 4);
 PRINTF_ARGS(void rb_compile_error_append(const char*, ...), 1, 2);
 NORETURN(void rb_load_fail(const char*));
 NORETURN(void rb_error_frozen(const char*));
@@ -454,7 +453,7 @@ VALUE rb_reg_match_pre(VALUE);
 VALUE rb_reg_match_post(VALUE);
 VALUE rb_reg_match_last(VALUE);
 VALUE rb_reg_new(const char*, long, int);
-VALUE rb_reg_compile(const char*, long, int);
+VALUE rb_reg_compile(const char*, long, int, const char*, int);
 VALUE rb_reg_match(VALUE, VALUE);
 VALUE rb_reg_match2(VALUE);
 int rb_reg_options(VALUE);
@@ -467,8 +466,7 @@ void *rb_load_file(const char*);
 void ruby_script(const char*);
 void ruby_prog_init(void);
 void ruby_set_argv(int, char**);
-void ruby_process_options(int, char**);
-void ruby_load_script(void);
+void *ruby_process_options(int, char**);
 void ruby_init_loadpath(void);
 void ruby_incpush(const char*);
 /* signal.c */
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h
index e6c16e82bb..059c145265 100644
--- a/include/ruby/ruby.h
+++ b/include/ruby/ruby.h
@@ -299,6 +299,8 @@ enum ruby_value_type {
 
 #define TYPE(x) rb_type((VALUE)(x))
 
+#define RB_GC_GUARD(v) (*(volatile VALUE *)&(v))
+
 void rb_check_type(VALUE,int);
 #define Check_Type(v,t) rb_check_type((VALUE)(v),t)
 
@@ -701,11 +703,11 @@ NORETURN(void rb_notimplement(void));
 
 /* reports if `-w' specified */
 PRINTF_ARGS(void rb_warning(const char*, ...), 1, 2);
-PRINTF_ARGS(void rb_compile_warning(const char*, ...), 1, 2);
+PRINTF_ARGS(void rb_compile_warning(const char *, int, const char*, ...), 3, 4);
 PRINTF_ARGS(void rb_sys_warning(const char*, ...), 1, 2);
 /* reports always */
 PRINTF_ARGS(void rb_warn(const char*, ...), 1, 2);
-PRINTF_ARGS(void rb_compile_warn(const char*, ...), 1, 2);
+PRINTF_ARGS(void rb_compile_warn(const char *, int, const char*, ...), 3, 4);
 
 VALUE rb_each(VALUE);
 VALUE rb_yield(VALUE);
@@ -735,7 +737,8 @@ void ruby_init_stack(VALUE*);
     ruby_init_stack(&variable_in_this_stack_frame);
 #endif
 void ruby_init(void);
-void ruby_options(int, char**);
+void *ruby_options(int, char**);
+int ruby_run_node(void *);
 NORETURN(void ruby_run(void));
 
 RUBY_EXTERN VALUE rb_mKernel;