diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2010-02-17 17:01:03 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2010-02-17 17:01:03 +0000 |
| commit | 876787e3b3da982c58eb21596fbc94d01084bc46 (patch) | |
| tree | 0befb846eb9796c2d41fbb5ecbfbb8ed39052387 /textproc/eruby/files/patch-eruby_lib.c | |
| parent | - Update to 1.3.1 (diff) | |
- Fix for ruby 1.9.1
Obtained from: github
Feature safe: yes
Diffstat (limited to 'textproc/eruby/files/patch-eruby_lib.c')
| -rw-r--r-- | textproc/eruby/files/patch-eruby_lib.c | 59 |
1 files changed, 8 insertions, 51 deletions
diff --git a/textproc/eruby/files/patch-eruby_lib.c b/textproc/eruby/files/patch-eruby_lib.c index 08665f6651c1..77aee0fddb81 100644 --- a/textproc/eruby/files/patch-eruby_lib.c +++ b/textproc/eruby/files/patch-eruby_lib.c @@ -1,5 +1,5 @@ ---- eruby_lib.c.orig 2003-07-29 05:42:56.000000000 +0200 -+++ eruby_lib.c 2009-06-30 12:42:12.000000000 +0200 +--- eruby_lib.c.orig 2010-02-17 16:52:48.000000000 +0100 ++++ eruby_lib.c 2010-02-17 16:52:48.000000000 +0100 @@ -34,10 +34,18 @@ #include <signal.h> @@ -8,7 +8,7 @@ #include "eruby.h" #include "config.h" -+#if defined(DWITH_RUBY_19) ++#if defined(WITH_RUBY_19) +#include "ruby/regex.h" +#undef ismbchar +#define ismbchar(c,e,enc) ((mbclen(c,e,enc)) != 1) @@ -20,15 +20,15 @@ EXTERN VALUE rb_stdin; EXTERN VALUE ruby_top_self; -@@ -133,6 +141,7 @@ +@@ -144,6 +152,7 @@ } s++; goto again; -+#if !defined(DWITH_RUBY_19) ++#if !defined(WITH_RUBY_19) case 'K': s++; if (*s == '\0') { -@@ -142,6 +151,7 @@ +@@ -153,6 +162,7 @@ rb_set_kcode(s); s++; goto again; @@ -36,54 +36,11 @@ case 'C': s++; if (isspace(*s)) s++; -@@ -296,18 +306,18 @@ - VALUE s = compiler->lex_input; - char *beg, *end, *pend; - -- if (RSTRING(s)->len == compiler->lex_gets_ptr) -+ if (RSTRING_LEN(s) == compiler->lex_gets_ptr) - return Qnil; -- beg = RSTRING(s)->ptr; -+ beg = RSTRING_PTR(s); - if (compiler->lex_gets_ptr > 0) { - beg += compiler->lex_gets_ptr; - } -- pend = RSTRING(s)->ptr + RSTRING(s)->len; -+ pend = RSTRING_PTR(s) + RSTRING_LEN(s); - end = beg; - while (end < pend) { - if (*end++ == '\n') break; - } -- compiler->lex_gets_ptr = end - RSTRING(s)->ptr; -+ compiler->lex_gets_ptr = end - RSTRING_PTR(s); - return rb_str_new(beg, end - beg); - } - -@@ -326,8 +336,8 @@ - - if (NIL_P(v)) return EOF; - compiler->sourceline++; -- compiler->lex_pbeg = compiler->lex_p = RSTRING(v)->ptr; -- compiler->lex_pend = compiler->lex_p + RSTRING(v)->len; -+ compiler->lex_pbeg = compiler->lex_p = RSTRING_PTR(v); -+ compiler->lex_pend = compiler->lex_p + RSTRING_LEN(v); - compiler->lex_lastline = v; - } - else { -@@ -471,7 +481,7 @@ - if (c == '!') { - unsigned char *p; - char *argv[2]; -- char *line = RSTRING(compiler->lex_lastline)->ptr; -+ char *line = RSTRING_PTR(compiler->lex_lastline); - - if (line[strlen(line) - 1] == '\n') { - line[strlen(line) - 1] = '\0'; -@@ -577,8 +587,13 @@ +@@ -592,8 +602,13 @@ if (prevc < 0) output_literal(compiler, "print \""); output_char(compiler, c); prevc = c; -+#if defined(DWITH_RUBY_19) ++#if defined(WITH_RUBY_19) + if (ismbchar(c,c+4,OnigEncDefaultCharEncoding)) { + int i, len = mbclen(c,c,OnigEncDefaultCharEncoding) - 1; +#else |