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

* parse.y (parser_yylex), win32/win32.c (rb_w32_utime): fixed

indentation broken at YARV merger.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11992 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2007-03-04 16:36:36 +00:00
parent 7b0f246345
commit da3558fddb
4 changed files with 16 additions and 11 deletions

View file

@ -1,3 +1,8 @@
Mon Mar 5 01:36:41 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (parser_yylex), win32/win32.c (rb_w32_utime): fixed
indentation broken at YARV merger.
Sun Mar 4 23:41:14 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* file.c (rb_stat_uid, rb_stat_gid, eaccess): use rb_uid_t and

View file

@ -6085,8 +6085,8 @@ parser_yylex(struct parser_params *parser)
}
if (c == '>') {
lex_state = EXPR_ARG;
return tLAMBDA;
}
return tLAMBDA;
}
if (IS_BEG() ||
(IS_ARG() && space_seen && !ISSPACE(c))) {
if (IS_ARG()) arg_ambiguous();

View file

@ -1,7 +1,7 @@
#define RUBY_VERSION "1.9.0"
#define RUBY_RELEASE_DATE "2007-03-04"
#define RUBY_RELEASE_DATE "2007-03-05"
#define RUBY_VERSION_CODE 190
#define RUBY_RELEASE_CODE 20070304
#define RUBY_RELEASE_CODE 20070305
#define RUBY_PATCHLEVEL 0
#define RUBY_VERSION_MAJOR 1
@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_YEAR 2007
#define RUBY_RELEASE_MONTH 3
#define RUBY_RELEASE_DAY 4
#define RUBY_RELEASE_DAY 5
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];

View file

@ -4049,12 +4049,12 @@ rb_w32_utime(const char *path, const struct utimbuf *times)
}
if (times) {
if (unixtime_to_filetime(times->actime, &atime)) {
return -1;
}
if (unixtime_to_filetime(times->modtime, &mtime)) {
return -1;
}
if (unixtime_to_filetime(times->actime, &atime)) {
return -1;
}
if (unixtime_to_filetime(times->modtime, &mtime)) {
return -1;
}
}
else {
GetSystemTimeAsFileTime(&atime);