kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/ruby/ext/syck/rubyext.c, lib/implicit.re: timestamp repairs to

Browse source 
timezone and milliseconds.

* lib/syck.c (syck_parser_reset_levels): duplicate string literal to avoid warning.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3801 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
why 2003-05-15 07:38:10 +00:00
parent d81342e3af
commit 42fd4ff686
4 changed files with 632 additions and 609 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Thu May 15 07:45:30 2003 why the lucky stiff <ruby-cvs@whytheluckystiff.net>
* ext/ruby/ext/syck/rubyext.c, lib/implicit.re: timestamp repairs to
timezone and milliseconds.
* lib/syck.c (syck_parser_reset_levels): duplicate string literal to avoid warning.
Thu May 15 13:26:48 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
* io.c (set_stdio): better message.

1187
ext/syck/implicit.c
View file

File diff suppressed because it is too large Load diff

44
ext/syck/rubyext.c
View file

@ -14,7 +14,7 @@
#define RUBY_DOMAIN "ruby.yaml.org,2002"
static ID s_utc, s_read, s_binmode;
static ID s_utc, s_at, s_to_f, s_read, s_binmode;
static VALUE sym_model, sym_generic;
static VALUE sym_scalar, sym_seq, sym_map;
VALUE cParser, cLoader, cNode, oDefaultLoader;
@ -114,7 +114,7 @@ rb_syck_mktime(str)
{
VALUE time;
char *ptr = str;
VALUE year, mon, day, hour, min, sec;
VALUE year, mon, day, hour, min, sec, usec;
// Year
ptr[4] = '\0';
@ -145,7 +145,41 @@ rb_syck_mktime(str)
while ( !isdigit( *ptr ) ) ptr++;
sec = INT2FIX(strtol(ptr, NULL, 10));
time = rb_funcall(rb_cTime, s_utc, 6, year, mon, day, hour, min, sec );
// Millisecond
ptr += 2;
usec = INT2FIX( strtod( ptr, NULL ) * 1000000 );
// Make UTC time
time = rb_funcall(rb_cTime, s_utc, 7, year, mon, day, hour, min, sec, usec);
// Time Zone
while ( *ptr != 'Z' && *ptr != '+' && *ptr != '-' && *ptr != '\0' ) ptr++;
if ( *ptr == '-' || *ptr == '+' )
{
long tz_offset = 0;
double utc_time = 0;
tz_offset += strtol(ptr, NULL, 10) * 3600;
while ( *ptr != ':' && *ptr != '\0' ) ptr++;
if ( *ptr == ':' )
{
ptr += 1;
if ( tz_offset < 0 )
{
tz_offset -= strtol(ptr, NULL, 10) * 60;
}
else
{
tz_offset += strtol(ptr, NULL, 10) * 60;
}
}
// Make TZ time
utc_time = NUM2DBL(rb_funcall(time, s_to_f, 0));
utc_time -= tz_offset;
time = rb_funcall(rb_cTime, s_at, 1, rb_float_new(utc_time));
}
return time;
}
@ -284,7 +318,7 @@ rb_syck_load_handler(p, n)
else if ( strcmp( n->type_id, "timestamp#ymd" ) == 0 )
{
S_REALLOC_N( n->data.str->ptr, char, 22 );
strcat( n->data.str->ptr, "t12:00:00Z" );
strcat( n->data.str->ptr, "t00:00:00Z" );
obj = rb_syck_mktime( n->data.str->ptr );
}
else if ( strncmp( n->type_id, "timestamp", 9 ) == 0 )
@ -789,6 +823,8 @@ Init_syck()
// Global symbols
//
s_utc = rb_intern("utc");
s_at = rb_intern("at");
s_to_f = rb_intern("to_f");
s_read = rb_intern("read");
s_binmode = rb_intern("binmode");
sym_model = ID2SYM(rb_intern("Model"));

3
ext/syck/syck.c
View file

@ -119,7 +119,7 @@ syck_parser_reset_levels( SyckParser *p )
{
p->lvl_idx = 1;
p->levels[0].spaces = -1;
p->levels[0].domain = ""; // YAML_DOMAIN + "/";
p->levels[0].domain = syck_strndup( "", 0 );
p->levels[0].status = syck_lvl_header;
}
}
@ -220,6 +220,7 @@ syck_free_parser( SyckParser *p )
// Free all else
//
syck_parser_reset_levels( p );
S_FREE( p->levels[0].domain );
S_FREE( p->levels );
if ( p->buffer != NULL )