mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
ext/date/date_strptime.c: moved detector of leftover.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34337 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
6bada9cc0a
commit
1d794b9335
2 changed files with 14 additions and 11 deletions
|
|
@ -1,3 +1,7 @@
|
||||||
|
Thu Jan 19 07:53:09 2012 Tadayoshi Funaba <tadf@dotrb.org>
|
||||||
|
|
||||||
|
* ext/date/date_strptime.c: moved detector of leftover.
|
||||||
|
|
||||||
Thu Jan 19 07:10:47 2012 Tadayoshi Funaba <tadf@dotrb.org>
|
Thu Jan 19 07:10:47 2012 Tadayoshi Funaba <tadf@dotrb.org>
|
||||||
|
|
||||||
* ext/date/date_parse.c: [ruby-core:42173].
|
* ext/date/date_parse.c: [ruby-core:42173].
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
date_strptime.c: Coded by Tadayoshi Funaba 2011
|
date_strptime.c: Coded by Tadayoshi Funaba 2011,2012
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ruby.h"
|
#include "ruby.h"
|
||||||
|
|
@ -641,15 +641,6 @@ date__strptime_internal(const char *str, size_t slen,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
|
||||||
VALUE s;
|
|
||||||
|
|
||||||
if (slen > si) {
|
|
||||||
s = rb_usascii_str_new(&str[si], slen - si);
|
|
||||||
set_hash("leftover", s);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return si;
|
return si;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -657,9 +648,17 @@ VALUE
|
||||||
date__strptime(const char *str, size_t slen,
|
date__strptime(const char *str, size_t slen,
|
||||||
const char *fmt, size_t flen, VALUE hash)
|
const char *fmt, size_t flen, VALUE hash)
|
||||||
{
|
{
|
||||||
|
size_t si;
|
||||||
VALUE cent, merid;
|
VALUE cent, merid;
|
||||||
|
|
||||||
date__strptime_internal(str, slen, fmt, flen, hash);
|
si = date__strptime_internal(str, slen, fmt, flen, hash);
|
||||||
|
|
||||||
|
if (slen > si) {
|
||||||
|
VALUE s;
|
||||||
|
|
||||||
|
s = rb_usascii_str_new(&str[si], slen - si);
|
||||||
|
set_hash("leftover", s);
|
||||||
|
}
|
||||||
|
|
||||||
if (fail_p())
|
if (fail_p())
|
||||||
return Qnil;
|
return Qnil;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue