gnustep/libs-steptalk
0
0
Fork 0
mirror of https://github.com/gnustep/libs-steptalk.git synced 2025-02-21 02:31:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Smalltalk compiler bug: The value of a statement sequence is the

Browse source 
value of its last statement.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/steptalk/trunk@36410 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Wolfgang Lux 2013-03-23 20:02:23 +00:00
parent 760bbb4b83
commit 9b35f05577
2 changed files with 36 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Languages/Smalltalk/ChangeLog
View file

@ -1,3 +1,9 @@
2013-03-23 Wolfgang Lux <wolfgang.lux@gmail.com>
* STCompiler.m (compileStatements:blockFlag:): Fix compiler bug: The
value of a Smalltalk statement sequence is the value of its last
statement and not that of the first.
2013-03-23 Wolfgang Lux <wolfgang.lux@gmail.com>
* STBlock.m (-initWithInterpreter:...):

56
Languages/Smalltalk/STCompiler.m
View file

@ -557,6 +557,7 @@ extern int STCparse(void *context);
- (void)compileStatements:(STCStatements *)statements blockFlag:(BOOL)blockFlag
{
BOOL first;
NSEnumerator *enumerator;
STBlockLiteral *blockInfo = nil;
STCExpression *expr;
@ -578,10 +579,10 @@ extern int STCparse(void *context);
NSDebugLLog(@"STCompiler-misc",@" temporaries %@", array);
if(array)
if (array)
{
argCount = [array count];
for(index=0;index<argCount;index++)
for (index=0; index<argCount; index++)
{
[self addTempVariable:[array objectAtIndex:index]];
}
@ -590,7 +591,7 @@ extern int STCparse(void *context);
tempsSize = MAX(tempsSize,tempsCount);
}
if(blockFlag)
if (blockFlag)
{
blockInfo = [[STBlockLiteral alloc] initWithArgumentCount:argCount];
@ -609,7 +610,7 @@ extern int STCparse(void *context);
[self emitLongJump:0];
for(index = argCount; index > 0; index--)
for (index = argCount; index > 0; index--)
{
[self emitPopAndStoreTemporary:tempsSave + index - 1];
}
@ -617,18 +618,12 @@ extern int STCparse(void *context);
array = [statements expressions];
if(array)
first = YES;
if (array)
{
BOOL first = YES;
enumerator = [array objectEnumerator];
while((expr = [enumerator nextObject]))
while ((expr = [enumerator nextObject]) != nil)
{
[self compileExpression:expr];
/* Mateu Batle: ignore returned value on the stack ? */
/* FIXME: please check this !!! */
if (!first)
{
[self emitPopStack];
@ -637,16 +632,25 @@ extern int STCparse(void *context);
{
first = NO;
}
[self compileExpression:expr];
}
}
expr = [statements returnExpression];
if(expr)
if (expr)
{
if (!first)
{
[self emitPopStack];
}
else
{
first = NO;
}
[self compileExpression:expr];
}
if(blockFlag)
if (blockFlag)
{
[blockInfo setStackSize:stackSize];
AUTORELEASE(blockInfo);
@ -662,7 +666,7 @@ extern int STCparse(void *context);
}
/* fixup jump (if block) */
if(blockFlag)
if (blockFlag)
{
[self fixupLongJumpAt:jumpIP with:[self currentBytecode] - jumpIP];
}
@ -674,21 +678,21 @@ extern int STCparse(void *context);
// tempsCount = tempsSave;
tempsCount = [tempVars count];
if(blockFlag)
if (blockFlag)
{
int i;
/* Need to keep the block parameters allocated until we exit
the method context, but we also need to harvest the names*/
for (i = tempsSave; i < tempsCount; ++i)
[tempVars replaceObjectAtIndex: i withObject:@""];
int i;
/* Need to keep the block parameters allocated until we exit
the method context, but we also need to harvest the names*/
for (i = tempsSave; i < tempsCount; ++i)
[tempVars replaceObjectAtIndex: i withObject:@""];
}
else
{
/* cleanup unneeded temp variables */
[tempVars removeObjectsInRange:NSMakeRange(tempsSave,
tempsCount-tempsSave)];
tempsCount = tempsSave;
/* cleanup unneeded temp variables */
[tempVars removeObjectsInRange:NSMakeRange(tempsSave,
tempsCount-tempsSave)];
tempsCount = tempsSave;
}
}