hyung-hwan/moo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed a compiler bug in handling 'super' with multiple messages sent at the same time as in 'super abc + 10'

Browse Source
This commit is contained in:
hyunghwan.chung 2018-05-25 10:19:25 +00:00
parent 90e6e6c8cf
commit d1cfaed466
4 changed files with 39 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
moo/kernel/Collect.moo
View File

@ -302,7 +302,8 @@ class OrderedCollection(SequenceableCollection)
method(#class) new: size method(#class) new: size
{ {
^self _basicNew initialize: size. | x |
^super basicNew initialize: size.
} }
method initialize: size method initialize: size
@ -325,7 +326,7 @@ class OrderedCollection(SequenceableCollection)
Exception signal: ('index ' & index asString & ' out of range'). Exception signal: ('index ' & index asString & ' out of range').
} }
method at: index put: obj method at: index put: obj
{ {
| i | | i |
i := index + self.firstIndex. i := index + self.firstIndex.
@ -429,6 +430,24 @@ System log(System.Log.FATAL, S'REMOVING ... ', obj, '--->', self.lastIndex, S'\n
self.firstIndex := self.firstIndex + shift_count. self.firstIndex := self.firstIndex + shift_count.
self.lastIndex := self.lastIndex + shift_count. self.lastIndex := self.lastIndex + shift_count.
} }
method insert: obj at: index
{
## internal use only - index must be between 0 and self size inclusive
| i start |
if (self size == self.contents size) { self growBy: 8 shiftBy: 8 }.
start := self.firstIndex + index.
i := self.lastIndex.
while (i > start)
{
self.contents at: i put: (self.contents at: i - 1).
i := i - 1.
}.
self.lastIndex := self.lastIndex + 1.
self.contents at: index + self.firstIndex put: obj.
^obj
}
} }
## ------------------------------------------------------------------------------- ## -------------------------------------------------------------------------------

8
moo/kernel/Socket.moo
View File

@ -254,7 +254,7 @@ class Socket(Object) from 'sck'
method(#class) __with: handle method(#class) __with: handle
{ {
###self addToBeFinalized. ###self addToBeFinalized.
^(self _basicNew initialize) __open(handle) ^(self basicNew initialize) __open(handle)
} }
method(#class) family: family type: type method(#class) family: family type: type
@ -263,7 +263,7 @@ class Socket(Object) from 'sck'
## new is prohibited. so use _basicNew with initialize. ## new is prohibited. so use _basicNew with initialize.
##^(self new) open(family, type, 0) ##^(self new) open(family, type, 0)
^(self _basicNew initialize) open(family, type, 0) ^(self basicNew initialize) open(family, type, 0)
} }
method close method close
@ -308,7 +308,7 @@ class SyncSocket(Socket)
method(#class) __with: handle method(#class) __with: handle
{ {
###self addToBeFinalized. ###self addToBeFinalized.
^(self _basicNew initialize) __open(handle) ^(self basicNew initialize) __open(handle)
} }
method(#class) family: family type: type method(#class) family: family type: type
@ -317,7 +317,7 @@ class SyncSocket(Socket)
## new is prohibited. so use _basicNew with initialize. ## new is prohibited. so use _basicNew with initialize.
##^(self new) open(family, type, 0) ##^(self new) open(family, type, 0)
^(self _basicNew initialize) open(family, type, 0) ^(self basicNew initialize) open(family, type, 0)
} }
method initialize method initialize

16
moo/lib/comp.c
View File

@ -5409,7 +5409,13 @@ static int compile_message_expression (moo_t* moo, int to_super)
noop_pos = moo->c->mth.code.len; noop_pos = moo->c->mth.code.len;
if (emit_byte_instruction(moo, BCODE_NOOP) <= -1) return -1; if (emit_byte_instruction(moo, BCODE_NOOP) <= -1) return -1;
if (compile_binary_message(moo, to_super) <= -1) return -1;
/* to_super is reset to 0 because a unary message
* has been sent to super and this binary message
* is following the unary message.
* for instance, in "super abc + 10", + is sent
* to the 'self' which is the result of super abc */
if (compile_binary_message(moo, 0/*to_super*/) <= -1) return -1;
} }
if (TOKEN_TYPE(moo) == MOO_IOTOK_KEYWORD) if (TOKEN_TYPE(moo) == MOO_IOTOK_KEYWORD)
@ -5422,7 +5428,9 @@ static int compile_message_expression (moo_t* moo, int to_super)
noop_pos = moo->c->mth.code.len; noop_pos = moo->c->mth.code.len;
if (emit_byte_instruction(moo, BCODE_NOOP) <= -1) return -1; if (emit_byte_instruction(moo, BCODE_NOOP) <= -1) return -1;
if (compile_keyword_message(moo, to_super) <= -1) return -1; /* don't pass to_super. pass 0 as it can't be the
* first message after 'super' */
if (compile_keyword_message(moo, 0/*to_super*/) <= -1) return -1;
} }
break; break;
@ -5441,7 +5449,9 @@ static int compile_message_expression (moo_t* moo, int to_super)
noop_pos = moo->c->mth.code.len; noop_pos = moo->c->mth.code.len;
if (emit_byte_instruction(moo, BCODE_NOOP) <= -1) return -1; if (emit_byte_instruction(moo, BCODE_NOOP) <= -1) return -1;
if (compile_keyword_message(moo, to_super) <= -1) return -1; /* don't pass to_super. pass 0 as it can't be the
* first message after 'super' */
if (compile_keyword_message(moo, 0/*to_super*/) <= -1) return -1;
} }
break; break;

2
moo/lib/exec.c
View File

@ -4001,7 +4001,7 @@ static int send_message (moo_t* moo, moo_oop_char_t selector, int to_super, moo_
mthname.ptr = MOO_OBJ_GET_CHAR_SLOT(selector); mthname.ptr = MOO_OBJ_GET_CHAR_SLOT(selector);
mthname.len = MOO_OBJ_GET_SIZE(selector); mthname.len = MOO_OBJ_GET_SIZE(selector);
method = moo_findmethod (moo, receiver, &mthname, to_super); method = moo_findmethod(moo, receiver, &mthname, to_super);
if (!method) if (!method)
{ {
static moo_ooch_t fbm[] = { static moo_ooch_t fbm[] = {