1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* parse.y (parser_encode_length): chomp eol style modifiers.

Browse Source 
* parse.y (parser_magic_comment): ditto.

* parse.y (set_file_encoding): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14277 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2007-12-17 16:21:21 +00:00
parent 6ed9bdd463
commit bf04c0946f
2 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Tue Dec 18 01:21:19 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (parser_encode_length): chomp eol style modifiers.
* parse.y (parser_magic_comment): ditto.
* parse.y (set_file_encoding): ditto.
Tue Dec 18 01:15:44 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> Tue Dec 18 01:15:44 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk (encs): added dependencies. * common.mk (encs): added dependencies.

32
parse.y
View File

@ -5704,6 +5704,24 @@ lvar_defined_gen(struct parser_params *parser, ID id)
} }
/* emacsen -*- hack */ /* emacsen -*- hack */
static int
parser_encode_length(struct parser_params *parser, const char *name, int len)
{
int nlen;
if (len > 5 && name[nlen = len - 5] == '-') {
if (rb_memcicmp(name + nlen + 1, "unix", 4) == 0)
return nlen;
}
if (len > 4 && name[nlen = len - 5] == '-') {
if (rb_memcicmp(name + nlen + 1, "dos", 3) == 0)
return nlen;
if (rb_memcicmp(name + nlen + 1, "mac", 3) == 0)
return nlen;
}
return len;
}
static void static void
parser_set_encode(struct parser_params *parser, const char *name) parser_set_encode(struct parser_params *parser, const char *name)
{ {
@ -5715,6 +5733,7 @@ parser_set_encode(struct parser_params *parser, const char *name)
} }
#ifndef RIPPER #ifndef RIPPER
typedef int (*rb_magic_comment_length_t)(struct parser_params *parser, const char *name, int len);
typedef void (*rb_magic_comment_setter_t)(struct parser_params *parser, const char *name, const char *val); typedef void (*rb_magic_comment_setter_t)(struct parser_params *parser, const char *name, const char *val);
static void static void
@ -5728,11 +5747,12 @@ magic_comment_encoding(struct parser_params *parser, const char *name, const cha
struct magic_comment { struct magic_comment {
const char *name; const char *name;
rb_magic_comment_setter_t func; rb_magic_comment_setter_t func;
rb_magic_comment_length_t length;
}; };
static const struct magic_comment magic_comments[] = { static const struct magic_comment magic_comments[] = {
{"coding", magic_comment_encoding}, {"coding", magic_comment_encoding, parser_encode_length},
{"encoding", magic_comment_encoding}, {"encoding", magic_comment_encoding, parser_encode_length},
}; };
#endif #endif
@ -5839,7 +5859,11 @@ parser_magic_comment(struct parser_params *parser, const char *str, int len)
#ifndef RIPPER #ifndef RIPPER
do { do {
if (strncasecmp(p->name, RSTRING_PTR(name), n) == 0) { if (strncasecmp(p->name, RSTRING_PTR(name), n) == 0) {
str_copy(val, vbeg, vend - vbeg); n = vend - vbeg;
if (p->length) {
n = (*p->length)(parser, vbeg, n);
}
str_copy(val, vbeg, n);
(*p->func)(parser, RSTRING_PTR(name), RSTRING_PTR(val)); (*p->func)(parser, RSTRING_PTR(name), RSTRING_PTR(val));
break; break;
} }
@ -5890,7 +5914,7 @@ set_file_encoding(struct parser_params *parser, const char *str, const char *sen
} }
beg = str; beg = str;
while ((*str == '-' || *str == '_' || ISALNUM(*str)) && ++str < send); while ((*str == '-' || *str == '_' || ISALNUM(*str)) && ++str < send);
s = rb_str_new(beg, str - beg); s = rb_str_new(beg, parser_encode_length(parser, beg, str - beg));
parser_set_encode(parser, RSTRING_PTR(s)); parser_set_encode(parser, RSTRING_PTR(s));
rb_str_resize(s, 0); rb_str_resize(s, 0);
} }