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

* parse.y (yycompile0): adjust indent.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38403 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2012-12-15 06:10:01 +00:00
parent 771f692792
commit 2ca5e8eeab
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
parse.y
View file

@ -5317,14 +5317,14 @@ yycompile0(VALUE arg)
parser->parser_token_info_enabled = !compile_for_eval && RTEST(ruby_verbose); parser->parser_token_info_enabled = !compile_for_eval && RTEST(ruby_verbose);
#endif #endif
#ifndef RIPPER #ifndef RIPPER
if(RUBY_DTRACE_PARSE_BEGIN_ENABLED()) { if (RUBY_DTRACE_PARSE_BEGIN_ENABLED()) {
RUBY_DTRACE_PARSE_BEGIN(parser->parser_ruby_sourcefile, RUBY_DTRACE_PARSE_BEGIN(parser->parser_ruby_sourcefile,
parser->parser_ruby_sourceline); parser->parser_ruby_sourceline);
} }
#endif #endif
n = yyparse((void*)parser); n = yyparse((void*)parser);
#ifndef RIPPER #ifndef RIPPER
if(RUBY_DTRACE_PARSE_END_ENABLED()) { if (RUBY_DTRACE_PARSE_END_ENABLED()) {
RUBY_DTRACE_PARSE_END(parser->parser_ruby_sourcefile, RUBY_DTRACE_PARSE_END(parser->parser_ruby_sourcefile,
parser->parser_ruby_sourceline); parser->parser_ruby_sourceline);
} }

12
thread.c
View file

@ -883,7 +883,7 @@ double2timeval(double d)
} }
static void static void
sleep_forever(rb_thread_t *th, int deadlockable,int spurious_check) sleep_forever(rb_thread_t *th, int deadlockable, int spurious_check)
{ {
enum rb_thread_status prev_status = th->status; enum rb_thread_status prev_status = th->status;
enum rb_thread_status status = deadlockable ? THREAD_STOPPED_FOREVER : THREAD_STOPPED; enum rb_thread_status status = deadlockable ? THREAD_STOPPED_FOREVER : THREAD_STOPPED;
@ -900,7 +900,7 @@ sleep_forever(rb_thread_t *th, int deadlockable,int spurious_check)
th->vm->sleeper--; th->vm->sleeper--;
} }
RUBY_VM_CHECK_INTS_BLOCKING(th); RUBY_VM_CHECK_INTS_BLOCKING(th);
if(!spurious_check) if (!spurious_check)
break; break;
} }
th->status = prev_status; th->status = prev_status;
@ -923,7 +923,7 @@ getclockofday(struct timeval *tp)
} }
static void static void
sleep_timeval(rb_thread_t *th, struct timeval tv,int spurious_check) sleep_timeval(rb_thread_t *th, struct timeval tv, int spurious_check)
{ {
struct timeval to, tvn; struct timeval to, tvn;
enum rb_thread_status prev_status = th->status; enum rb_thread_status prev_status = th->status;
@ -951,7 +951,7 @@ sleep_timeval(rb_thread_t *th, struct timeval tv,int spurious_check)
--tv.tv_sec; --tv.tv_sec;
tv.tv_usec += 1000000; tv.tv_usec += 1000000;
} }
if(!spurious_check) if (!spurious_check)
break; break;
} }
th->status = prev_status; th->status = prev_status;
@ -989,9 +989,9 @@ timeofday(void)
} }
static void static void
sleep_wait_for_interrupt(rb_thread_t *th, double sleepsec,int spurious_check) sleep_wait_for_interrupt(rb_thread_t *th, double sleepsec, int spurious_check)
{ {
sleep_timeval(th, double2timeval(sleepsec),spurious_check); sleep_timeval(th, double2timeval(sleepsec), spurious_check);
} }
static void static void