Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: dennisferron/Iocaste
base: 5666741e18
...
head fork: dennisferron/Iocaste
compare: 13293f179c
Checking mergeability… Don't worry, you can still create the pull request.
  • 5 commits
  • 1 file changed
  • 0 commit comments
  • 1 contributor
Showing with 9 additions and 4 deletions.
  1. +9 −4 iovm/source/IoObject.c
View
13 iovm/source/IoObject.c
@@ -1778,8 +1778,12 @@ IO_METHOD(IoObject, uniqueId)
IO_METHOD(IoObject, do)
{
- /*doc Object do(expression)
- Evaluates the message in the context of the receiver. Returns self.
+ /*doc Object nonlexicalDo(expression)
+ Evaluates the message in the context of the receiver.
+ The lexical context (locals defined in the calling context)
+ is not visible within the "do" construct.
+ See "lexicalDo" for one that does use local context.
+ Returns self.
*/
if (IoMessage_argCount(m) != 0)
@@ -1795,7 +1799,8 @@ IO_METHOD(IoObject, lexicalDo)
{
/*doc Object lexicalDo(expression)
Evaluates the message in the context of the receiver.
- The lexical context is added as a proto of the receiver while the argument is evaluated.
+ The lexical context is added as a proto of the receiver while the argument is evaluated;
+ this makes locals from the calling context visible within the "lexicalDo" construct.
Returns self.
*/
@@ -1810,6 +1815,7 @@ IO_METHOD(IoObject, lexicalDo)
return self;
}
+
IO_METHOD(IoObject, message)
{
/*doc Object message(expression)
@@ -1949,7 +1955,6 @@ IO_METHOD(IoObject, argIsCall)
printf("IoCall_rawClone = %p\n", IoCall_rawClone);
//testStack(self);
-<<<<<<< HEAD
printf("ISACTIVATIONCONTEXT = %i\n", isAct);

No commit comments for this range

Something went wrong with that request. Please try again.