Skip to content

Commit 078b6c9

Browse files
nobunobu
committed
encindex.h: ENCINDEX
* encindex.h: separate encoding index constants from internal.h. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51861 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
1 parent ca5c908 commit 078b6c9

File tree

10 files changed

+83
-24
lines changed

10 files changed

+83
-24
lines changed

‎ChangeLog

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
Tue Sep 15 14:49:15 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
2+
3+
* encindex.h: separate encoding index constants from internal.h.
4+
15
Tue Sep 15 13:13:13 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
26

37
* array.c (rb_ary_sort_bang, rb_ary_sort): [DOC] correct block

‎common.mk

+6
Original file line numberDiff line numberDiff line change
@@ -1327,6 +1327,7 @@ encoding.$(OBJEXT): $(hdrdir)/ruby/ruby.h
13271327
encoding.$(OBJEXT): $(top_srcdir)/include/ruby.h
13281328
encoding.$(OBJEXT): {$(VPATH)}config.h
13291329
encoding.$(OBJEXT): {$(VPATH)}defines.h
1330+
encoding.$(OBJEXT): {$(VPATH)}encindex.h
13301331
encoding.$(OBJEXT): {$(VPATH)}encoding.c
13311332
encoding.$(OBJEXT): {$(VPATH)}encoding.h
13321333
encoding.$(OBJEXT): {$(VPATH)}intern.h
@@ -1432,6 +1433,7 @@ file.$(OBJEXT): $(top_srcdir)/include/ruby.h
14321433
file.$(OBJEXT): {$(VPATH)}config.h
14331434
file.$(OBJEXT): {$(VPATH)}defines.h
14341435
file.$(OBJEXT): {$(VPATH)}dln.h
1436+
file.$(OBJEXT): {$(VPATH)}encindex.h
14351437
file.$(OBJEXT): {$(VPATH)}encoding.h
14361438
file.$(OBJEXT): {$(VPATH)}file.c
14371439
file.$(OBJEXT): {$(VPATH)}intern.h
@@ -1555,6 +1557,7 @@ io.$(OBJEXT): $(top_srcdir)/include/ruby.h
15551557
io.$(OBJEXT): {$(VPATH)}config.h
15561558
io.$(OBJEXT): {$(VPATH)}defines.h
15571559
io.$(OBJEXT): {$(VPATH)}dln.h
1560+
io.$(OBJEXT): {$(VPATH)}encindex.h
15581561
io.$(OBJEXT): {$(VPATH)}encoding.h
15591562
io.$(OBJEXT): {$(VPATH)}id.h
15601563
io.$(OBJEXT): {$(VPATH)}intern.h
@@ -1670,6 +1673,7 @@ marshal.$(OBJEXT): $(hdrdir)/ruby/ruby.h
16701673
marshal.$(OBJEXT): $(top_srcdir)/include/ruby.h
16711674
marshal.$(OBJEXT): {$(VPATH)}config.h
16721675
marshal.$(OBJEXT): {$(VPATH)}defines.h
1676+
marshal.$(OBJEXT): {$(VPATH)}encindex.h
16731677
marshal.$(OBJEXT): {$(VPATH)}encoding.h
16741678
marshal.$(OBJEXT): {$(VPATH)}id_table.h
16751679
marshal.$(OBJEXT): {$(VPATH)}intern.h
@@ -1933,6 +1937,7 @@ re.$(OBJEXT): $(hdrdir)/ruby/ruby.h
19331937
re.$(OBJEXT): $(top_srcdir)/include/ruby.h
19341938
re.$(OBJEXT): {$(VPATH)}config.h
19351939
re.$(OBJEXT): {$(VPATH)}defines.h
1940+
re.$(OBJEXT): {$(VPATH)}encindex.h
19361941
re.$(OBJEXT): {$(VPATH)}encoding.h
19371942
re.$(OBJEXT): {$(VPATH)}intern.h
19381943
re.$(OBJEXT): {$(VPATH)}internal.h
@@ -2156,6 +2161,7 @@ string.$(OBJEXT): $(hdrdir)/ruby/ruby.h
21562161
string.$(OBJEXT): $(top_srcdir)/include/ruby.h
21572162
string.$(OBJEXT): {$(VPATH)}config.h
21582163
string.$(OBJEXT): {$(VPATH)}defines.h
2164+
string.$(OBJEXT): {$(VPATH)}encindex.h
21592165
string.$(OBJEXT): {$(VPATH)}encoding.h
21602166
string.$(OBJEXT): {$(VPATH)}gc.h
21612167
string.$(OBJEXT): {$(VPATH)}intern.h

‎encindex.h

+67
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
/**********************************************************************
2+
3+
encindex.h -
4+
5+
$Author$
6+
created at: Tue Sep 15 13:21:14 JST 2015
7+
8+
Copyright (C) 2015 Yukihiro Matsumoto
9+
10+
**********************************************************************/
11+
12+
#ifndef RUBY_ENCINDEX_H
13+
#define RUBY_ENCINDEX_H 1
14+
#if defined(__cplusplus)
15+
extern "C" {
16+
#if 0
17+
} /* satisfy cc-mode */
18+
#endif
19+
#endif
20+
21+
enum ruby_preserved_encindex {
22+
RUBY_ENCINDEX_ASCII,
23+
RUBY_ENCINDEX_UTF_8,
24+
RUBY_ENCINDEX_US_ASCII,
25+
26+
/* preserved indexes */
27+
RUBY_ENCINDEX_UTF_16BE,
28+
RUBY_ENCINDEX_UTF_16LE,
29+
RUBY_ENCINDEX_UTF_32BE,
30+
RUBY_ENCINDEX_UTF_32LE,
31+
RUBY_ENCINDEX_UTF_16,
32+
RUBY_ENCINDEX_UTF_32,
33+
RUBY_ENCINDEX_UTF8_MAC,
34+
35+
/* for old options of regexp */
36+
RUBY_ENCINDEX_EUC_JP,
37+
RUBY_ENCINDEX_Windows_31J,
38+
39+
RUBY_ENCINDEX_BUILTIN_MAX
40+
};
41+
42+
#define ENCINDEX_ASCII RUBY_ENCINDEX_ASCII
43+
#define ENCINDEX_UTF_8 RUBY_ENCINDEX_UTF_8
44+
#define ENCINDEX_US_ASCII RUBY_ENCINDEX_US_ASCII
45+
#define ENCINDEX_UTF_16BE RUBY_ENCINDEX_UTF_16BE
46+
#define ENCINDEX_UTF_16LE RUBY_ENCINDEX_UTF_16LE
47+
#define ENCINDEX_UTF_32BE RUBY_ENCINDEX_UTF_32BE
48+
#define ENCINDEX_UTF_32LE RUBY_ENCINDEX_UTF_32LE
49+
#define ENCINDEX_UTF_16 RUBY_ENCINDEX_UTF_16
50+
#define ENCINDEX_UTF_32 RUBY_ENCINDEX_UTF_32
51+
#define ENCINDEX_UTF8_MAC RUBY_ENCINDEX_UTF8_MAC
52+
#define ENCINDEX_EUC_JP RUBY_ENCINDEX_EUC_JP
53+
#define ENCINDEX_Windows_31J RUBY_ENCINDEX_Windows_31J
54+
#define ENCINDEX_BUILTIN_MAX RUBY_ENCINDEX_BUILTIN_MAX
55+
56+
#define rb_ascii8bit_encindex() RUBY_ENCINDEX_ASCII
57+
#define rb_utf8_encindex() RUBY_ENCINDEX_UTF_8
58+
#define rb_usascii_encindex() RUBY_ENCINDEX_US_ASCII
59+
60+
#if defined(__cplusplus)
61+
#if 0
62+
{ /* satisfy cc-mode */
63+
#endif
64+
} /* extern "C" { */
65+
#endif
66+
67+
#endif /* RUBY_INTERNAL_H */

‎encoding.c

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
**********************************************************************/
1111

1212
#include "internal.h"
13+
#include "encindex.h"
1314
#include "regenc.h"
1415
#include <ctype.h>
1516
#include "ruby/util.h"

‎file.c

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#include "ruby/util.h"
2929
#include "ruby/thread.h"
3030
#include "dln.h"
31+
#include "encindex.h"
3132

3233
#ifdef HAVE_UNISTD_H
3334
#include <unistd.h>

‎internal.h

-24
Original file line numberDiff line numberDiff line change
@@ -713,30 +713,6 @@ void Init_enc(void);
713713
void Init_ext(void);
714714

715715
/* encoding.c */
716-
enum ruby_preserved_encindex {
717-
ENCINDEX_ASCII,
718-
ENCINDEX_UTF_8,
719-
ENCINDEX_US_ASCII,
720-
721-
/* preserved indexes */
722-
ENCINDEX_UTF_16BE,
723-
ENCINDEX_UTF_16LE,
724-
ENCINDEX_UTF_32BE,
725-
ENCINDEX_UTF_32LE,
726-
ENCINDEX_UTF_16,
727-
ENCINDEX_UTF_32,
728-
ENCINDEX_UTF8_MAC,
729-
730-
/* for old options of regexp */
731-
ENCINDEX_EUC_JP,
732-
ENCINDEX_Windows_31J,
733-
734-
ENCINDEX_BUILTIN_MAX
735-
};
736-
737-
#define rb_ascii8bit_encindex() ENCINDEX_ASCII
738-
#define rb_utf8_encindex() ENCINDEX_UTF_8
739-
#define rb_usascii_encindex() ENCINDEX_US_ASCII
740716
ID rb_id_encoding(void);
741717
void rb_gc_mark_encodings(void);
742718
rb_encoding *rb_enc_get_from_index(int index);

‎io.c

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include "ruby/io.h"
1616
#include "ruby/thread.h"
1717
#include "dln.h"
18+
#include "encindex.h"
1819
#include "id.h"
1920
#include <ctype.h>
2021
#include <errno.h>

‎marshal.c

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include "ruby/io.h"
1818
#include "ruby/st.h"
1919
#include "ruby/util.h"
20+
#include "encindex.h"
2021
#include "id_table.h"
2122

2223
#include <math.h>

‎re.c

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#include "ruby/re.h"
1414
#include "ruby/util.h"
1515
#include "regint.h"
16+
#include "encindex.h"
1617
#include <ctype.h>
1718

1819
VALUE rb_eRegexpError;

‎string.c

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
#include "internal.h"
1515
#include "ruby/re.h"
16+
#include "encindex.h"
1617
#include "probes.h"
1718
#include "gc.h"
1819
#include <assert.h>

0 commit comments

Comments
 (0)