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