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
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
|
To: vim-dev@vim.org
Subject: Patch 7.2.400
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.2.400 (after 7.2.387)
Problem: Dynamic Ruby is not initialised properly for version 1.9.1.
Ruby cannot create strings from NULL.
Solution: Cleanup #ifdefs. Handle NULL like an empty string. Add
ruby_init_stack. (Sergey Khorev)
Files: src/if_ruby.c
*** ../vim-7.2.399/src/if_ruby.c 2010-03-10 12:46:38.000000000 +0100
--- src/if_ruby.c 2010-03-17 17:37:53.000000000 +0100
***************
*** 53,58 ****
--- 53,63 ----
# undef _WIN32_WINNT
#endif
+ #if (defined(RUBY_VERSION) && RUBY_VERSION >= 19) \
+ || (defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 19)
+ # define RUBY19_OR_LATER 1
+ #endif
+
#if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 19
/* Ruby 1.9 defines a number of static functions which use rb_num2long and
* rb_int2big */
***************
*** 61,67 ****
#endif
#include <ruby.h>
! #if defined(RUBY_VERSION) && RUBY_VERSION >= 19
# include <ruby/encoding.h>
#endif
--- 66,72 ----
#endif
#include <ruby.h>
! #ifdef RUBY19_OR_LATER
# include <ruby/encoding.h>
#endif
***************
*** 172,179 ****
# define rb_ary_new dll_rb_ary_new
# define rb_ary_push dll_rb_ary_push
#endif
! #if defined(RUBY_VERSION) && RUBY_VERSION >= 19 \
! || defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 19
# define rb_errinfo dll_rb_errinfo
#else
# define ruby_errinfo (*dll_ruby_errinfo)
--- 177,183 ----
# define rb_ary_new dll_rb_ary_new
# define rb_ary_push dll_rb_ary_push
#endif
! #ifdef RUBY19_OR_LATER
# define rb_errinfo dll_rb_errinfo
#else
# define ruby_errinfo (*dll_ruby_errinfo)
***************
*** 185,196 ****
# define rb_w32_snprintf dll_rb_w32_snprintf
#endif
! #if defined(RUBY_VERSION) && RUBY_VERSION >= 19
# define ruby_script dll_ruby_script
# define rb_enc_find_index dll_rb_enc_find_index
# define rb_enc_find dll_rb_enc_find
# define rb_enc_str_new dll_rb_enc_str_new
# define rb_sprintf dll_rb_sprintf
#endif
/*
--- 189,201 ----
# define rb_w32_snprintf dll_rb_w32_snprintf
#endif
! #ifdef RUBY19_OR_LATER
# define ruby_script dll_ruby_script
# define rb_enc_find_index dll_rb_enc_find_index
# define rb_enc_find dll_rb_enc_find
# define rb_enc_str_new dll_rb_enc_str_new
# define rb_sprintf dll_rb_sprintf
+ # define ruby_init_stack dll_ruby_init_stack
#endif
/*
***************
*** 240,247 ****
static VALUE (*dll_rb_str_concat) (VALUE, VALUE);
static VALUE (*dll_rb_str_new) (const char*, long);
static VALUE (*dll_rb_str_new2) (const char*);
! #if defined(RUBY_VERSION) && RUBY_VERSION >= 19 \
! || defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 19
static VALUE (*dll_rb_errinfo) (void);
#else
static VALUE *dll_ruby_errinfo;
--- 245,251 ----
static VALUE (*dll_rb_str_concat) (VALUE, VALUE);
static VALUE (*dll_rb_str_new) (const char*, long);
static VALUE (*dll_rb_str_new2) (const char*);
! #ifdef RUBY19_OR_LATER
static VALUE (*dll_rb_errinfo) (void);
#else
static VALUE *dll_ruby_errinfo;
***************
*** 255,276 ****
static VALUE (*dll_rb_ary_new) (void);
static VALUE (*dll_rb_ary_push) (VALUE, VALUE);
#endif
! #if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 19
static VALUE (*dll_rb_int2big)(SIGNED_VALUE);
#endif
#if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
static int (*dll_rb_w32_snprintf)(char*, size_t, const char*, ...);
#endif
! #if defined(RUBY_VERSION) && RUBY_VERSION >= 19
static void (*dll_ruby_script) (const char*);
static int (*dll_rb_enc_find_index) (const char*);
static rb_encoding* (*dll_rb_enc_find) (const char*);
static VALUE (*dll_rb_enc_str_new) (const char*, long, rb_encoding*);
static VALUE (*dll_rb_sprintf) (const char*, ...);
#endif
! #if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 19
static SIGNED_VALUE rb_num2long_stub(VALUE x)
{
return dll_rb_num2long(x);
--- 259,281 ----
static VALUE (*dll_rb_ary_new) (void);
static VALUE (*dll_rb_ary_push) (VALUE, VALUE);
#endif
! #ifdef RUBY19_OR_LATER
static VALUE (*dll_rb_int2big)(SIGNED_VALUE);
#endif
#if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
static int (*dll_rb_w32_snprintf)(char*, size_t, const char*, ...);
#endif
! #ifdef RUBY19_OR_LATER
static void (*dll_ruby_script) (const char*);
static int (*dll_rb_enc_find_index) (const char*);
static rb_encoding* (*dll_rb_enc_find) (const char*);
static VALUE (*dll_rb_enc_str_new) (const char*, long, rb_encoding*);
static VALUE (*dll_rb_sprintf) (const char*, ...);
+ static void (*ruby_init_stack)(VALUE*);
#endif
! #ifdef RUBY19_OR_LATER
static SIGNED_VALUE rb_num2long_stub(VALUE x)
{
return dll_rb_num2long(x);
***************
*** 336,343 ****
{"rb_str_concat", (RUBY_PROC*)&dll_rb_str_concat},
{"rb_str_new", (RUBY_PROC*)&dll_rb_str_new},
{"rb_str_new2", (RUBY_PROC*)&dll_rb_str_new2},
! #if defined(RUBY_VERSION) && RUBY_VERSION >= 19 \
! || defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 19
{"rb_errinfo", (RUBY_PROC*)&dll_rb_errinfo},
#else
{"ruby_errinfo", (RUBY_PROC*)&dll_ruby_errinfo},
--- 341,347 ----
{"rb_str_concat", (RUBY_PROC*)&dll_rb_str_concat},
{"rb_str_new", (RUBY_PROC*)&dll_rb_str_new},
{"rb_str_new2", (RUBY_PROC*)&dll_rb_str_new2},
! #ifdef RUBY19_OR_LATER
{"rb_errinfo", (RUBY_PROC*)&dll_rb_errinfo},
#else
{"ruby_errinfo", (RUBY_PROC*)&dll_ruby_errinfo},
***************
*** 360,374 ****
{"rb_ary_new", (RUBY_PROC*)&dll_rb_ary_new},
{"rb_ary_push", (RUBY_PROC*)&dll_rb_ary_push},
#endif
! #if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 19
{"rb_int2big", (RUBY_PROC*)&dll_rb_int2big},
- #endif
- #if defined(RUBY_VERSION) && RUBY_VERSION >= 19
{"ruby_script", (RUBY_PROC*)&dll_ruby_script},
{"rb_enc_find_index", (RUBY_PROC*)&dll_rb_enc_find_index},
{"rb_enc_find", (RUBY_PROC*)&dll_rb_enc_find},
{"rb_enc_str_new", (RUBY_PROC*)&dll_rb_enc_str_new},
{"rb_sprintf", (RUBY_PROC*)&dll_rb_sprintf},
#endif
{"", NULL},
};
--- 364,377 ----
{"rb_ary_new", (RUBY_PROC*)&dll_rb_ary_new},
{"rb_ary_push", (RUBY_PROC*)&dll_rb_ary_push},
#endif
! #ifdef RUBY19_OR_LATER
{"rb_int2big", (RUBY_PROC*)&dll_rb_int2big},
{"ruby_script", (RUBY_PROC*)&dll_ruby_script},
{"rb_enc_find_index", (RUBY_PROC*)&dll_rb_enc_find_index},
{"rb_enc_find", (RUBY_PROC*)&dll_rb_enc_find},
{"rb_enc_str_new", (RUBY_PROC*)&dll_rb_enc_str_new},
{"rb_sprintf", (RUBY_PROC*)&dll_rb_sprintf},
+ {"ruby_init_stack", (RUBY_PROC*)&dll_ruby_init_stack},
#endif
{"", NULL},
};
***************
*** 467,473 ****
static VALUE
vim_str2rb_enc_str(const char *s)
{
! #if defined(RUBY_VERSION) && RUBY_VERSION >= 19
int isnum;
long lval;
char_u *sval;
--- 470,476 ----
static VALUE
vim_str2rb_enc_str(const char *s)
{
! #ifdef RUBY19_OR_LATER
int isnum;
long lval;
char_u *sval;
***************
*** 489,495 ****
static VALUE
eval_enc_string_protect(const char *str, int *state)
{
! #if defined(RUBY_VERSION) && RUBY_VERSION >= 19
int isnum;
long lval;
char_u *sval;
--- 492,498 ----
static VALUE
eval_enc_string_protect(const char *str, int *state)
{
! #ifdef RUBY19_OR_LATER
int isnum;
long lval;
char_u *sval;
***************
*** 591,606 ****
char *argv[] = {"gvim.exe"};
NtInitialize(&argc, &argv);
#endif
! #if defined(RUBY_VERSION) && RUBY_VERSION >= 19
RUBY_INIT_STACK;
#endif
ruby_init();
! #if defined(RUBY_VERSION) && RUBY_VERSION >= 19
ruby_script("vim-ruby");
#endif
ruby_init_loadpath();
ruby_io_init();
! #if defined(RUBY_VERSION) && RUBY_VERSION >= 19
rb_enc_find_index("encdb");
#endif
ruby_vim_init();
--- 594,609 ----
char *argv[] = {"gvim.exe"};
NtInitialize(&argc, &argv);
#endif
! #ifdef RUBY19_OR_LATER
RUBY_INIT_STACK;
#endif
ruby_init();
! #ifdef RUBY19_OR_LATER
ruby_script("vim-ruby");
#endif
ruby_init_loadpath();
ruby_io_init();
! #ifdef RUBY19_OR_LATER
rb_enc_find_index("encdb");
#endif
ruby_vim_init();
***************
*** 657,664 ****
break;
case TAG_RAISE:
case TAG_FATAL:
! #if defined(RUBY_VERSION) && RUBY_VERSION >= 19 \
! || defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 19
eclass = CLASS_OF(rb_errinfo());
einfo = rb_obj_as_string(rb_errinfo());
#else
--- 660,666 ----
break;
case TAG_RAISE:
case TAG_FATAL:
! #ifdef RUBY19_OR_LATER
eclass = CLASS_OF(rb_errinfo());
einfo = rb_obj_as_string(rb_errinfo());
#else
***************
*** 720,775 ****
if (tv->v_type == VAR_STRING)
{
! result = rb_str_new2((char *)tv->vval.v_string);
}
else if (tv->v_type == VAR_NUMBER)
{
! result = INT2NUM(tv->vval.v_number);
}
# ifdef FEAT_FLOAT
else if (tv->v_type == VAR_FLOAT)
{
! result = rb_float_new(tv->vval.v_float);
}
# endif
else if (tv->v_type == VAR_LIST)
{
! list_T *list = tv->vval.v_list;
! listitem_T *curr;
! result = rb_ary_new();
! if (list != NULL)
! {
! for (curr = list->lv_first; curr != NULL; curr = curr->li_next)
! {
! rb_ary_push(result, vim_to_ruby(&curr->li_tv));
! }
! }
}
else if (tv->v_type == VAR_DICT)
{
! result = rb_hash_new();
! if (tv->vval.v_dict != NULL)
! {
! hashtab_T *ht = &tv->vval.v_dict->dv_hashtab;
! long_u todo = ht->ht_used;
! hashitem_T *hi;
! dictitem_T *di;
!
! for (hi = ht->ht_array; todo > 0; ++hi)
! {
! if (!HASHITEM_EMPTY(hi))
! {
! --todo;
! di = dict_lookup(hi);
! rb_hash_aset(result, rb_str_new2((char *)hi->hi_key),
vim_to_ruby(&di->di_tv));
! }
! }
! }
} /* else return Qnil; */
return result;
--- 722,778 ----
if (tv->v_type == VAR_STRING)
{
! result = rb_str_new2((char *)(tv->vval.v_string == NULL
! ? "" : tv->vval.v_string));
}
else if (tv->v_type == VAR_NUMBER)
{
! result = INT2NUM(tv->vval.v_number);
}
# ifdef FEAT_FLOAT
else if (tv->v_type == VAR_FLOAT)
{
! result = rb_float_new(tv->vval.v_float);
}
# endif
else if (tv->v_type == VAR_LIST)
{
! list_T *list = tv->vval.v_list;
! listitem_T *curr;
! result = rb_ary_new();
! if (list != NULL)
! {
! for (curr = list->lv_first; curr != NULL; curr = curr->li_next)
! {
! rb_ary_push(result, vim_to_ruby(&curr->li_tv));
! }
! }
}
else if (tv->v_type == VAR_DICT)
{
! result = rb_hash_new();
! if (tv->vval.v_dict != NULL)
! {
! hashtab_T *ht = &tv->vval.v_dict->dv_hashtab;
! long_u todo = ht->ht_used;
! hashitem_T *hi;
! dictitem_T *di;
!
! for (hi = ht->ht_array; todo > 0; ++hi)
! {
! if (!HASHITEM_EMPTY(hi))
! {
! --todo;
! di = dict_lookup(hi);
! rb_hash_aset(result, rb_str_new2((char *)hi->hi_key),
vim_to_ruby(&di->di_tv));
! }
! }
! }
} /* else return Qnil; */
return result;
***************
*** 785,791 ****
tv = eval_expr((char_u *)StringValuePtr(str), NULL);
if (tv == NULL)
{
! return Qnil;
}
result = vim_to_ruby(tv);
--- 788,794 ----
tv = eval_expr((char_u *)StringValuePtr(str), NULL);
if (tv == NULL)
{
! return Qnil;
}
result = vim_to_ruby(tv);
*** ../vim-7.2.399/src/version.c 2010-03-17 17:24:58.000000000 +0100
--- src/version.c 2010-03-17 18:14:31.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
{ /* Add new patch number below this line */
+ /**/
+ 400,
/**/
--
Q: What do you call a fish without an eye?
A: fsh!
Q: What do you call a deer with no eyes?
A: no eye deer.
Q: What do you call a deer with no eyes and no legs?
A: still no eye deer.
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ download, build and distribute -- http://www.A-A-P.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|
