1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
|
diff -Naur builder.c builder.c
--- builder.c 2005-03-30 07:48:09.000000000 +0900
+++ builder.c 2010-05-27 20:08:33.000000000 +0900
@@ -26,7 +26,6 @@
#include <errno.h>
#include "sary.h"
#include "ruby.h"
-#include "version.h"
#define GET_Builder(obj, dat) Data_Get_Struct(obj, SaryBuilder, dat)
@@ -63,21 +62,13 @@
rb_scan_args(argc, argv, "11", &file_name, &array_name);
Check_SafeStr(file_name);
-#if RUBY_VERSION_CODE >= 180
file_name_ptr = StringValuePtr(file_name);
-#else
- file_name_ptr = STR2CSTR(file_name);
-#endif
if (array_name == Qnil)
builder = sary_builder_new(file_name_ptr);
else {
Check_SafeStr(array_name);
-#if RUBY_VERSION_CODE >= 180
array_name_ptr = StringValuePtr(array_name);
-#else
- array_name_ptr = STR2CSTR(array_name);
-#endif
builder = sary_builder_new2(file_name_ptr, array_name_ptr);
}
if (builder == NULL)
diff -Naur searcher.c searcher.c
--- searcher.c 2005-03-30 07:48:09.000000000 +0900
+++ searcher.c 2010-05-27 20:13:17.000000000 +0900
@@ -27,7 +27,13 @@
#include <errno.h>
#include "sary.h"
#include "ruby.h"
-#include "version.h"
+
+#ifndef RARRAY_LEN
+#define RARRAY_LEN(a) RARRAY(a)->len
+#endif
+#ifndef RSTRING_LEN
+#define RSTRING_LEN(str) RSTRING(str)->len
+#endif
#define GET_Searcher(obj, dat) Data_Get_Struct(obj, SarySearcher, dat)
@@ -82,21 +88,13 @@
rb_scan_args(argc, argv, "11", &file_name, &array_name);
Check_SafeStr(file_name);
-#if RUBY_VERSION_CODE >= 180
file_name_ptr = StringValuePtr(file_name);
-#else
- file_name_ptr = STR2CSTR(file_name);
-#endif
if (array_name == Qnil)
searcher = sary_searcher_new(file_name_ptr);
else {
Check_SafeStr(array_name);
-#if RUBY_VERSION_CODE >= 180
array_name_ptr = StringValuePtr(array_name);
-#else
- array_name_ptr = STR2CSTR(array_name);
-#endif
searcher = sary_searcher_new2(file_name_ptr, array_name_ptr);
}
if (searcher == NULL)
@@ -133,12 +131,8 @@
GET_Searcher(klass, searcher);
Check_SafeStr(pattern);
-#if RUBY_VERSION_CODE >= 180
pat = StringValuePtr(pattern);
- len = RSTRING(pattern)->len;
-#else
- pat = str2cstr(pattern, &len);
-#endif
+ len = RSTRING_LEN(pattern);
if (sary_searcher_search2(searcher, pat, len))
return Qtrue;
@@ -157,7 +151,7 @@
GET_Searcher(klass, searcher);
- len = RARRAY(pattern_array)->len;
+ len = RARRAY_LEN(pattern_array);
if (len == 0) {
return Qfalse;
}
@@ -166,11 +160,7 @@
for (i = 0; i < len; i++) {
pattern = rb_ary_entry(pattern_array, (long)i);
Check_SafeStr(pattern);
-#if RUBY_VERSION_CODE >= 180
pat[i] = StringValuePtr(pattern);
-#else
- pat[i] = STR2CSTR(pattern);
-#endif
}
if (sary_searcher_multi_search(searcher, pat, len))
@@ -189,11 +179,7 @@
GET_Searcher(klass, searcher);
Check_SafeStr(pattern);
-#if RUBY_VERSION_CODE >= 180
pat = StringValuePtr(pattern);
-#else
- pat = STR2CSTR(pattern);
-#endif
if (sary_searcher_isearch(searcher, pat, NUM2INT(len)))
return Qtrue;
@@ -224,12 +210,8 @@
GET_Searcher(klass, searcher);
Check_SafeStr(pattern);
-#if RUBY_VERSION_CODE >= 180
pat = StringValuePtr(pattern);
- len = RSTRING(pattern)->len;
-#else
- pat = str2cstr(pattern, &len);
-#endif
+ len = RSTRING_LEN(pattern);
if (sary_searcher_icase_search2(searcher, pat, len))
return Qtrue;
@@ -275,15 +257,10 @@
Check_SafeStr(start_tag);
Check_SafeStr(end_tag);
-#if RUBY_VERSION_CODE >= 180
stag = StringValuePtr(start_tag);
etag = StringValuePtr(end_tag);
- slen = RSTRING(stag)->len;
- elen = RSTRING(etag)->len;
-#else
- stag = rb_str2cstr(start_tag, &slen);
- etag = rb_str2cstr(end_tag, &elen);
-#endif
+ slen = RSTRING_LEN(stag);
+ elen = RSTRING_LEN(etag);
region = sary_searcher_get_next_tagged_region2(searcher, stag, slen,
etag, elen, &rlen);
|
