diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-11-15 11:49:06 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-11-15 11:49:06 +0000 |
| commit | 7cd76ab0c579ee5400d0d33753369e675b497d36 () | |
| tree | d35212b88b3af66efc3eada3fd4c4e114317d431 | |
| parent | 64f9f1ba5884975ba91abcdb7697988ba0ba64bf (diff) | |
* internal.h: Include ruby.h and ruby/encoding.h to be
includable without prior inclusion. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48447 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
70 files changed, 186 insertions, 116 deletions
@@ -1,3 +1,8 @@ Sat Nov 15 20:46:44 2014 Kouhei Sutou <[email protected]> * test/rexml/test_document.rb @@ -11,11 +11,9 @@ **********************************************************************/ -#include "ruby/ruby.h" #include "ruby/util.h" #include "ruby/st.h" -#include "ruby/encoding.h" -#include "internal.h" #include "probes.h" #include "id.h" @@ -9,10 +9,9 @@ **********************************************************************/ -#include "ruby/ruby.h" #include "ruby/thread.h" #include "ruby/util.h" -#include "internal.h" #ifdef HAVE_STRINGS_H #include <strings.h> @@ -23,12 +23,11 @@ * \{ */ -#include "ruby/ruby.h" #include "ruby/st.h" #include "method.h" #include "constant.h" #include "vm_core.h" -#include "internal.h" #include <ctype.h> int rb_vm_add_root_module(ID id, VALUE module); @@ -2091,4 +2091,104 @@ vm_trace.$(OBJEXT): {$(VPATH)}thread_native.h vm_trace.$(OBJEXT): {$(VPATH)}vm_core.h vm_trace.$(OBJEXT): {$(VPATH)}vm_debug.h vm_trace.$(OBJEXT): {$(VPATH)}vm_opts.h # AUTOGENERATED DEPENDENCIES END @@ -9,7 +9,6 @@ **********************************************************************/ -#include "ruby/ruby.h" #include "internal.h" #include <math.h> @@ -5,7 +5,6 @@ which is written in ruby. */ -#include "ruby.h" #include "internal.h" #include <math.h> @@ -9,7 +9,6 @@ **********************************************************************/ -#include "ruby/ruby.h" #include "internal.h" #include "vm_core.h" #include "gc.h" @@ -11,8 +11,6 @@ **********************************************************************/ -#include "ruby/ruby.h" -#include "ruby/encoding.h" #include "internal.h" #include <sys/types.h> @@ -9,8 +9,6 @@ **********************************************************************/ -#include "ruby/ruby.h" -#include "ruby/encoding.h" #include "internal.h" #include "regenc.h" #include <ctype.h> @@ -9,11 +9,10 @@ **********************************************************************/ -#include "ruby/ruby.h" #include "ruby/util.h" #include "node.h" #include "id.h" -#include "internal.h" VALUE rb_f_send(int argc, VALUE *argv, VALUE recv); @@ -12,9 +12,8 @@ ************************************************/ -#include "ruby/ruby.h" -#include "node.h" #include "internal.h" /* * Document-class: Enumerator @@ -9,10 +9,8 @@ **********************************************************************/ -#include "ruby/ruby.h" -#include "ruby/st.h" -#include "ruby/encoding.h" #include "internal.h" #include "vm_core.h" #include <stdio.h> @@ -11,12 +11,11 @@ **********************************************************************/ #include "eval_intern.h" #include "iseq.h" #include "gc.h" #include "ruby/vm.h" -#include "ruby/encoding.h" -#include "internal.h" #include "vm_core.h" #include "probes_helper.h" @@ -1,4 +1,3 @@ -#include "ruby.h" #include "internal.h" static VALUE @@ -1,4 +1,3 @@ -#include "ruby.h" #include "internal.h" static VALUE @@ -67,4 +67,16 @@ str2big.o: $(hdrdir)/ruby/missing.h str2big.o: $(hdrdir)/ruby/ruby.h str2big.o: $(hdrdir)/ruby/st.h str2big.o: $(hdrdir)/ruby/subst.h # AUTOGENERATED DEPENDENCIES END @@ -1,4 +1,3 @@ -#include "ruby.h" #include "internal.h" static VALUE @@ -1,4 +1,3 @@ -#include "ruby.h" #include "internal.h" static VALUE @@ -1,4 +1,3 @@ -#include "ruby.h" #include "internal.h" static VALUE @@ -1,4 +1,3 @@ -#include "ruby.h" #include "internal.h" static VALUE @@ -1,3 +1,8 @@ $(OBJS): $(HDRS) $(ruby_headers) rat.o: rat.c $(top_srcdir)/internal.h @@ -1,4 +1,3 @@ -#include "ruby.h" #include "internal.h" #if defined(HAVE_LIBGMP) && defined(HAVE_GMP_H) @@ -89,4 +89,6 @@ set_len.o: $(hdrdir)/ruby/missing.h set_len.o: $(hdrdir)/ruby/ruby.h set_len.o: $(hdrdir)/ruby/st.h set_len.o: $(hdrdir)/ruby/subst.h # AUTOGENERATED DEPENDENCIES END @@ -1,4 +1,3 @@ -#include "ruby.h" #include "internal.h" #ifdef __APPLE__ @@ -15,4 +15,6 @@ coverage.o: $(top_srcdir)/ccan/check_type/check_type.h coverage.o: $(top_srcdir)/ccan/container_of/container_of.h coverage.o: $(top_srcdir)/ccan/list/list.h coverage.o: $(top_srcdir)/ccan/str/str.h # AUTOGENERATED DEPENDENCIES END @@ -51,4 +51,9 @@ objspace_dump.o: $(hdrdir)/ruby/missing.h objspace_dump.o: $(hdrdir)/ruby/ruby.h objspace_dump.o: $(hdrdir)/ruby/st.h objspace_dump.o: $(hdrdir)/ruby/subst.h # AUTOGENERATED DEPENDENCIES END @@ -13,10 +13,9 @@ **********************************************************************/ -#include "ruby/ruby.h" #include "ruby/debug.h" #include "objspace.h" -#include "internal.h" struct traceobj_arg { int running; @@ -12,13 +12,12 @@ **********************************************************************/ -#include <ruby/ruby.h> #include <ruby/st.h> #include <ruby/io.h> #include <ruby/re.h> #include "node.h" #include "gc.h" -#include "internal.h" /* * call-seq: @@ -12,15 +12,13 @@ **********************************************************************/ -#include "ruby/ruby.h" #include "ruby/debug.h" -#include "ruby/encoding.h" #include "ruby/io.h" #include "gc.h" #include "node.h" #include "vm_core.h" #include "objspace.h" -#include "internal.h" static VALUE sym_output, sym_stdout, sym_string, sym_file; @@ -11,4 +11,5 @@ pty.o: $(hdrdir)/ruby/ruby.h pty.o: $(hdrdir)/ruby/st.h pty.o: $(hdrdir)/ruby/subst.h pty.o: $(hdrdir)/ruby/util.h # AUTOGENERATED DEPENDENCIES END @@ -33,10 +33,9 @@ #endif #include <ctype.h> -#include "ruby/ruby.h" #include "ruby/io.h" #include "ruby/util.h" -#include "internal.h" #include <signal.h> #ifdef HAVE_SYS_STROPTS_H @@ -11,4 +11,5 @@ readline.o: $(hdrdir)/ruby/ruby.h readline.o: $(hdrdir)/ruby/st.h readline.o: $(hdrdir)/ruby/subst.h readline.o: $(hdrdir)/ruby/thread.h # AUTOGENERATED DEPENDENCIES END @@ -33,10 +33,9 @@ #include <editline/readline.h> #endif -#include "ruby/ruby.h" #include "ruby/io.h" #include "ruby/thread.h" -#include "internal.h" #ifdef HAVE_UNISTD_H #include <unistd.h> @@ -68,4 +68,5 @@ ripper.o: $(hdrdir)/ruby/ruby.h ripper.o: $(hdrdir)/ruby/st.h ripper.o: $(hdrdir)/ruby/subst.h ripper.o: $(hdrdir)/ruby/util.h # AUTOGENERATED DEPENDENCIES END @@ -247,4 +247,19 @@ unixsocket.o: $(hdrdir)/ruby/st.h unixsocket.o: $(hdrdir)/ruby/subst.h unixsocket.o: $(hdrdir)/ruby/thread.h unixsocket.o: $(hdrdir)/ruby/util.h # AUTOGENERATED DEPENDENCIES END @@ -23,11 +23,10 @@ #include <CoreFoundation/CFString.h> #endif -#include "ruby/ruby.h" #include "ruby/io.h" #include "ruby/util.h" #include "dln.h" -#include "internal.h" #ifdef HAVE_UNISTD_H #include <unistd.h> @@ -11,7 +11,7 @@ **********************************************************************/ -#include "ruby/ruby.h" #include "ruby/st.h" #include "ruby/re.h" #include "ruby/io.h" @@ -20,7 +20,6 @@ #include "ruby/debug.h" #include "eval_intern.h" #include "vm_core.h" -#include "internal.h" #include "gc.h" #include "constant.h" #include "ruby_atomic.h" @@ -11,11 +11,9 @@ **********************************************************************/ -#include "ruby/ruby.h" #include "ruby/st.h" #include "ruby/util.h" -#include "ruby/encoding.h" -#include "internal.h" #include <errno.h> #include "probes.h" #include "id.h" @@ -9,7 +9,6 @@ **********************************************************************/ -#include "ruby/ruby.h" #include "internal.h" #define CALL(n) {void Init_##n(void); Init_##n();} @@ -12,6 +12,9 @@ #ifndef RUBY_INTERNAL_H #define RUBY_INTERNAL_H 1 #if defined(__cplusplus) extern "C" { #if 0 @@ -568,7 +571,6 @@ PRINTF_ARGS(void ruby_debug_printf(const char*, ...), 1, 2); void Init_ext(void); /* encoding.c */ -#ifdef RUBY_ENCODING_H enum ruby_preserved_encindex { ENCINDEX_ASCII, ENCINDEX_UTF_8, @@ -589,7 +591,7 @@ enum ruby_preserved_encindex { ENCINDEX_BUILTIN_MAX }; -#endif #define rb_ascii8bit_encindex() ENCINDEX_ASCII #define rb_utf8_encindex() ENCINDEX_UTF_8 #define rb_usascii_encindex() ENCINDEX_US_ASCII @@ -11,11 +11,10 @@ **********************************************************************/ -#include "ruby/ruby.h" #include "ruby/io.h" #include "ruby/thread.h" #include "dln.h" -#include "internal.h" #include "id.h" #include <ctype.h> #include <errno.h> @@ -9,9 +9,8 @@ **********************************************************************/ -#include "ruby/ruby.h" -#include "ruby/util.h" #include "internal.h" #include "eval_intern.h" /* #define RUBY_MARK_FREE_DEBUG 1 */ @@ -2,9 +2,8 @@ * load methods from eval.c */ -#include "ruby/ruby.h" -#include "ruby/util.h" #include "internal.h" #include "dln.h" #include "eval_intern.h" #include "probes.h" @@ -9,8 +9,6 @@ **********************************************************************/ -#include "ruby/ruby.h" -#include "ruby/encoding.h" #include "internal.h" #ifdef __CYGWIN__ #include <windows.h> @@ -13,12 +13,10 @@ # error too old GCC #endif -#include "ruby/ruby.h" #include "ruby/io.h" #include "ruby/st.h" #include "ruby/util.h" -#include "ruby/encoding.h" -#include "internal.h" #include <math.h> #ifdef HAVE_FLOAT_H @@ -9,7 +9,6 @@ **********************************************************************/ -#include "ruby/ruby.h" #include "internal.h" #include <float.h> #include <math.h> @@ -9,10 +9,8 @@ **********************************************************************/ -#include "ruby/ruby.h" -#include "ruby/encoding.h" -#include "ruby/util.h" #include "internal.h" #include "id.h" #include <ctype.h> #include <math.h> @@ -11,17 +11,15 @@ **********************************************************************/ -#include "ruby/ruby.h" #include "ruby/st.h" #include "ruby/util.h" -#include "ruby/encoding.h" #include <stdio.h> #include <errno.h> #include <ctype.h> #include <math.h> #include <float.h> #include "constant.h" -#include "internal.h" #include "id.h" #include "probes.h" @@ -9,8 +9,6 @@ **********************************************************************/ -#include "ruby/ruby.h" -#include "ruby/encoding.h" #include "internal.h" #include <sys/types.h> #include <ctype.h> @@ -11,11 +11,10 @@ **********************************************************************/ -#include "ruby/ruby.h" #include "ruby/io.h" #include "ruby/thread.h" #include "ruby/util.h" -#include "internal.h" #include "vm_core.h" #include <stdio.h> @@ -59,7 +59,6 @@ The original copyright notice follows. email: [email protected] */ -#include "ruby/ruby.h" #include "internal.h" #include <limits.h> @@ -9,8 +9,6 @@ **********************************************************************/ -#include "ruby/ruby.h" -#include "ruby/encoding.h" #include "internal.h" #include "id.h" @@ -5,7 +5,6 @@ which is written in ruby. */ -#include "ruby.h" #include "internal.h" #include <math.h> #include <float.h> @@ -9,11 +9,9 @@ **********************************************************************/ -#include "ruby/ruby.h" #include "ruby/re.h" -#include "ruby/encoding.h" #include "ruby/util.h" -#include "internal.h" #include "regint.h" #include <ctype.h> @@ -15,8 +15,6 @@ #include <windows.h> #include <sys/cygwin.h> #endif -#include "ruby/ruby.h" -#include "ruby/encoding.h" #include "internal.h" #include "eval_intern.h" #include "dln.h" @@ -11,14 +11,13 @@ **********************************************************************/ -#include "ruby/ruby.h" #include "vm_core.h" #include <signal.h> #include <stdio.h> #include <errno.h> #include "ruby_atomic.h" #include "eval_intern.h" -#include "internal.h" #ifdef HAVE_UNISTD_H # include <unistd.h> #endif @@ -11,10 +11,8 @@ **********************************************************************/ -#include "ruby/ruby.h" -#include "ruby/re.h" -#include "ruby/encoding.h" #include "internal.h" #include "id.h" #include <math.h> #include <stdarg.h> @@ -6,7 +6,6 @@ #include "regint.h" #include "st.h" #else -#include "ruby/ruby.h" #include "internal.h" #endif @@ -11,10 +11,8 @@ **********************************************************************/ -#include "ruby/ruby.h" -#include "ruby/re.h" -#include "ruby/encoding.h" #include "internal.h" #include "probes.h" #include "gc.h" #include <assert.h> @@ -9,7 +9,6 @@ **********************************************************************/ -#include "ruby/ruby.h" #include "internal.h" VALUE rb_cStruct; @@ -9,10 +9,8 @@ **********************************************************************/ -#include "ruby/ruby.h" -#include "ruby/st.h" -#include "ruby/encoding.h" #include "internal.h" #include "node.h" #include "symbol.h" #include "gc.h" @@ -9,12 +9,10 @@ **********************************************************************/ -#include "ruby/ruby.h" #include <sys/types.h> #include <time.h> #include <errno.h> -#include "ruby/encoding.h" -#include "internal.h" #ifdef HAVE_UNISTD_H #include <unistd.h> @@ -9,8 +9,6 @@ **********************************************************************/ -#include "ruby/ruby.h" -#include "ruby/encoding.h" #include "internal.h" #include "transcode_data.h" #include <ctype.h> @@ -9,7 +9,6 @@ **********************************************************************/ -#include "ruby/ruby.h" #include "internal.h" #include <ctype.h> @@ -11,13 +11,11 @@ **********************************************************************/ -#include "ruby/ruby.h" #include "ruby/st.h" #include "ruby/util.h" -#include "ruby/encoding.h" #include "node.h" #include "constant.h" -#include "internal.h" #include "id.h" st_table *rb_global_tbl; @@ -8,11 +8,9 @@ **********************************************************************/ -#include "ruby/ruby.h" #include "ruby/vm.h" #include "ruby/st.h" -#include "ruby/encoding.h" -#include "internal.h" #include "gc.h" #include "vm_core.h" @@ -9,11 +9,9 @@ **********************************************************************/ -#include "ruby/ruby.h" -#include "ruby/encoding.h" #include "ruby/debug.h" -#include "internal.h" #include "vm_core.h" #include "eval_intern.h" #include "iseq.h" @@ -9,10 +9,9 @@ **********************************************************************/ -#include "ruby/ruby.h" #include "addr2line.h" #include "vm_core.h" -#include "internal.h" #include "iseq.h" /* see vm_insnhelper.h for the values */ @@ -21,11 +21,9 @@ * */ -#include "ruby/ruby.h" #include "ruby/debug.h" -#include "ruby/encoding.h" -#include "internal.h" #include "vm_core.h" #include "eval_intern.h" |