ruby-changes:49598
From: nobu <ko1@a...>
Date: Tue, 9 Jan 2018 15:24:21 +0900 (JST)
Subject: [ruby-changes:49598] nobu:r61713 (trunk): internal.h: remove dependecy on ruby/encoding.h
nobu 2018-01-09 15:24:11 +0900 (Tue, 09 Jan 2018) New Revision: 61713 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=61713 Log: internal.h: remove dependecy on ruby/encoding.h Modified files: trunk/array.c trunk/compile.c trunk/dir.c trunk/encoding.c trunk/enum.c trunk/error.c trunk/ext/-test-/string/cstr.c trunk/file.c trunk/gc.c trunk/hash.c trunk/internal.h trunk/io.c trunk/load.c trunk/localeinit.c trunk/numeric.c trunk/object.c trunk/pack.c trunk/re.c trunk/ruby.c trunk/sprintf.c trunk/string.c trunk/symbol.c trunk/time.c trunk/transcode.c trunk/variable.c trunk/vm.c trunk/vm_backtrace.c trunk/vm_core.h Index: internal.h =================================================================== --- internal.h (revision 61712) +++ internal.h (revision 61713) @@ -13,7 +13,6 @@ https://github.com/ruby/ruby/blob/trunk/internal.h#L13 #define RUBY_INTERNAL_H 1 #include "ruby.h" -#include "ruby/encoding.h" #if defined(__cplusplus) extern "C" { @@ -1149,8 +1148,10 @@ void Init_ext(void); https://github.com/ruby/ruby/blob/trunk/internal.h#L1148 /* encoding.c */ ID rb_id_encoding(void); void rb_gc_mark_encodings(void); +#ifdef RUBY_ENCODING_H rb_encoding *rb_enc_get_from_index(int index); rb_encoding *rb_enc_check_str(VALUE str1, VALUE str2); +#endif int rb_encdb_replicate(const char *alias, const char *orig); int rb_encdb_alias(const char *alias, const char *orig); int rb_encdb_dummy(const char *name); @@ -1169,21 +1170,23 @@ extern VALUE rb_eEAGAIN; https://github.com/ruby/ruby/blob/trunk/internal.h#L1170 extern VALUE rb_eEWOULDBLOCK; extern VALUE rb_eEINPROGRESS; void rb_report_bug_valist(VALUE file, int line, const char *fmt, va_list args); -VALUE rb_syntax_error_append(VALUE, VALUE, int, int, rb_encoding*, const char*, va_list); VALUE rb_check_backtrace(VALUE); NORETURN(void rb_async_bug_errno(const char *,int)); const char *rb_builtin_type_name(int t); const char *rb_builtin_class_name(VALUE x); PRINTF_ARGS(void rb_sys_warn(const char *fmt, ...), 1, 2); PRINTF_ARGS(void rb_syserr_warn(int err, const char *fmt, ...), 2, 3); +PRINTF_ARGS(void rb_sys_warning(const char *fmt, ...), 1, 2); +PRINTF_ARGS(void rb_syserr_warning(int err, const char *fmt, ...), 2, 3); +#ifdef RUBY_ENCODING_H +VALUE rb_syntax_error_append(VALUE, VALUE, int, int, rb_encoding*, const char*, va_list); PRINTF_ARGS(void rb_enc_warn(rb_encoding *enc, const char *fmt, ...), 2, 3); PRINTF_ARGS(void rb_sys_enc_warn(rb_encoding *enc, const char *fmt, ...), 2, 3); PRINTF_ARGS(void rb_syserr_enc_warn(int err, rb_encoding *enc, const char *fmt, ...), 3, 4); -PRINTF_ARGS(void rb_sys_warning(const char *fmt, ...), 1, 2); -PRINTF_ARGS(void rb_syserr_warning(int err, const char *fmt, ...), 2, 3); PRINTF_ARGS(void rb_enc_warning(rb_encoding *enc, const char *fmt, ...), 2, 3); PRINTF_ARGS(void rb_sys_enc_warning(rb_encoding *enc, const char *fmt, ...), 2, 3); PRINTF_ARGS(void rb_syserr_enc_warning(int err, rb_encoding *enc, const char *fmt, ...), 3, 4); +#endif #define rb_raise_cstr(etype, mesg) \ rb_exc_raise(rb_exc_new_str(etype, rb_str_new_cstr(mesg))) @@ -1801,17 +1804,23 @@ int rb_divert_reserved_fd(int fd); https://github.com/ruby/ruby/blob/trunk/internal.h#L1804 /* transcode.c */ extern VALUE rb_cEncodingConverter; +#ifdef RUBY_ENCODING_H size_t rb_econv_memsize(rb_econv_t *); +#endif /* us_ascii.c */ +#ifdef RUBY_ENCODING_H extern rb_encoding OnigEncodingUS_ASCII; +#endif /* util.c */ char *ruby_dtoa(double d_, int mode, int ndigits, int *decpt, int *sign, char **rve); char *ruby_hdtoa(double d, const char *xdigs, int ndigits, int *decpt, int *sign, char **rve); /* utf_8.c */ +#ifdef RUBY_ENCODING_H extern rb_encoding OnigEncodingUTF_8; +#endif /* variable.c */ void rb_gc_mark_global_tbl(void); @@ -1932,7 +1941,7 @@ NORETURN(void rb_unexpected_type(VALUE,i https://github.com/ruby/ruby/blob/trunk/internal.h#L1941 rb_unexpected_type((VALUE)(v), (t)) : (void)0) /* file.c (export) */ -#ifdef HAVE_READLINK +#if defined HAVE_READLINK && defined RUBY_ENCODING_H VALUE rb_readlink(VALUE path, rb_encoding *enc); #endif #ifdef __APPLE__ Index: compile.c =================================================================== --- compile.c (revision 61712) +++ compile.c (revision 61713) @@ -9,13 +9,15 @@ https://github.com/ruby/ruby/blob/trunk/compile.c#L9 **********************************************************************/ -#include "internal.h" +#include "ruby/encoding.h" #include "ruby/re.h" +#include "internal.h" #include "encindex.h" #include <math.h> #define USE_INSN_STACK_INCREASE 1 #include "vm_core.h" +#include "vm_debug.h" #include "iseq.h" #include "insns.inc" #include "insns_info.inc" Index: gc.c =================================================================== --- gc.c (revision 61712) +++ gc.c (revision 61713) @@ -14,6 +14,7 @@ https://github.com/ruby/ruby/blob/trunk/gc.c#L14 #define rb_data_object_alloc rb_data_object_alloc #define rb_data_typed_object_alloc rb_data_typed_object_alloc +#include "ruby/encoding.h" #include "ruby/io.h" #include "ruby/st.h" #include "ruby/re.h" Index: error.c =================================================================== --- error.c (revision 61712) +++ error.c (revision 61713) @@ -9,8 +9,9 @@ https://github.com/ruby/ruby/blob/trunk/error.c#L9 **********************************************************************/ -#include "internal.h" +#include "ruby/encoding.h" #include "ruby/st.h" +#include "internal.h" #include "ruby_assert.h" #include "vm_core.h" Index: enum.c =================================================================== --- enum.c (revision 61712) +++ enum.c (revision 61713) @@ -9,6 +9,7 @@ https://github.com/ruby/ruby/blob/trunk/enum.c#L9 **********************************************************************/ +#include "ruby/encoding.h" #include "internal.h" #include "ruby/util.h" #include "id.h" Index: symbol.c =================================================================== --- symbol.c (revision 61712) +++ symbol.c (revision 61713) @@ -9,8 +9,9 @@ https://github.com/ruby/ruby/blob/trunk/symbol.c#L9 **********************************************************************/ -#include "internal.h" +#include "ruby/encoding.h" #include "ruby/st.h" +#include "internal.h" #include "symbol.h" #include "gc.h" #include "probes.h" Index: pack.c =================================================================== --- pack.c (revision 61712) +++ pack.c (revision 61713) @@ -9,6 +9,7 @@ https://github.com/ruby/ruby/blob/trunk/pack.c#L9 **********************************************************************/ +#include "ruby/encoding.h" #include "internal.h" #include <sys/types.h> #include <ctype.h> Index: load.c =================================================================== --- load.c (revision 61712) +++ load.c (revision 61713) @@ -2,8 +2,9 @@ https://github.com/ruby/ruby/blob/trunk/load.c#L2 * load methods from eval.c */ -#include "internal.h" +#include "ruby/encoding.h" #include "ruby/util.h" +#include "internal.h" #include "dln.h" #include "eval_intern.h" #include "probes.h" Index: sprintf.c =================================================================== --- sprintf.c (revision 61712) +++ sprintf.c (revision 61713) @@ -11,8 +11,9 @@ https://github.com/ruby/ruby/blob/trunk/sprintf.c#L11 **********************************************************************/ -#include "internal.h" +#include "ruby/encoding.h" #include "ruby/re.h" +#include "internal.h" #include "id.h" #include <math.h> #include <stdarg.h> Index: vm_backtrace.c =================================================================== --- vm_backtrace.c (revision 61712) +++ vm_backtrace.c (revision 61713) @@ -9,8 +9,9 @@ https://github.com/ruby/ruby/blob/trunk/vm_backtrace.c#L9 **********************************************************************/ -#include "internal.h" +#include "ruby/encoding.h" #include "ruby/debug.h" +#include "internal.h" #include "vm_core.h" #include "eval_intern.h" Index: vm.c =================================================================== --- vm.c (revision 61712) +++ vm.c (revision 61713) @@ -14,6 +14,7 @@ https://github.com/ruby/ruby/blob/trunk/vm.c#L14 #include "gc.h" #include "vm_core.h" +#include "vm_debug.h" #include "iseq.h" #include "eval_intern.h" #include "probes.h" Index: numeric.c =================================================================== --- numeric.c (revision 61712) +++ numeric.c (revision 61713) @@ -9,8 +9,9 @@ https://github.com/ruby/ruby/blob/trunk/numeric.c#L9 **********************************************************************/ -#include "internal.h" +#include "ruby/encoding.h" #include "ruby/util.h" +#include "internal.h" #include "id.h" #include <assert.h> #include <ctype.h> Index: object.c =================================================================== --- object.c (revision 61712) +++ object.c (revision 61713) @@ -11,9 +11,10 @@ https://github.com/ruby/ruby/blob/trunk/object.c#L11 **********************************************************************/ -#include "internal.h" +#include "ruby/encoding.h" #include "ruby/st.h" #include "ruby/util.h" +#include "internal.h" #include <stdio.h> #include <errno.h> #include <ctype.h> Index: string.c =================================================================== --- string.c (revision 61712) +++ string.c (revision 61713) @@ -11,8 +11,9 @@ https://github.com/ruby/ruby/blob/trunk/string.c#L11 **********************************************************************/ -#include "internal.h" +#include "ruby/encoding.h" #include "ruby/re.h" +#include "internal.h" #include "encindex.h" #include "probes.h" #include "gc.h" Index: hash.c =================================================================== --- hash.c (revision 61712) +++ hash.c (revision 61713) @@ -11,9 +11,10 @@ https://github.com/ruby/ruby/blob/trunk/hash.c#L11 **********************************************************************/ -#include "internal.h" +#include "ruby/encoding.h" #include "ruby/st.h" #include "ruby/util.h" +#include "internal.h" #include <errno.h> #include "probes.h" #include "id.h" Index: encoding.c =================================================================== --- encoding.c (revision 61712) +++ encoding.c (revision 61713) @@ -9,6 +9,7 @@ https://github.com/ruby/ruby/blob/trunk/encoding.c#L9 **********************************************************************/ +#include "ruby/encoding.h" #include "internal.h" #include "encindex.h" #include "regenc.h" Index: array.c =================================================================== --- array.c (revision 61712) +++ array.c (revision 61713) @@ -11,9 +11,10 @@ https://github.com/ruby/ruby/blob/trunk/array.c#L11 **********************************************************************/ -#include "internal.h" +#include "ruby/encoding.h" #include "ruby/util.h" #include "ruby/st.h" +#include "internal.h" #include "probes.h" #include "id.h" #include "debug_counter.h" Index: ext/-test-/string/cstr.c =================================================================== --- ext/-test-/string/cstr.c (revision 61712) +++ ext/-test-/string/cstr.c (revision 61713) @@ -1,3 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/ext/-test-/string/cstr.c#L1 +#include "ruby/encoding.h" #include "internal.h" static VALUE Index: variable.c =================================================================== --- variable.c (revision 61712) +++ variable.c (revision 61713) @@ -11,9 +11,10 @@ https://github.com/ruby/ruby/blob/trunk/variable.c#L11 **********************************************************************/ -#include "internal.h" +#include "ruby/encoding.h" #include "ruby/st.h" #include "ruby/util.h" +#include "internal.h" #include "id_table.h" #include "constant.h" #include "id.h" Index: dir.c =================================================================== --- dir.c (revision 61712) +++ dir.c (revision 61713) @@ -11,9 +11,10 @@ https://github.com/ruby/ruby/blob/trunk/dir.c#L11 **********************************************************************/ +#include "ruby/encoding.h" +#include "ruby/thread.h" #include "internal.h" #include "encindex.h" -#include "ruby/thread.h" #include <sys/types.h> #include <sys/stat.h> Index: ruby.c =================================================================== --- ruby.c (revision 61712) +++ ruby.c (revision 61713) @@ -15,8 +15,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby.c#L15 #include <windows.h> #include <sys/cygwin.h> #endif -#include "internal.h" +#include "ruby/encoding.h" #include "ruby/thread.h" +#include "internal.h" #include "eval_intern.h" #include "dln.h" #include <stdio.h> Index: re.c =================================================================== --- re.c (revision 61712) +++ re.c (revision 61713) @@ -9,9 +9,10 @@ https://github.com/ruby/ruby/blob/trunk/re.c#L9 **********************************************************************/ -#include "internal.h" +#include "ruby/encoding.h" #include "ruby/re.h" #include "ruby/util.h" +#include "internal.h" #include "regint.h" #include "encindex.h" #include <ctype.h> Index: file.c =================================================================== --- file.c (revision 61712) +++ file.c (revision 61713) @@ -24,10 +24,11 @@ https://github.com/ruby/ruby/blob/trunk/file.c#L24 #endif #include "id.h" -#include "internal.h" +#include "ruby/encoding.h" #include "ruby/io.h" #include "ruby/util.h" #include "ruby/thread.h" +#include "internal.h" #include "dln.h" #include "encindex.h" Index: io.c =================================================================== --- io.c (revision 61712) +++ io.c (revision 61713) @@ -11,9 +11,10 @@ https://github.com/ruby/ruby/blob/trunk/io.c#L11 **********************************************************************/ -#include "internal.h" +#include "ruby/encoding.h" #include "ruby/io.h" #include "ruby/thread.h" +#include "internal.h" #include "dln.h" #include "encindex.h" #include "id.h" Index: transcode.c =================================================================== --- transcode.c (revision 61712) +++ transcode.c (revision 61713) @@ -9,6 +9,7 @@ https://github.com/ruby/ruby/blob/trunk/transcode.c#L9 **********************************************************************/ +#include "ruby/encoding.h" #include "internal.h" #include "transcode_data.h" #include <ctype.h> Index: time.c =================================================================== --- time.c (revision 61712) +++ time.c (revision 61713) @@ -11,6 +11,7 @@ https://github.com/ruby/ruby/blob/trunk/time.c#L11 #define _DEFAULT_SOURCE #define _BSD_SOURCE +#include "ruby/encoding.h" #include "internal.h" #include <sys/types.h> #include <time.h> Index: localeinit.c =================================================================== --- localeinit.c (revision 61712) +++ localeinit.c (revision 61713) @@ -9,6 +9,7 @@ https://github.com/ruby/ruby/blob/trunk/localeinit.c#L9 **********************************************************************/ +#include "ruby/encoding.h" #include "internal.h" #include "encindex.h" #ifdef __CYGWIN__ Index: vm_core.h =================================================================== --- vm_core.h (revision 61712) +++ vm_core.h (revision 61713) @@ -67,7 +67,6 @@ https://github.com/ruby/ruby/blob/trunk/vm_core.h#L67 #include "ruby/st.h" #include "node.h" -#include "vm_debug.h" #include "vm_opts.h" #include "id.h" #include "method.h" -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/