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

Follow Smalltalk convention to return the receiver from a method

Browse source 
without an explicit return statement.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/steptalk/trunk@36421 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Wolfgang Lux 2013-03-24 17:24:11 +00:00
parent fd46046983
commit 1fc2e5fb63
2 changed files with 21 additions and 6 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-24 Wolfgang Lux <wolfgang.lux@gmail.com>
* STCompiler.m (-compileMethod:): Follow Smalltalk convention to
return the receiver from a method without an explicit return
statement.
2013-03-24 Wolfgang Lux <wolfgang.lux@gmail.com> 2013-03-24 Wolfgang Lux <wolfgang.lux@gmail.com>
* STExecutionContext.h: Change type of instruction pointer attribute * STExecutionContext.h: Change type of instruction pointer attribute

21
Languages/Smalltalk/STCompiler.m
View file

@ -327,11 +327,20 @@ extern int STCparse(void *context);
/* FIXME: unite STCMessage and STMessage */ /* FIXME: unite STCMessage and STMessage */
messagePattern = (STMessage *)[method messagePattern]; messagePattern = (STMessage *)[method messagePattern];
if(!messagePattern) if (!messagePattern)
{ {
messagePattern = [STMessage messageWithSelector:@"_unnamed_method" messagePattern = [STMessage messageWithSelector:@"_unnamed_method"
arguments:nil]; arguments:nil];
} }
else if (![[method statements] returnExpression])
{
/* A Smalltalk method (but not plain code) without a return expression
returns the receiver itself. */
STCPrimary *selfPrimary = [STCPrimary primaryWithVariable:@"self"];
STCExpression *returnExpression =
[STCExpression primaryExpressionWithObject:selfPrimary];
[[method statements] setReturnExpression:returnExpression];
}
NSDebugLLog(@"STCompiler", @"Compile method %@", [messagePattern selector]); NSDebugLLog(@"STCompiler", @"Compile method %@", [messagePattern selector]);
@ -342,16 +351,16 @@ extern int STCparse(void *context);
compiledMethod = [STCompiledMethod methodWithCode:code compiledMethod = [STCompiledMethod methodWithCode:code
messagePattern:messagePattern]; messagePattern:messagePattern];
if(!isSingleMethod) if (!isSingleMethod)
{ {
if(resultMethod) if (resultMethod)
{ {
[NSException raise:@"STCompilerException" [NSException raise:@"STCompilerException"
format:@"Method is present when compiling a script"]; format:@"Method is present when compiling a script"];
return; return;
} }
if(!resultScript) if (!resultScript)
{ {
NSDebugLLog(@"STCompiler", NSDebugLLog(@"STCompiler",
@"Creating script with %i variables",[receiverVars count]); @"Creating script with %i variables",[receiverVars count]);
@ -363,13 +372,13 @@ extern int STCparse(void *context);
} }
else else
{ {
if(resultMethod) if (resultMethod)
{ {
[NSException raise:@"STCompilerException" [NSException raise:@"STCompilerException"
format:@"More than one method compiled for single method request"]; format:@"More than one method compiled for single method request"];
return; return;
} }
if(resultScript) if (resultScript)
{ {
[NSException raise:@"STCompilerException" [NSException raise:@"STCompilerException"
format:@"Compiled script is present when compiling single method"]; format:@"Compiled script is present when compiling single method"];