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

* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,

Browse Source 
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
  thread_pthread.ci, thread_win32.ci: fixed indentation.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2007-06-05 04:25:10 +00:00
parent f3dfa40734
commit 99d65b14b4
17 changed files with 2201 additions and 2170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
Tue Jun 5 13:26:36 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
Tue Jun 5 13:17:11 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* call_cfunc.ci, compile.c, dir.c, eval.c, eval_jump.h, numeric.c,
pack.c, re.c, thread.c, thread_win32.ci, vm.c, vm_dump.c: fixed
indentation.
Mon Jun 04 21:15:45 2007 NARUSE, Yui <naruse@ruby-lang.org> Mon Jun 04 21:15:45 2007 NARUSE, Yui <naruse@ruby-lang.org>
* lib/json.rb, lib/json, ext/json, test/json: * lib/json.rb, lib/json, ext/json, test/json:

48
compile.c
View File

@ -1028,20 +1028,23 @@ set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
k = pos = 0; k = pos = 0;
while (list) { while (list) {
switch (list->type) { switch (list->type) {
case ISEQ_ELEMENT_INSN:{ case ISEQ_ELEMENT_INSN:
{
iobj = (INSN *)list; iobj = (INSN *)list;
pos += insn_data_length(iobj); pos += insn_data_length(iobj);
k += 1; k += 1;
break; break;
} }
case ISEQ_ELEMENT_LABEL:{ case ISEQ_ELEMENT_LABEL:
{
lobj = (LABEL *)list; lobj = (LABEL *)list;
lobj->position = pos; lobj->position = pos;
lobj->set = Qtrue; lobj->set = Qtrue;
break; break;
} }
case ISEQ_ELEMENT_NONE:{ case ISEQ_ELEMENT_NONE:
{
/* ignore */ /* ignore */
break; break;
} }
@ -1065,7 +1068,8 @@ set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
while (list) { while (list) {
switch (list->type) { switch (list->type) {
case ISEQ_ELEMENT_INSN:{ case ISEQ_ELEMENT_INSN:
{
int j, len, insn; int j, len, insn;
char *types; char *types;
VALUE *operands; VALUE *operands;
@ -1191,7 +1195,8 @@ set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
k++; k++;
break; break;
} }
case ISEQ_ELEMENT_LABEL:{ case ISEQ_ELEMENT_LABEL:
{
lobj = (LABEL *)list; lobj = (LABEL *)list;
if (lobj->sp == -1) { if (lobj->sp == -1) {
lobj->sp = sp; lobj->sp = sp;
@ -1733,14 +1738,16 @@ set_sequence_stackcaching(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
while (list) { while (list) {
redo_point: redo_point:
switch (list->type) { switch (list->type) {
case ISEQ_ELEMENT_INSN:{ case ISEQ_ELEMENT_INSN:
{
INSN *iobj = (INSN *)list; INSN *iobj = (INSN *)list;
insn_id = iobj->insn_id; insn_id = iobj->insn_id;
/* dump_disasm_list(list); */ /* dump_disasm_list(list); */
switch (insn_id) { switch (insn_id) {
case BIN(nop):{ case BIN(nop):
{
/* exception merge point */ /* exception merge point */
if (state != SCS_AX) { if (state != SCS_AX) {
INSN *rpobj = INSN *rpobj =
@ -1753,7 +1760,8 @@ set_sequence_stackcaching(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
} }
break; break;
} }
case BIN(swap):{ case BIN(swap):
{
if (state == SCS_AB || state == SCS_BA) { if (state == SCS_AB || state == SCS_BA) {
state = (state == SCS_AB ? SCS_BA : SCS_AB); state = (state == SCS_AB ? SCS_BA : SCS_AB);
@ -1763,7 +1771,8 @@ set_sequence_stackcaching(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
} }
break; break;
} }
case BIN(pop):{ case BIN(pop):
{
switch (state) { switch (state) {
case SCS_AX: case SCS_AX:
case SCS_BX: case SCS_BX:
@ -1792,7 +1801,8 @@ set_sequence_stackcaching(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
state = insn_set_sc_state(iobj, state); state = insn_set_sc_state(iobj, state);
break; break;
} }
case ISEQ_ELEMENT_LABEL:{ case ISEQ_ELEMENT_LABEL:
{
LABEL *lobj; LABEL *lobj;
lobj = (LABEL *)list; lobj = (LABEL *)list;
@ -1839,7 +1849,8 @@ compile_branch_condition(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * cond,
then_label); then_label);
break; break;
case NODE_AND:{ case NODE_AND:
{
LABEL *label = NEW_LABEL(nd_line(cond)); LABEL *label = NEW_LABEL(nd_line(cond));
compile_branch_condition(iseq, ret, cond->nd_1st, label, compile_branch_condition(iseq, ret, cond->nd_1st, label,
else_label); else_label);
@ -1848,7 +1859,8 @@ compile_branch_condition(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * cond,
else_label); else_label);
break; break;
} }
case NODE_OR:{ case NODE_OR:
{
LABEL *label = NEW_LABEL(nd_line(cond)); LABEL *label = NEW_LABEL(nd_line(cond));
compile_branch_condition(iseq, ret, cond->nd_1st, then_label, compile_branch_condition(iseq, ret, cond->nd_1st, then_label,
label); label);
@ -1993,7 +2005,8 @@ make_masgn_lhs(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node)
COMPILE_POPED(ret, "nest masgn lhs", node); COMPILE_POPED(ret, "nest masgn lhs", node);
break; break;
default:{ default:
{
DECL_ANCHOR(anchor); DECL_ANCHOR(anchor);
COMPILE_POPED(anchor, "masgn lhs", node); COMPILE_POPED(anchor, "masgn lhs", node);
/* dump_disasm_list(FIRST_ELEMENT(anchor)); */ /* dump_disasm_list(FIRST_ELEMENT(anchor)); */
@ -4565,7 +4578,8 @@ dump_disasm_list(struct iseq_link_element *link)
while (link) { while (link) {
switch (link->type) { switch (link->type) {
case ISEQ_ELEMENT_INSN:{ case ISEQ_ELEMENT_INSN:
{
iobj = (INSN *)link; iobj = (INSN *)link;
str = insn_data_to_s_detail(iobj); str = insn_data_to_s_detail(iobj);
printf("%04d %-65s(%4d)\n", pos, StringValueCStr(str), printf("%04d %-65s(%4d)\n", pos, StringValueCStr(str),
@ -4573,12 +4587,14 @@ dump_disasm_list(struct iseq_link_element *link)
pos += insn_data_length(iobj); pos += insn_data_length(iobj);
break; break;
} }
case ISEQ_ELEMENT_LABEL:{ case ISEQ_ELEMENT_LABEL:
{
lobj = (LABEL *)link; lobj = (LABEL *)link;
printf("<L%03d>\n", lobj->label_no); printf("<L%03d>\n", lobj->label_no);
break; break;
} }
case ISEQ_ELEMENT_NONE:{ case ISEQ_ELEMENT_NONE:
{
printf("[none]\n"); printf("[none]\n");
break; break;
} }

9
re.c
View File

@ -172,7 +172,8 @@ rb_memsearch(const void *x0, long m, const void *y0, long n)
static int reg_kcode = DEFAULT_KCODE; static int reg_kcode = DEFAULT_KCODE;
static int char_to_option(int c) static int
char_to_option(int c)
{ {
int val; int val;
@ -193,7 +194,8 @@ static int char_to_option(int c)
return val; return val;
} }
extern int rb_char_to_option_kcode(int c, int *option, int *kcode) extern int
rb_char_to_option_kcode(int c, int *option, int *kcode)
{ {
*option = 0; *option = 0;
@ -219,7 +221,8 @@ extern int rb_char_to_option_kcode(int c, int *option, int *kcode)
return ((*kcode == 0 && *option == 0) ? 0 : 1); return ((*kcode == 0 && *option == 0) ? 0 : 1);
} }
static int char_to_arg_kcode(int c) static int
char_to_arg_kcode(int c)
{ {
int kcode, option; int kcode, option;

6
version.h
View File

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