Browse Source

Compiler-IR: #visitOrAlias: instead of #alias: in a few places

Herbert Vojčík 8 years ago
parent
commit
2a0d738336

File diff suppressed because it is too large
+ 49 - 84
external/amber-cli/src/AmberCli.js


File diff suppressed because it is too large
+ 155 - 267
src/Compiler-AST.js


+ 68 - 117
src/Compiler-Core.js

@@ -1,4 +1,4 @@
-define("amber_core/Compiler-Core", ["amber/boot", "amber_core/Kernel-Objects", "amber_core/Platform-Services", "amber_core/Kernel-Exceptions", "amber_core/Kernel-Collections"], function($boot){"use strict";
+define("amber_core/Compiler-Core", ["amber/boot", "amber_core/Kernel-Objects", "amber_core/Kernel-Exceptions", "amber_core/Platform-Services", "amber_core/Kernel-Collections"], function($boot){"use strict";
 var $core=$boot.api,nil=$boot.nil,$recv=$boot.asReceiver,$globals=$boot.globals;
 $core.addPackage('Compiler-Core');
 $core.packages["Compiler-Core"].innerEval = function (expr) { return eval(expr); };
@@ -77,9 +77,7 @@ selector: "currentClass",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@currentClass"];
-return $1;
+return self["@currentClass"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -116,9 +114,7 @@ selector: "currentPackage",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@currentPackage"];
-return $1;
+return self["@currentPackage"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -159,9 +155,7 @@ function $Smalltalk(){return $globals.Smalltalk||(typeof Smalltalk=="undefined"?
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($Smalltalk())._pseudoVariableNames();
-return $1;
+return $recv($Smalltalk())._pseudoVariableNames();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"pseudoVariables",{},$globals.AbstractCodeGenerator)});
 //>>excludeEnd("ctx");
@@ -184,14 +178,13 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$receiver;
-$2=self["@source"];
-if(($receiver = $2) == null || $receiver.isNil){
-$1="";
+var $1,$receiver;
+$1=self["@source"];
+if(($receiver = $1) == null || $receiver.isNil){
+return "";
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"source",{},$globals.AbstractCodeGenerator)});
 //>>excludeEnd("ctx");
@@ -240,7 +233,7 @@ var ir,stream;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$1;
+var $1;
 $recv(self._semanticAnalyzer())._visit_(aNode);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["visit:"]=1;
@@ -249,12 +242,10 @@ ir=$recv(self._translator())._visit_(aNode);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["visit:"]=2;
 //>>excludeEnd("ctx");
-$2=self._irTranslator();
-$recv($2)._currentClass_(self._currentClass());
-$recv($2)._visit_(ir);
-$3=$recv($2)._contents();
-$1=$3;
-return $1;
+$1=self._irTranslator();
+$recv($1)._currentClass_(self._currentClass());
+$recv($1)._visit_(ir);
+return $recv($1)._contents();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"compileNode:",{aNode:aNode,ir:ir,stream:stream},$globals.CodeGenerator)});
 //>>excludeEnd("ctx");
@@ -278,9 +269,7 @@ function $IRJSTranslator(){return $globals.IRJSTranslator||(typeof IRJSTranslato
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($IRJSTranslator())._new();
-return $1;
+return $recv($IRJSTranslator())._new();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"irTranslator",{},$globals.CodeGenerator)});
 //>>excludeEnd("ctx");
@@ -304,12 +293,10 @@ function $SemanticAnalyzer(){return $globals.SemanticAnalyzer||(typeof SemanticA
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$1;
-$2=$recv($SemanticAnalyzer())._on_(self._currentClass());
-$recv($2)._thePackage_(self._currentPackage());
-$3=$recv($2)._yourself();
-$1=$3;
-return $1;
+var $1;
+$1=$recv($SemanticAnalyzer())._on_(self._currentClass());
+$recv($1)._thePackage_(self._currentPackage());
+return $recv($1)._yourself();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"semanticAnalyzer",{},$globals.CodeGenerator)});
 //>>excludeEnd("ctx");
@@ -333,13 +320,11 @@ function $IRASTTranslator(){return $globals.IRASTTranslator||(typeof IRASTTransl
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$1;
-$2=$recv($IRASTTranslator())._new();
-$recv($2)._source_(self._source());
-$recv($2)._theClass_(self._currentClass());
-$3=$recv($2)._yourself();
-$1=$3;
-return $1;
+var $1;
+$1=$recv($IRASTTranslator())._new();
+$recv($1)._source_(self._source());
+$recv($1)._theClass_(self._currentClass());
+return $recv($1)._yourself();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"translator",{},$globals.CodeGenerator)});
 //>>excludeEnd("ctx");
@@ -369,14 +354,13 @@ function $InliningCodeGenerator(){return $globals.InliningCodeGenerator||(typeof
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$receiver;
-$2=self["@codeGeneratorClass"];
-if(($receiver = $2) == null || $receiver.isNil){
-$1=$InliningCodeGenerator();
+var $1,$receiver;
+$1=self["@codeGeneratorClass"];
+if(($receiver = $1) == null || $receiver.isNil){
+return $InliningCodeGenerator();
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"codeGeneratorClass",{},$globals.Compiler)});
 //>>excludeEnd("ctx");
@@ -418,11 +402,8 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1;
 self._source_(aString);
-$2=self._compileNode_forClass_package_(self._parse_(aString),aClass,$recv(aClass)._packageOfProtocol_(anotherString));
-$1=$2;
-return $1;
+return self._compileNode_forClass_package_(self._parse_(aString),aClass,$recv(aClass)._packageOfProtocol_(anotherString));
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"compile:forClass:protocol:",{aString:aString,aClass:aClass,anotherString:anotherString},$globals.Compiler)});
 //>>excludeEnd("ctx");
@@ -445,13 +426,12 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1;
-$2=$recv("xxxDoIt ^ [ ".__comma(aString)).__comma(" ] value");
+var $1;
+$1=$recv("xxxDoIt ^ [ ".__comma(aString)).__comma(" ] value");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx[","]=1;
 //>>excludeEnd("ctx");
-$1=self._compile_forClass_protocol_($2,$recv(anObject)._class(),"**xxxDoIt");
-return $1;
+return self._compile_forClass_protocol_($1,$recv(anObject)._class(),"**xxxDoIt");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"compileExpression:on:",{aString:aString,anObject:anObject},$globals.Compiler)});
 //>>excludeEnd("ctx");
@@ -475,16 +455,15 @@ var generator,result;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2,$3;
+var $1;
 generator=$recv(self._codeGeneratorClass())._new();
 $1=generator;
 $recv($1)._source_(self._source());
 $recv($1)._currentClass_(self._currentClass());
-$2=$recv($1)._currentPackage_(self._currentPackage());
+$recv($1)._currentPackage_(self._currentPackage());
 result=$recv(generator)._compileNode_(aNode);
 self._unknownVariables_([]);
-$3=result;
-return $3;
+return result;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"compileNode:",{aNode:aNode,generator:generator,result:result},$globals.Compiler)});
 //>>excludeEnd("ctx");
@@ -507,12 +486,9 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1;
 self._currentClass_(aClass);
 self._currentPackage_(aPackage);
-$2=self._compileNode_(aNode);
-$1=$2;
-return $1;
+return self._compileNode_(aNode);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"compileNode:forClass:package:",{aNode:aNode,aClass:aClass,aPackage:aPackage},$globals.Compiler)});
 //>>excludeEnd("ctx");
@@ -532,9 +508,7 @@ selector: "currentClass",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@currentClass"];
-return $1;
+return self["@currentClass"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -571,9 +545,7 @@ selector: "currentPackage",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@currentPackage"];
-return $1;
+return self["@currentPackage"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -664,9 +636,7 @@ function $DoIt(){return $globals.DoIt||(typeof DoIt=="undefined"?nil:DoIt)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=self._evaluateExpression_on_(aString,$recv($DoIt())._new());
-return $1;
+return self._evaluateExpression_on_(aString,$recv($DoIt())._new());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"evaluateExpression:",{aString:aString},$globals.Compiler)});
 //>>excludeEnd("ctx");
@@ -690,7 +660,7 @@ var result,method;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2;
+var $1;
 method=self._eval_(self._compileExpression_on_(aString,anObject));
 $recv(method)._protocol_("**xxxDoIt");
 $1=$recv(anObject)._class();
@@ -700,8 +670,7 @@ $ctx1.sendIdx["class"]=1;
 $recv($1)._addCompiledMethod_(method);
 result=$recv(anObject)._xxxDoIt();
 $recv($recv(anObject)._class())._removeCompiledMethod_(method);
-$2=result;
-return $2;
+return result;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"evaluateExpression:on:",{aString:aString,anObject:anObject,result:result,method:method},$globals.Compiler)});
 //>>excludeEnd("ctx");
@@ -726,10 +695,8 @@ function $ClassBuilder(){return $globals.ClassBuilder||(typeof ClassBuilder=="un
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
 compiledMethod=self._eval_forPackage_(self._compile_forClass_protocol_(aString,aBehavior,anotherString),$recv(aBehavior)._packageOfProtocol_(anotherString));
-$1=$recv($recv($ClassBuilder())._new())._installMethod_forClass_protocol_(compiledMethod,aBehavior,anotherString);
-return $1;
+return $recv($recv($ClassBuilder())._new())._installMethod_forClass_protocol_(compiledMethod,aBehavior,anotherString);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"install:forClass:protocol:",{aString:aString,aBehavior:aBehavior,anotherString:anotherString,compiledMethod:compiledMethod},$globals.Compiler)});
 //>>excludeEnd("ctx");
@@ -753,9 +720,7 @@ function $Smalltalk(){return $globals.Smalltalk||(typeof Smalltalk=="undefined"?
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($Smalltalk())._parse_(aString);
-return $1;
+return $recv($Smalltalk())._parse_(aString);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"parse:",{aString:aString},$globals.Compiler)});
 //>>excludeEnd("ctx");
@@ -778,13 +743,12 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1;
-$2=$recv("doIt ^ [ ".__comma(aString)).__comma(" ] value");
+var $1;
+$1=$recv("doIt ^ [ ".__comma(aString)).__comma(" ] value");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx[","]=1;
 //>>excludeEnd("ctx");
-$1=self._parse_($2);
-return $1;
+return self._parse_($1);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"parseExpression:",{aString:aString},$globals.Compiler)});
 //>>excludeEnd("ctx");
@@ -877,14 +841,13 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$receiver;
-$2=self["@source"];
-if(($receiver = $2) == null || $receiver.isNil){
-$1="";
+var $1,$receiver;
+$1=self["@source"];
+if(($receiver = $1) == null || $receiver.isNil){
+return "";
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"source",{},$globals.Compiler)});
 //>>excludeEnd("ctx");
@@ -923,9 +886,7 @@ selector: "unknownVariables",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@unknownVariables"];
-return $1;
+return self["@unknownVariables"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -1044,7 +1005,7 @@ function $AISemanticAnalyzer(){return $globals.AISemanticAnalyzer||(typeof AISem
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2,$3,$4;
+var $1;
 var $early={};
 try {
 compiler=$recv($Compiler())._new();
@@ -1061,17 +1022,15 @@ return ast;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
-$1=self._alert_($recv(ex)._messageText());
-throw $early=[$1];
+throw $early=[self._alert_($recv(ex)._messageText())];
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx2) {$ctx2.fillBlock({ex:ex},$ctx1,2)});
 //>>excludeEnd("ctx");
 }));
-$2=$recv($AISemanticAnalyzer())._on_($recv($recv(aContext)._receiver())._class());
-$recv($2)._context_(aContext);
-$3=$recv($2)._visit_(ast);
-$4=$recv(aContext)._evaluateNode_(ast);
-return $4;
+$1=$recv($AISemanticAnalyzer())._on_($recv($recv(aContext)._receiver())._class());
+$recv($1)._context_(aContext);
+$recv($1)._visit_(ast);
+return $recv(aContext)._evaluateNode_(ast);
 }
 catch(e) {if(e===$early)return e[0]; throw e}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -1096,9 +1055,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(anObject)._evaluate_on_(aString,self);
-return $1;
+return $recv(anObject)._evaluate_on_(aString,self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"evaluate:for:",{aString:aString,anObject:anObject},$globals.Evaluator)});
 //>>excludeEnd("ctx");
@@ -1124,7 +1081,6 @@ function $Error(){return $globals.Error||(typeof Error=="undefined"?nil:Error)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2;
 var $early={};
 try {
 compiler=$recv($Compiler())._new();
@@ -1140,14 +1096,12 @@ return $recv(compiler)._parseExpression_(aString);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
-$1=self._alert_($recv(ex)._messageText());
-throw $early=[$1];
+throw $early=[self._alert_($recv(ex)._messageText())];
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx2) {$ctx2.fillBlock({ex:ex},$ctx1,2)});
 //>>excludeEnd("ctx");
 }));
-$2=$recv(compiler)._evaluateExpression_on_(aString,anObject);
-return $2;
+return $recv(compiler)._evaluateExpression_on_(aString,anObject);
 }
 catch(e) {if(e===$early)return e[0]; throw e}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -1173,9 +1127,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._new())._evaluate_for_(aString,anObject);
-return $1;
+return $recv(self._new())._evaluate_for_(aString,anObject);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"evaluate:for:",{aString:aString,anObject:anObject},$globals.Evaluator.klass)});
 //>>excludeEnd("ctx");
@@ -1199,14 +1151,13 @@ function $Smalltalk(){return $globals.Smalltalk||(typeof Smalltalk=="undefined"?
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1;
-$2=$recv($recv($Smalltalk())._reservedWords())._includes_(self);
-if($core.assert($2)){
-$1=self.__comma("_");
+var $1;
+$1=$recv($recv($Smalltalk())._reservedWords())._includes_(self);
+if($core.assert($1)){
+return self.__comma("_");
 } else {
-$1=self;
+return self;
 };
-return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"asVariableName",{},$globals.String)});
 //>>excludeEnd("ctx");

File diff suppressed because it is too large
+ 146 - 245
src/Compiler-IR.js


+ 2 - 2
src/Compiler-IR.st

@@ -152,7 +152,7 @@ visitCascadeNode: aNode
 	aNode nodes allButLast do: [ :each |
 		self sequence add: (self visit: each) ].
 
-	^ self alias: aNode nodes last
+	^ self visitOrAlias: aNode nodes last
 !
 
 visitDynamicArrayNode: aNode
@@ -221,7 +221,7 @@ visitReturnNode: aNode
 		ifFalse: [ IRReturn new ].
 	return scope: aNode scope.
 	aNode nodes do: [ :each |
-		return add: (self alias: each) ].
+		return add: (self visitOrAlias: each) ].
 	^ return
 !
 

+ 157 - 228
src/Compiler-Inlining.js

@@ -17,9 +17,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(aVisitor)._visitIRInlinedAssignment_(self);
-return $1;
+return $recv(aVisitor)._visitIRInlinedAssignment_(self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"accept:",{aVisitor:aVisitor},$globals.IRInlinedAssignment)});
 //>>excludeEnd("ctx");
@@ -114,9 +112,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(aVisitor)._visitIRInlinedReturn_(self);
-return $1;
+return $recv(aVisitor)._visitIRInlinedReturn_(self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"accept:",{aVisitor:aVisitor},$globals.IRInlinedReturn)});
 //>>excludeEnd("ctx");
@@ -184,9 +180,7 @@ selector: "internalVariables",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=[];
-return $1;
+return [];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -286,9 +280,7 @@ function $Array(){return $globals.Array||(typeof Array=="undefined"?nil:Array)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($Array())._with_(self._receiverInternalVariable());
-return $1;
+return $recv($Array())._with_(self._receiverInternalVariable());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"internalVariables",{},$globals.IRInlinedIfNilIfNotNil)});
 //>>excludeEnd("ctx");
@@ -313,15 +305,13 @@ function $AliasVar(){return $globals.AliasVar||(typeof AliasVar=="undefined"?nil
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$1;
-$2=$recv($IRVariable())._new();
+var $1;
+$1=$recv($IRVariable())._new();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["new"]=1;
 //>>excludeEnd("ctx");
-$recv($2)._variable_($recv($recv($AliasVar())._new())._name_(self._receiverInternalVariableName()));
-$3=$recv($2)._yourself();
-$1=$3;
-return $1;
+$recv($1)._variable_($recv($recv($AliasVar())._new())._name_(self._receiverInternalVariableName()));
+return $recv($1)._yourself();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"receiverInternalVariable",{},$globals.IRInlinedIfNilIfNotNil)});
 //>>excludeEnd("ctx");
@@ -477,12 +467,10 @@ function $IRAssignmentInliner(){return $globals.IRAssignmentInliner||(typeof IRA
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$1;
-$2=$recv($IRAssignmentInliner())._new();
-$recv($2)._translator_(self);
-$3=$recv($2)._yourself();
-$1=$3;
-return $1;
+var $1;
+$1=$recv($IRAssignmentInliner())._new();
+$recv($1)._translator_(self);
+return $recv($1)._yourself();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"assignmentInliner",{},$globals.IRInliner)});
 //>>excludeEnd("ctx");
@@ -506,12 +494,10 @@ function $IRReturnInliner(){return $globals.IRReturnInliner||(typeof IRReturnInl
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$1;
-$2=$recv($IRReturnInliner())._new();
-$recv($2)._translator_(self);
-$3=$recv($2)._yourself();
-$1=$3;
-return $1;
+var $1;
+$1=$recv($IRReturnInliner())._new();
+$recv($1)._translator_(self);
+return $recv($1)._yourself();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"returnInliner",{},$globals.IRInliner)});
 //>>excludeEnd("ctx");
@@ -535,12 +521,10 @@ function $IRSendInliner(){return $globals.IRSendInliner||(typeof IRSendInliner==
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$1;
-$2=$recv($IRSendInliner())._new();
-$recv($2)._translator_(self);
-$3=$recv($2)._yourself();
-$1=$3;
-return $1;
+var $1;
+$1=$recv($IRSendInliner())._new();
+$recv($1)._translator_(self);
+return $recv($1)._yourself();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"sendInliner",{},$globals.IRInliner)});
 //>>excludeEnd("ctx");
@@ -670,8 +654,7 @@ function $IRSendInliner(){return $globals.IRSendInliner||(typeof IRSendInliner==
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($recv($recv(anIRSend)._isInlined())._not())._and_((function(){
+return $recv($recv($recv(anIRSend)._isInlined())._not())._and_((function(){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
@@ -680,7 +663,6 @@ return $recv($IRSendInliner())._shouldInline_(anIRSend);
 }, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)});
 //>>excludeEnd("ctx");
 }));
-return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"shouldInlineSend:",{anIRSend:anIRSend},$globals.IRInliner)});
 //>>excludeEnd("ctx");
@@ -705,7 +687,7 @@ function $IRReturn(){return $globals.IRReturn||(typeof IRReturn=="undefined"?nil
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$4,$3,$5,$6,$7,$8,$9;
+var $2,$1,$4,$3,$5,$6,$7;
 $2=$recv(anIRNonLocalReturn)._scope();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["scope"]=1;
@@ -724,8 +706,7 @@ $ctx1.sendIdx["scope"]=3;
 $recv($3)._removeNonLocalReturn_($5);
 $6=$recv($IRReturn())._new();
 $recv($6)._scope_($recv(anIRNonLocalReturn)._scope());
-$7=$recv($6)._yourself();
-localReturn=$7;
+localReturn=$recv($6)._yourself();
 localReturn;
 $recv($recv(anIRNonLocalReturn)._instructions())._do_((function(each){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -737,10 +718,9 @@ return $recv(localReturn)._add_(each);
 //>>excludeEnd("ctx");
 }));
 $recv(anIRNonLocalReturn)._replaceWith_(localReturn);
-$8=localReturn;
-return $8;
+return localReturn;
 };
-$9=(
+$7=(
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.supercall = true, 
 //>>excludeEnd("ctx");
@@ -748,7 +728,7 @@ $globals.IRInliner.superclass.fn.prototype._visitIRNonLocalReturn_.apply($recv(s
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.supercall = false;
 //>>excludeEnd("ctx");;
-return $9;
+return $7;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"transformNonLocalReturn:",{anIRNonLocalReturn:anIRNonLocalReturn,localReturn:localReturn},$globals.IRInliner)});
 //>>excludeEnd("ctx");
@@ -771,12 +751,12 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1;
-$2=self._shouldInlineAssignment_(anIRAssignment);
-if($core.assert($2)){
-$1=$recv(self._assignmentInliner())._inlineAssignment_(anIRAssignment);
+var $1;
+$1=self._shouldInlineAssignment_(anIRAssignment);
+if($core.assert($1)){
+return $recv(self._assignmentInliner())._inlineAssignment_(anIRAssignment);
 } else {
-$1=(
+return (
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.supercall = true, 
 //>>excludeEnd("ctx");
@@ -785,7 +765,6 @@ $globals.IRInliner.superclass.fn.prototype._visitIRAssignment_.apply($recv(self)
 $ctx1.supercall = false;
 //>>excludeEnd("ctx");;
 };
-return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"visitIRAssignment:",{anIRAssignment:anIRAssignment},$globals.IRInliner)});
 //>>excludeEnd("ctx");
@@ -808,9 +787,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=self._transformNonLocalReturn_(anIRNonLocalReturn);
-return $1;
+return self._transformNonLocalReturn_(anIRNonLocalReturn);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"visitIRNonLocalReturn:",{anIRNonLocalReturn:anIRNonLocalReturn},$globals.IRInliner)});
 //>>excludeEnd("ctx");
@@ -833,12 +810,12 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1;
-$2=self._shouldInlineReturn_(anIRReturn);
-if($core.assert($2)){
-$1=$recv(self._returnInliner())._inlineReturn_(anIRReturn);
+var $1;
+$1=self._shouldInlineReturn_(anIRReturn);
+if($core.assert($1)){
+return $recv(self._returnInliner())._inlineReturn_(anIRReturn);
 } else {
-$1=(
+return (
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.supercall = true, 
 //>>excludeEnd("ctx");
@@ -847,7 +824,6 @@ $globals.IRInliner.superclass.fn.prototype._visitIRReturn_.apply($recv(self), [a
 $ctx1.supercall = false;
 //>>excludeEnd("ctx");;
 };
-return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"visitIRReturn:",{anIRReturn:anIRReturn},$globals.IRInliner)});
 //>>excludeEnd("ctx");
@@ -870,12 +846,12 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1;
-$2=self._shouldInlineSend_(anIRSend);
-if($core.assert($2)){
-$1=$recv(self._sendInliner())._inlineSend_(anIRSend);
+var $1;
+$1=self._shouldInlineSend_(anIRSend);
+if($core.assert($1)){
+return $recv(self._sendInliner())._inlineSend_(anIRSend);
 } else {
-$1=(
+return (
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.supercall = true, 
 //>>excludeEnd("ctx");
@@ -884,7 +860,6 @@ $globals.IRInliner.superclass.fn.prototype._visitIRSend_.apply($recv(self), [anI
 $ctx1.supercall = false;
 //>>excludeEnd("ctx");;
 };
-return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"visitIRSend:",{anIRSend:anIRSend},$globals.IRInliner)});
 //>>excludeEnd("ctx");
@@ -1373,9 +1348,7 @@ function $IRInlinedIfFalse(){return $globals.IRInlinedIfFalse||(typeof IRInlined
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=self._inlinedSend_with_($recv($IRInlinedIfFalse())._new(),anIRInstruction);
-return $1;
+return self._inlinedSend_with_($recv($IRInlinedIfFalse())._new(),anIRInstruction);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"ifFalse:",{anIRInstruction:anIRInstruction},$globals.IRSendInliner)});
 //>>excludeEnd("ctx");
@@ -1398,9 +1371,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=self._perform_withArguments_("ifTrue:ifFalse:",[anotherIRInstruction,anIRInstruction]);
-return $1;
+return self._perform_withArguments_("ifTrue:ifFalse:",[anotherIRInstruction,anIRInstruction]);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"ifFalse:ifTrue:",{anIRInstruction:anIRInstruction,anotherIRInstruction:anotherIRInstruction},$globals.IRSendInliner)});
 //>>excludeEnd("ctx");
@@ -1426,32 +1397,30 @@ function $IRBlockSequence(){return $globals.IRBlockSequence||(typeof IRBlockSequ
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$4,$5,$7,$8,$6,$9,$3,$1;
-$2=$recv($IRInlinedIfNilIfNotNil())._new();
+var $1,$3,$4,$6,$7,$5,$2;
+$1=$recv($IRInlinedIfNilIfNotNil())._new();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["new"]=1;
 //>>excludeEnd("ctx");
-$4=$recv($IRClosure())._new();
+$3=$recv($IRClosure())._new();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["new"]=2;
 //>>excludeEnd("ctx");
-$recv($4)._scope_($recv($recv(anIRInstruction)._scope())._copy());
-$5=$4;
-$7=$recv($IRBlockSequence())._new();
-$recv($7)._add_($recv($recv(self._send())._instructions())._first());
-$8=$recv($7)._yourself();
+$recv($3)._scope_($recv($recv(anIRInstruction)._scope())._copy());
+$4=$3;
+$6=$recv($IRBlockSequence())._new();
+$recv($6)._add_($recv($recv(self._send())._instructions())._first());
+$7=$recv($6)._yourself();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["yourself"]=1;
 //>>excludeEnd("ctx");
-$6=$8;
-$recv($5)._add_($6);
+$5=$7;
+$recv($4)._add_($5);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["add:"]=1;
 //>>excludeEnd("ctx");
-$9=$recv($4)._yourself();
-$3=$9;
-$1=self._inlinedSend_with_with_($2,anIRInstruction,$3);
-return $1;
+$2=$recv($3)._yourself();
+return self._inlinedSend_with_with_($1,anIRInstruction,$2);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"ifNil:",{anIRInstruction:anIRInstruction},$globals.IRSendInliner)});
 //>>excludeEnd("ctx");
@@ -1475,9 +1444,7 @@ function $IRInlinedIfNilIfNotNil(){return $globals.IRInlinedIfNilIfNotNil||(type
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=self._inlinedSend_with_with_($recv($IRInlinedIfNilIfNotNil())._new(),anIRInstruction,anotherIRInstruction);
-return $1;
+return self._inlinedSend_with_with_($recv($IRInlinedIfNilIfNotNil())._new(),anIRInstruction,anotherIRInstruction);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"ifNil:ifNotNil:",{anIRInstruction:anIRInstruction,anotherIRInstruction:anotherIRInstruction},$globals.IRSendInliner)});
 //>>excludeEnd("ctx");
@@ -1503,32 +1470,30 @@ function $IRBlockSequence(){return $globals.IRBlockSequence||(typeof IRBlockSequ
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$4,$5,$7,$8,$6,$9,$3,$1;
-$2=$recv($IRInlinedIfNilIfNotNil())._new();
+var $1,$3,$4,$6,$7,$5,$2;
+$1=$recv($IRInlinedIfNilIfNotNil())._new();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["new"]=1;
 //>>excludeEnd("ctx");
-$4=$recv($IRClosure())._new();
+$3=$recv($IRClosure())._new();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["new"]=2;
 //>>excludeEnd("ctx");
-$recv($4)._scope_($recv($recv(anIRInstruction)._scope())._copy());
-$5=$4;
-$7=$recv($IRBlockSequence())._new();
-$recv($7)._add_($recv($recv(self._send())._instructions())._first());
-$8=$recv($7)._yourself();
+$recv($3)._scope_($recv($recv(anIRInstruction)._scope())._copy());
+$4=$3;
+$6=$recv($IRBlockSequence())._new();
+$recv($6)._add_($recv($recv(self._send())._instructions())._first());
+$7=$recv($6)._yourself();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["yourself"]=1;
 //>>excludeEnd("ctx");
-$6=$8;
-$recv($5)._add_($6);
+$5=$7;
+$recv($4)._add_($5);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["add:"]=1;
 //>>excludeEnd("ctx");
-$9=$recv($4)._yourself();
-$3=$9;
-$1=self._inlinedSend_with_with_($2,$3,anIRInstruction);
-return $1;
+$2=$recv($3)._yourself();
+return self._inlinedSend_with_with_($1,$2,anIRInstruction);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"ifNotNil:",{anIRInstruction:anIRInstruction},$globals.IRSendInliner)});
 //>>excludeEnd("ctx");
@@ -1552,9 +1517,7 @@ function $IRInlinedIfNilIfNotNil(){return $globals.IRInlinedIfNilIfNotNil||(type
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=self._inlinedSend_with_with_($recv($IRInlinedIfNilIfNotNil())._new(),anotherIRInstruction,anIRInstruction);
-return $1;
+return self._inlinedSend_with_with_($recv($IRInlinedIfNilIfNotNil())._new(),anotherIRInstruction,anIRInstruction);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"ifNotNil:ifNil:",{anIRInstruction:anIRInstruction,anotherIRInstruction:anotherIRInstruction},$globals.IRSendInliner)});
 //>>excludeEnd("ctx");
@@ -1578,9 +1541,7 @@ function $IRInlinedIfTrue(){return $globals.IRInlinedIfTrue||(typeof IRInlinedIf
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=self._inlinedSend_with_($recv($IRInlinedIfTrue())._new(),anIRInstruction);
-return $1;
+return self._inlinedSend_with_($recv($IRInlinedIfTrue())._new(),anIRInstruction);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"ifTrue:",{anIRInstruction:anIRInstruction},$globals.IRSendInliner)});
 //>>excludeEnd("ctx");
@@ -1604,9 +1565,7 @@ function $IRInlinedIfTrueIfFalse(){return $globals.IRInlinedIfTrueIfFalse||(type
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=self._inlinedSend_with_with_($recv($IRInlinedIfTrueIfFalse())._new(),anIRInstruction,anotherIRInstruction);
-return $1;
+return self._inlinedSend_with_with_($recv($IRInlinedIfTrueIfFalse())._new(),anIRInstruction,anotherIRInstruction);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"ifTrue:ifFalse:",{anIRInstruction:anIRInstruction,anotherIRInstruction:anotherIRInstruction},$globals.IRSendInliner)});
 //>>excludeEnd("ctx");
@@ -1634,7 +1593,7 @@ function $AliasVar(){return $globals.AliasVar||(typeof AliasVar=="undefined"?nil
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2,$3,$4,$5,$7,$8,$6,$9,$11,$12,$14,$16,$17,$18,$19,$15,$13,$20,$22,$24,$25,$23,$21,$26,$10,$28,$27,$31,$30,$32,$29,$33,$36,$35,$34,$37;
+var $1,$2,$3,$4,$6,$7,$5,$8,$10,$11,$13,$15,$16,$17,$18,$14,$12,$19,$21,$23,$24,$22,$20,$9,$26,$25,$29,$28,$30,$27,$31,$34,$33,$32;
 inlinedClosure=self._inlinedClosure();
 $1=inlinedClosure;
 $2=$1;
@@ -1646,7 +1605,7 @@ $recv($2)._scope_($3);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["scope:"]=1;
 //>>excludeEnd("ctx");
-$4=$recv($1)._parent_($recv(anIRClosure)._parent());
+$recv($1)._parent_($recv(anIRClosure)._parent());
 $recv($recv(anIRClosure)._tempDeclarations())._do_((function(each){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
@@ -1667,85 +1626,84 @@ $recv($recv(anIRClosure)._arguments())._do_((function(each){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
-$5=inlinedClosure;
-$7=$recv($IRTempDeclaration())._new();
+$4=inlinedClosure;
+$6=$recv($IRTempDeclaration())._new();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx2.sendIdx["new"]=1;
 //>>excludeEnd("ctx");
-$recv($7)._name_(each);
+$recv($6)._name_(each);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx2.sendIdx["name:"]=1;
 //>>excludeEnd("ctx");
-$8=$recv($7)._yourself();
+$7=$recv($6)._yourself();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx2.sendIdx["yourself"]=1;
 //>>excludeEnd("ctx");
-$6=$8;
-$recv($5)._add_($6);
+$5=$7;
+$recv($4)._add_($5);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx2.sendIdx["add:"]=2;
 //>>excludeEnd("ctx");
-$9=sequence;
-$11=$recv($IRAssignment())._new();
+$8=sequence;
+$10=$recv($IRAssignment())._new();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx2.sendIdx["new"]=2;
 //>>excludeEnd("ctx");
-$12=$11;
-$14=$recv($IRVariable())._new();
+$11=$10;
+$13=$recv($IRVariable())._new();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx2.sendIdx["new"]=3;
 //>>excludeEnd("ctx");
-$16=$recv($AliasVar())._new();
+$15=$recv($AliasVar())._new();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx2.sendIdx["new"]=4;
 //>>excludeEnd("ctx");
-$17=$16;
-$18=$recv(inlinedClosure)._scope();
+$16=$15;
+$17=$recv(inlinedClosure)._scope();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx2.sendIdx["scope"]=2;
 //>>excludeEnd("ctx");
-$recv($17)._scope_($18);
+$recv($16)._scope_($17);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx2.sendIdx["scope:"]=2;
 //>>excludeEnd("ctx");
-$recv($16)._name_(each);
+$recv($15)._name_(each);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx2.sendIdx["name:"]=2;
 //>>excludeEnd("ctx");
-$19=$recv($16)._yourself();
+$18=$recv($15)._yourself();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx2.sendIdx["yourself"]=2;
 //>>excludeEnd("ctx");
-$15=$19;
-$13=$recv($14)._variable_($15);
+$14=$18;
+$12=$recv($13)._variable_($14);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx2.sendIdx["variable:"]=1;
 //>>excludeEnd("ctx");
-$recv($12)._add_($13);
+$recv($11)._add_($12);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx2.sendIdx["add:"]=4;
 //>>excludeEnd("ctx");
-$20=$11;
-$22=$recv($IRVariable())._new();
+$19=$10;
+$21=$recv($IRVariable())._new();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx2.sendIdx["new"]=5;
 //>>excludeEnd("ctx");
-$24=$recv($AliasVar())._new();
-$recv($24)._scope_($recv(inlinedClosure)._scope());
-$recv($24)._name_("$receiver");
-$25=$recv($24)._yourself();
+$23=$recv($AliasVar())._new();
+$recv($23)._scope_($recv(inlinedClosure)._scope());
+$recv($23)._name_("$receiver");
+$24=$recv($23)._yourself();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx2.sendIdx["yourself"]=3;
 //>>excludeEnd("ctx");
-$23=$25;
-$21=$recv($22)._variable_($23);
-$recv($20)._add_($21);
+$22=$24;
+$20=$recv($21)._variable_($22);
+$recv($19)._add_($20);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx2.sendIdx["add:"]=5;
 //>>excludeEnd("ctx");
-$26=$recv($11)._yourself();
-$10=$26;
-return $recv($9)._add_($10);
+$9=$recv($10)._yourself();
+return $recv($8)._add_($9);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx2.sendIdx["add:"]=3;
 //>>excludeEnd("ctx");
@@ -1760,15 +1718,15 @@ $recv(inlinedClosure)._add_(sequence);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["add:"]=6;
 //>>excludeEnd("ctx");
-$28=$recv(anIRClosure)._instructions();
+$26=$recv(anIRClosure)._instructions();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["instructions"]=2;
 //>>excludeEnd("ctx");
-$27=$recv($28)._last();
+$25=$recv($26)._last();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["last"]=1;
 //>>excludeEnd("ctx");
-statements=$recv($27)._instructions();
+statements=$recv($25)._instructions();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["instructions"]=1;
 //>>excludeEnd("ctx");
@@ -1788,33 +1746,33 @@ $ctx3.sendIdx["add:"]=7;
 }, function($ctx3) {$ctx3.fillBlock({each:each},$ctx2,4)});
 //>>excludeEnd("ctx");
 }));
-$31=$recv(statements)._last();
+$29=$recv(statements)._last();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx2.sendIdx["last"]=2;
 //>>excludeEnd("ctx");
-$30=$recv($31)._isReturn();
-$29=$recv($30)._and_((function(){
+$28=$recv($29)._isReturn();
+$27=$recv($28)._and_((function(){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx3) {
 //>>excludeEnd("ctx");
-$32=$recv(statements)._last();
+$30=$recv(statements)._last();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx3.sendIdx["last"]=3;
 //>>excludeEnd("ctx");
-return $recv($32)._isBlockReturn();
+return $recv($30)._isBlockReturn();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx3) {$ctx3.fillBlock({},$ctx2,5)});
 //>>excludeEnd("ctx");
 }));
-if($core.assert($29)){
-$33=sequence;
-$36=$recv(statements)._last();
+if($core.assert($27)){
+$31=sequence;
+$34=$recv(statements)._last();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx2.sendIdx["last"]=4;
 //>>excludeEnd("ctx");
-$35=$recv($36)._instructions();
-$34=$recv($35)._first();
-return $recv($33)._add_($34);
+$33=$recv($34)._instructions();
+$32=$recv($33)._first();
+return $recv($31)._add_($32);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx2.sendIdx["add:"]=8;
 //>>excludeEnd("ctx");
@@ -1825,8 +1783,7 @@ return $recv(sequence)._add_($recv(statements)._last());
 }, function($ctx2) {$ctx2.fillBlock({},$ctx1,3)});
 //>>excludeEnd("ctx");
 }));
-$37=inlinedClosure;
-return $37;
+return inlinedClosure;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"inlineClosure:",{anIRClosure:anIRClosure,inlinedClosure:inlinedClosure,sequence:sequence,statements:statements},$globals.IRSendInliner)});
 //>>excludeEnd("ctx");
@@ -1849,15 +1806,14 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $3,$2,$1;
+var $2,$1;
 self._send_(anIRSend);
-$3=self._send();
+$2=self._send();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["send"]=1;
 //>>excludeEnd("ctx");
-$2=$recv($3)._selector();
-$1=self._perform_withArguments_($2,$recv($recv(self._send())._instructions())._allButFirst());
-return $1;
+$1=$recv($2)._selector();
+return self._perform_withArguments_($1,$recv($recv(self._send())._instructions())._allButFirst());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"inlineSend:",{anIRSend:anIRSend},$globals.IRSendInliner)});
 //>>excludeEnd("ctx");
@@ -1881,9 +1837,7 @@ function $IRInlinedClosure(){return $globals.IRInlinedClosure||(typeof IRInlined
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($IRInlinedClosure())._new();
-return $1;
+return $recv($IRInlinedClosure())._new();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"inlinedClosure",{},$globals.IRSendInliner)});
 //>>excludeEnd("ctx");
@@ -1907,7 +1861,7 @@ var inlinedClosure;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2,$5,$4,$3,$6,$7;
+var $1,$2,$5,$4,$3,$6;
 $1=$recv(anIRInstruction)._isClosure();
 if(!$core.assert($1)){
 self._inliningError_("Message argument should be a block");
@@ -1930,13 +1884,13 @@ $recv(inlinedSend)._add_($3);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["add:"]=1;
 //>>excludeEnd("ctx");
-$6=$recv(inlinedSend)._add_(inlinedClosure);
+$recv(inlinedSend)._add_(inlinedClosure);
 $recv(self._send())._replaceWith_(inlinedSend);
-$7=$recv($recv(inlinedSend)._method())._internalVariables();
+$6=$recv($recv(inlinedSend)._method())._internalVariables();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["internalVariables"]=1;
 //>>excludeEnd("ctx");
-$recv($7)._addAll_($recv(inlinedSend)._internalVariables());
+$recv($6)._addAll_($recv(inlinedSend)._internalVariables());
 return inlinedSend;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"inlinedSend:with:",{inlinedSend:inlinedSend,anIRInstruction:anIRInstruction,inlinedClosure:inlinedClosure},$globals.IRSendInliner)});
@@ -1961,7 +1915,7 @@ var inlinedClosure1,inlinedClosure2;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2,$3,$4,$7,$6,$5,$8,$9;
+var $1,$2,$3,$4,$7,$6,$5,$8;
 $1=$recv(anIRInstruction)._isClosure();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["isClosure"]=1;
@@ -2003,13 +1957,13 @@ $recv(inlinedSend)._add_(inlinedClosure1);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["add:"]=2;
 //>>excludeEnd("ctx");
-$8=$recv(inlinedSend)._add_(inlinedClosure2);
+$recv(inlinedSend)._add_(inlinedClosure2);
 $recv(self._send())._replaceWith_(inlinedSend);
-$9=$recv($recv(inlinedSend)._method())._internalVariables();
+$8=$recv($recv(inlinedSend)._method())._internalVariables();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["internalVariables"]=1;
 //>>excludeEnd("ctx");
-$recv($9)._addAll_($recv(inlinedSend)._internalVariables());
+$recv($8)._addAll_($recv(inlinedSend)._internalVariables());
 return inlinedSend;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"inlinedSend:with:with:",{inlinedSend:inlinedSend,anIRInstruction:anIRInstruction,anotherIRInstruction:anotherIRInstruction,inlinedClosure1:inlinedClosure1,inlinedClosure2:inlinedClosure2},$globals.IRSendInliner)});
@@ -2034,9 +1988,7 @@ function $IRInlinedSequence(){return $globals.IRInlinedSequence||(typeof IRInlin
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($IRInlinedSequence())._new();
-return $1;
+return $recv($IRInlinedSequence())._new();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"inlinedSequence",{},$globals.IRSendInliner)});
 //>>excludeEnd("ctx");
@@ -2081,9 +2033,7 @@ selector: "send",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@send"];
-return $1;
+return self["@send"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -2120,9 +2070,7 @@ selector: "translator",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@translator"];
-return $1;
+return self["@translator"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -2160,9 +2108,7 @@ selector: "inlinedSelectors",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=["ifTrue:", "ifFalse:", "ifTrue:ifFalse:", "ifFalse:ifTrue:", "ifNil:", "ifNotNil:", "ifNil:ifNotNil:", "ifNotNil:ifNil:"];
-return $1;
+return ["ifTrue:", "ifFalse:", "ifTrue:ifFalse:", "ifFalse:ifTrue:", "ifNil:", "ifNotNil:", "ifNil:ifNotNil:", "ifNotNil:ifNil:"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -2183,12 +2129,12 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2;
+var $1;
 $1=$recv(self._inlinedSelectors())._includes_($recv(anIRInstruction)._selector());
 if(!$core.assert($1)){
 return false;
 };
-$2=$recv($recv($recv(anIRInstruction)._instructions())._allButFirst())._allSatisfy_((function(each){
+return $recv($recv($recv(anIRInstruction)._instructions())._allButFirst())._allSatisfy_((function(each){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
@@ -2197,7 +2143,6 @@ return $recv(each)._isClosure();
 }, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1,2)});
 //>>excludeEnd("ctx");
 }));
-return $2;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"shouldInline:",{anIRInstruction:anIRInstruction},$globals.IRSendInliner.klass)});
 //>>excludeEnd("ctx");
@@ -2222,9 +2167,7 @@ selector: "assignment",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@assignment"];
-return $1;
+return self["@assignment"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -2266,7 +2209,7 @@ function $IRInlinedAssignment(){return $globals.IRInlinedAssignment||(typeof IRI
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2;
+var $1;
 self._assignment_(anIRAssignment);
 inlinedAssignment=$recv($IRInlinedAssignment())._new();
 $1=$recv(anIRAssignment)._instructions();
@@ -2284,8 +2227,7 @@ return $recv(inlinedAssignment)._add_(each);
 }));
 $recv(anIRAssignment)._replaceWith_(inlinedAssignment);
 self._inlineSend_($recv($recv(inlinedAssignment)._instructions())._last());
-$2=inlinedAssignment;
-return $2;
+return inlinedAssignment;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"inlineAssignment:",{anIRAssignment:anIRAssignment,inlinedAssignment:inlinedAssignment},$globals.IRAssignmentInliner)});
 //>>excludeEnd("ctx");
@@ -2310,7 +2252,7 @@ function $IRAssignment(){return $globals.IRAssignment||(typeof IRAssignment=="un
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$4,$3,$5,$7,$8,$6,$9;
+var $2,$1,$4,$3,$5,$7,$6;
 inlinedClosure=(
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.supercall = true, 
@@ -2351,16 +2293,14 @@ $recv($7)._add_($recv($recv(self._assignment())._instructions())._first());
 $ctx2.sendIdx["add:"]=1;
 //>>excludeEnd("ctx");
 $recv($7)._add_($recv($recv(statements)._last())._copy());
-$8=$recv($7)._yourself();
-$6=$8;
+$6=$recv($7)._yourself();
 return $recv($5)._replaceWith_($6);
 };
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)});
 //>>excludeEnd("ctx");
 }));
-$9=inlinedClosure;
-return $9;
+return inlinedClosure;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"inlineClosure:",{anIRClosure:anIRClosure,inlinedClosure:inlinedClosure,statements:statements},$globals.IRAssignmentInliner)});
 //>>excludeEnd("ctx");
@@ -2391,7 +2331,7 @@ function $IRReturn(){return $globals.IRReturn||(typeof IRReturn=="undefined"?nil
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$3,$2,$4,$5,$6,$7;
+var $1,$3,$2,$4,$5;
 closure=(
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.supercall = true, 
@@ -2424,15 +2364,13 @@ $ctx2.sendIdx["last"]=3;
 //>>excludeEnd("ctx");
 $5=$recv($IRReturn())._new();
 $recv($5)._add_($recv($recv(statements)._last())._copy());
-$6=$recv($5)._yourself();
-return $recv($4)._replaceWith_($6);
+return $recv($4)._replaceWith_($recv($5)._yourself());
 };
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)});
 //>>excludeEnd("ctx");
 }));
-$7=closure;
-return $7;
+return closure;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"inlineClosure:",{anIRClosure:anIRClosure,closure:closure,statements:statements},$globals.IRReturnInliner)});
 //>>excludeEnd("ctx");
@@ -2456,7 +2394,7 @@ var return_;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2;
+var $1;
 return_=self._inlinedReturn();
 $1=$recv(anIRReturn)._instructions();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -2473,8 +2411,7 @@ return $recv(return_)._add_(each);
 }));
 $recv(anIRReturn)._replaceWith_(return_);
 self._inlineSend_($recv($recv(return_)._instructions())._last());
-$2=return_;
-return $2;
+return return_;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"inlineReturn:",{anIRReturn:anIRReturn,return_:return_},$globals.IRReturnInliner)});
 //>>excludeEnd("ctx");
@@ -2498,9 +2435,7 @@ function $IRInlinedReturn(){return $globals.IRInlinedReturn||(typeof IRInlinedRe
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($IRInlinedReturn())._new();
-return $1;
+return $recv($IRInlinedReturn())._new();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"inlinedReturn",{},$globals.IRReturnInliner)});
 //>>excludeEnd("ctx");
@@ -2530,7 +2465,7 @@ var ir,stream;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$1;
+var $1;
 $recv(self._semanticAnalyzer())._visit_(aNode);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["visit:"]=1;
@@ -2543,12 +2478,10 @@ $recv(self._inliner())._visit_(ir);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["visit:"]=3;
 //>>excludeEnd("ctx");
-$2=self._irTranslator();
-$recv($2)._currentClass_(self._currentClass());
-$recv($2)._visit_(ir);
-$3=$recv($2)._contents();
-$1=$3;
-return $1;
+$1=self._irTranslator();
+$recv($1)._currentClass_(self._currentClass());
+$recv($1)._visit_(ir);
+return $recv($1)._contents();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"compileNode:",{aNode:aNode,ir:ir,stream:stream},$globals.InliningCodeGenerator)});
 //>>excludeEnd("ctx");
@@ -2572,9 +2505,7 @@ function $IRInliner(){return $globals.IRInliner||(typeof IRInliner=="undefined"?
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($IRInliner())._new();
-return $1;
+return $recv($IRInliner())._new();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"inliner",{},$globals.InliningCodeGenerator)});
 //>>excludeEnd("ctx");
@@ -2598,9 +2529,7 @@ function $IRInliningJSTranslator(){return $globals.IRInliningJSTranslator||(type
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($IRInliningJSTranslator())._new();
-return $1;
+return $recv($IRInliningJSTranslator())._new();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"irTranslator",{},$globals.InliningCodeGenerator)});
 //>>excludeEnd("ctx");

File diff suppressed because it is too large
+ 167 - 258
src/Compiler-Interpreter.js


+ 126 - 201
src/Compiler-Semantic.js

@@ -79,9 +79,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1="$ctx".__comma($recv(self._scopeLevel())._asString());
-return $1;
+return "$ctx".__comma($recv(self._scopeLevel())._asString());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"alias",{},$globals.LexicalScope)});
 //>>excludeEnd("ctx");
@@ -104,13 +102,12 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1;
-$2=$recv(self._args())._keys();
+var $1;
+$1=$recv(self._args())._keys();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["keys"]=1;
 //>>excludeEnd("ctx");
-$1=$recv($2).__comma($recv(self._temps())._keys());
-return $1;
+return $recv($1).__comma($recv(self._temps())._keys());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"allVariableNames",{},$globals.LexicalScope)});
 //>>excludeEnd("ctx");
@@ -134,15 +131,14 @@ function $Dictionary(){return $globals.Dictionary||(typeof Dictionary=="undefine
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$receiver;
-$2=self["@args"];
-if(($receiver = $2) == null || $receiver.isNil){
-self["@args"]=$recv($Dictionary())._new();
+var $1,$receiver;
 $1=self["@args"];
+if(($receiver = $1) == null || $receiver.isNil){
+self["@args"]=$recv($Dictionary())._new();
+return self["@args"];
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"args",{},$globals.LexicalScope)});
 //>>excludeEnd("ctx");
@@ -225,14 +221,13 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$receiver;
-$2=self["@blockIndex"];
-if(($receiver = $2) == null || $receiver.isNil){
-$1=(0);
+var $1,$receiver;
+$1=self["@blockIndex"];
+if(($receiver = $1) == null || $receiver.isNil){
+return (0);
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"blockIndex",{},$globals.LexicalScope)});
 //>>excludeEnd("ctx");
@@ -274,8 +269,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._isInlined())._and_((function(){
+return $recv(self._isInlined())._and_((function(){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
@@ -284,7 +278,6 @@ return $recv(self._outerScope())._canInlineNonLocalReturns();
 }, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)});
 //>>excludeEnd("ctx");
 }));
-return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"canInlineNonLocalReturns",{},$globals.LexicalScope)});
 //>>excludeEnd("ctx");
@@ -304,9 +297,7 @@ selector: "instruction",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@instruction"];
-return $1;
+return self["@instruction"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -346,9 +337,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._isMethodScope())._not();
-return $1;
+return $recv(self._isMethodScope())._not();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"isBlockScope",{},$globals.LexicalScope)});
 //>>excludeEnd("ctx");
@@ -371,13 +360,13 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $3,$2,$1;
-$3=self._instruction();
+var $2,$1;
+$2=self._instruction();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["instruction"]=1;
 //>>excludeEnd("ctx");
-$2=$recv($3)._notNil();
-$1=$recv($2)._and_((function(){
+$1=$recv($2)._notNil();
+return $recv($1)._and_((function(){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
@@ -386,7 +375,6 @@ return $recv(self._instruction())._isInlined();
 }, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)});
 //>>excludeEnd("ctx");
 }));
-return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"isInlined",{},$globals.LexicalScope)});
 //>>excludeEnd("ctx");
@@ -428,7 +416,7 @@ var lookup;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2,$3,$receiver;
+var $1,$2,$receiver;
 lookup=self._bindingFor_(aNode);
 $1=lookup;
 if(($receiver = $1) == null || $receiver.isNil){
@@ -445,8 +433,7 @@ lookup;
 } else {
 $1;
 };
-$3=lookup;
-return $3;
+return lookup;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"lookupVariable:",{aNode:aNode,lookup:lookup},$globals.LexicalScope)});
 //>>excludeEnd("ctx");
@@ -469,17 +456,16 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$receiver;
-$2=self._outerScope();
+var $1,$receiver;
+$1=self._outerScope();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["outerScope"]=1;
 //>>excludeEnd("ctx");
-if(($receiver = $2) == null || $receiver.isNil){
-$1=$2;
+if(($receiver = $1) == null || $receiver.isNil){
+return $1;
 } else {
-$1=$recv(self._outerScope())._methodScope();
+return $recv(self._outerScope())._methodScope();
 };
-return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"methodScope",{},$globals.LexicalScope)});
 //>>excludeEnd("ctx");
@@ -499,9 +485,7 @@ selector: "node",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@node"];
-return $1;
+return self["@node"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -538,9 +522,7 @@ selector: "outerScope",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@outerScope"];
-return $1;
+return self["@outerScope"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -580,9 +562,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._methodScope())._pseudoVars();
-return $1;
+return $recv(self._methodScope())._pseudoVars();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"pseudoVars",{},$globals.LexicalScope)});
 //>>excludeEnd("ctx");
@@ -605,7 +585,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2,$4,$3,$5,$receiver;
+var $1,$2,$4,$3,$receiver;
 $1=self._outerScope();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["outerScope"]=1;
@@ -627,8 +607,7 @@ $ctx1.sendIdx["scopeLevel"]=1;
 //>>excludeEnd("ctx");
 return $3;
 };
-$5=$recv($recv(self._outerScope())._scopeLevel()).__plus((1));
-return $5;
+return $recv($recv(self._outerScope())._scopeLevel()).__plus((1));
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"scopeLevel",{},$globals.LexicalScope)});
 //>>excludeEnd("ctx");
@@ -652,15 +631,14 @@ function $Dictionary(){return $globals.Dictionary||(typeof Dictionary=="undefine
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$receiver;
-$2=self["@temps"];
-if(($receiver = $2) == null || $receiver.isNil){
-self["@temps"]=$recv($Dictionary())._new();
+var $1,$receiver;
 $1=self["@temps"];
+if(($receiver = $1) == null || $receiver.isNil){
+self["@temps"]=$recv($Dictionary())._new();
+return self["@temps"];
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"temps",{},$globals.LexicalScope)});
 //>>excludeEnd("ctx");
@@ -744,8 +722,8 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1;
-$2=(
+var $1;
+$1=(
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.supercall = true, 
 //>>excludeEnd("ctx");
@@ -753,8 +731,7 @@ $globals.MethodLexicalScope.superclass.fn.prototype._allVariableNames.apply($rec
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.supercall = false;
 //>>excludeEnd("ctx");;
-$1=$recv($2).__comma($recv(self._iVars())._keys());
-return $1;
+return $recv($1).__comma($recv(self._iVars())._keys());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"allVariableNames",{},$globals.MethodLexicalScope)});
 //>>excludeEnd("ctx");
@@ -777,8 +754,8 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$receiver;
-$2=(
+var $1,$receiver;
+$1=(
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.supercall = true, 
 //>>excludeEnd("ctx");
@@ -786,15 +763,14 @@ $globals.MethodLexicalScope.superclass.fn.prototype._bindingFor_.apply($recv(sel
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.supercall = false;
 //>>excludeEnd("ctx");;
-if(($receiver = $2) == null || $receiver.isNil){
-$1=$recv(self._iVars())._at_ifAbsent_($recv(aNode)._value(),(function(){
+if(($receiver = $1) == null || $receiver.isNil){
+return $recv(self._iVars())._at_ifAbsent_($recv(aNode)._value(),(function(){
 return nil;
 
 }));
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"bindingFor:",{aNode:aNode},$globals.MethodLexicalScope)});
 //>>excludeEnd("ctx");
@@ -835,9 +811,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=self._localReturn();
-return $1;
+return self._localReturn();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"hasLocalReturn",{},$globals.MethodLexicalScope)});
 //>>excludeEnd("ctx");
@@ -860,9 +834,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._nonLocalReturns())._notEmpty();
-return $1;
+return $recv(self._nonLocalReturns())._notEmpty();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"hasNonLocalReturn",{},$globals.MethodLexicalScope)});
 //>>excludeEnd("ctx");
@@ -886,15 +858,14 @@ function $Dictionary(){return $globals.Dictionary||(typeof Dictionary=="undefine
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$receiver;
-$2=self["@iVars"];
-if(($receiver = $2) == null || $receiver.isNil){
-self["@iVars"]=$recv($Dictionary())._new();
+var $1,$receiver;
 $1=self["@iVars"];
+if(($receiver = $1) == null || $receiver.isNil){
+self["@iVars"]=$recv($Dictionary())._new();
+return self["@iVars"];
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"iVars",{},$globals.MethodLexicalScope)});
 //>>excludeEnd("ctx");
@@ -935,14 +906,13 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$receiver;
-$2=self["@localReturn"];
-if(($receiver = $2) == null || $receiver.isNil){
-$1=false;
+var $1,$receiver;
+$1=self["@localReturn"];
+if(($receiver = $1) == null || $receiver.isNil){
+return false;
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"localReturn",{},$globals.MethodLexicalScope)});
 //>>excludeEnd("ctx");
@@ -1003,15 +973,14 @@ function $OrderedCollection(){return $globals.OrderedCollection||(typeof Ordered
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$receiver;
-$2=self["@nonLocalReturns"];
-if(($receiver = $2) == null || $receiver.isNil){
-self["@nonLocalReturns"]=$recv($OrderedCollection())._new();
+var $1,$receiver;
 $1=self["@nonLocalReturns"];
+if(($receiver = $1) == null || $receiver.isNil){
+self["@nonLocalReturns"]=$recv($OrderedCollection())._new();
+return self["@nonLocalReturns"];
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"nonLocalReturns",{},$globals.MethodLexicalScope)});
 //>>excludeEnd("ctx");
@@ -1037,7 +1006,7 @@ function $PseudoVar(){return $globals.PseudoVar||(typeof PseudoVar=="undefined"?
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2,$3,$4,$receiver;
+var $1,$2,$receiver;
 $1=self["@pseudoVars"];
 if(($receiver = $1) == null || $receiver.isNil){
 self["@pseudoVars"]=$recv($Dictionary())._new();
@@ -1048,8 +1017,7 @@ return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
 $2=$recv($PseudoVar())._on_(each);
 $recv($2)._scope_(self._methodScope());
-$3=$recv($2)._yourself();
-return $recv(self["@pseudoVars"])._at_put_(each,$3);
+return $recv(self["@pseudoVars"])._at_put_(each,$recv($2)._yourself());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1,2)});
 //>>excludeEnd("ctx");
@@ -1057,8 +1025,7 @@ return $recv(self["@pseudoVars"])._at_put_(each,$3);
 } else {
 $1;
 };
-$4=self["@pseudoVars"];
-return $4;
+return self["@pseudoVars"];
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"pseudoVars",{},$globals.MethodLexicalScope)});
 //>>excludeEnd("ctx");
@@ -1108,15 +1075,14 @@ function $OrderedCollection(){return $globals.OrderedCollection||(typeof Ordered
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$receiver;
-$2=self["@unknownVariables"];
-if(($receiver = $2) == null || $receiver.isNil){
-self["@unknownVariables"]=$recv($OrderedCollection())._new();
+var $1,$receiver;
 $1=self["@unknownVariables"];
+if(($receiver = $1) == null || $receiver.isNil){
+self["@unknownVariables"]=$recv($OrderedCollection())._new();
+return self["@unknownVariables"];
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"unknownVariables",{},$globals.MethodLexicalScope)});
 //>>excludeEnd("ctx");
@@ -1145,9 +1111,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._name())._asVariableName();
-return $1;
+return $recv(self._name())._asVariableName();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"alias",{},$globals.ScopeVar)});
 //>>excludeEnd("ctx");
@@ -1293,9 +1257,7 @@ selector: "name",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@name"];
-return $1;
+return self["@name"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -1332,9 +1294,7 @@ selector: "scope",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@scope"];
-return $1;
+return self["@scope"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -1375,7 +1335,7 @@ function $InvalidAssignmentError(){return $globals.InvalidAssignmentError||(type
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2,$3;
+var $1,$2;
 $1=$recv(self._isArgVar())._or_((function(){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
@@ -1388,8 +1348,7 @@ return self._isPseudoVar();
 if($core.assert($1)){
 $2=$recv($InvalidAssignmentError())._new();
 $recv($2)._variableName_(self._name());
-$3=$recv($2)._signal();
-$3;
+$recv($2)._signal();
 };
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -1415,12 +1374,10 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$1;
-$2=self._new();
-$recv($2)._name_(aString);
-$3=$recv($2)._yourself();
-$1=$3;
-return $1;
+var $1;
+$1=self._new();
+$recv($1)._name_(aString);
+return $recv($1)._yourself();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"on:",{aString:aString},$globals.ScopeVar.klass)});
 //>>excludeEnd("ctx");
@@ -1445,9 +1402,7 @@ selector: "node",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@node"];
-return $1;
+return self["@node"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -1657,9 +1612,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=self._name();
-return $1;
+return self._name();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"alias",{},$globals.PseudoVar)});
 //>>excludeEnd("ctx");
@@ -1773,15 +1726,14 @@ function $Set(){return $globals.Set||(typeof Set=="undefined"?nil:Set)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$receiver;
-$2=self["@classReferences"];
-if(($receiver = $2) == null || $receiver.isNil){
-self["@classReferences"]=$recv($Set())._new();
+var $1,$receiver;
 $1=self["@classReferences"];
+if(($receiver = $1) == null || $receiver.isNil){
+self["@classReferences"]=$recv($Set())._new();
+return self["@classReferences"];
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"classReferences",{},$globals.SemanticAnalyzer)});
 //>>excludeEnd("ctx");
@@ -1805,10 +1757,10 @@ function $ShadowingVariableError(){return $globals.ShadowingVariableError||(type
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2;
+var $1;
 $1=$recv($ShadowingVariableError())._new();
 $recv($1)._variableName_(aString);
-$2=$recv($1)._signal();
+$recv($1)._signal();
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"errorShadowingVariable:",{aString:aString},$globals.SemanticAnalyzer)});
@@ -1835,7 +1787,7 @@ function $UnknownVariableError(){return $globals.UnknownVariableError||(typeof U
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2,$3,$4,$5;
+var $1,$2,$3,$4;
 identifier=$recv(aNode)._value();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["value"]=1;
@@ -1857,8 +1809,7 @@ $4=$recv(aNode)._value();
 $ctx1.sendIdx["value"]=2;
 //>>excludeEnd("ctx");
 $recv($3)._variableName_($4);
-$5=$recv($2)._signal();
-$5;
+$recv($2)._signal();
 } else {
 $recv($recv($recv(self["@currentScope"])._methodScope())._unknownVariables())._add_($recv(aNode)._value());
 };
@@ -1886,7 +1837,7 @@ function $Compiler(){return $globals.Compiler||(typeof Compiler=="undefined"?nil
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$3,$4,$2,$receiver;
+var $1,$2,$3,$receiver;
 if(($receiver = aPackage) == null || $receiver.isNil){
 aPackage;
 } else {
@@ -1898,13 +1849,12 @@ if($core.assert($1)){
 return false;
 };
 };
-$3=$recv($Compiler())._new();
-$4=$recv("typeof ".__comma(aString)).__comma(" == \x22undefined\x22");
+$2=$recv($Compiler())._new();
+$3=$recv("typeof ".__comma(aString)).__comma(" == \x22undefined\x22");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx[","]=1;
 //>>excludeEnd("ctx");
-$2=$recv($3)._eval_($4);
-return $2;
+return $recv($2)._eval_($3);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"isVariableUndefined:inPackage:",{aString:aString,aPackage:aPackage},$globals.SemanticAnalyzer)});
 //>>excludeEnd("ctx");
@@ -1928,15 +1878,14 @@ function $Dictionary(){return $globals.Dictionary||(typeof Dictionary=="undefine
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$receiver;
-$2=self["@messageSends"];
-if(($receiver = $2) == null || $receiver.isNil){
-self["@messageSends"]=$recv($Dictionary())._new();
+var $1,$receiver;
 $1=self["@messageSends"];
+if(($receiver = $1) == null || $receiver.isNil){
+self["@messageSends"]=$recv($Dictionary())._new();
+return self["@messageSends"];
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"messageSends",{},$globals.SemanticAnalyzer)});
 //>>excludeEnd("ctx");
@@ -1960,9 +1909,7 @@ function $LexicalScope(){return $globals.LexicalScope||(typeof LexicalScope=="un
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=self._newScopeOfClass_($LexicalScope());
-return $1;
+return self._newScopeOfClass_($LexicalScope());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"newBlockScope",{},$globals.SemanticAnalyzer)});
 //>>excludeEnd("ctx");
@@ -1986,9 +1933,7 @@ function $MethodLexicalScope(){return $globals.MethodLexicalScope||(typeof Metho
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=self._newScopeOfClass_($MethodLexicalScope());
-return $1;
+return self._newScopeOfClass_($MethodLexicalScope());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"newMethodScope",{},$globals.SemanticAnalyzer)});
 //>>excludeEnd("ctx");
@@ -2011,12 +1956,10 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$1;
-$2=$recv(aLexicalScopeClass)._new();
-$recv($2)._outerScope_(self["@currentScope"]);
-$3=$recv($2)._yourself();
-$1=$3;
-return $1;
+var $1;
+$1=$recv(aLexicalScopeClass)._new();
+$recv($1)._outerScope_(self["@currentScope"]);
+return $recv($1)._yourself();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"newScopeOfClass:",{aLexicalScopeClass:aLexicalScopeClass},$globals.SemanticAnalyzer)});
 //>>excludeEnd("ctx");
@@ -2039,7 +1982,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2,$receiver;
+var $1,$receiver;
 $1=self["@blockIndex"];
 if(($receiver = $1) == null || $receiver.isNil){
 self["@blockIndex"]=(0);
@@ -2048,8 +1991,7 @@ self["@blockIndex"];
 $1;
 };
 self["@blockIndex"]=$recv(self["@blockIndex"]).__plus((1));
-$2=self["@blockIndex"];
-return $2;
+return self["@blockIndex"];
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"nextBlockIndex",{},$globals.SemanticAnalyzer)});
 //>>excludeEnd("ctx");
@@ -2129,15 +2071,14 @@ function $Dictionary(){return $globals.Dictionary||(typeof Dictionary=="undefine
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$receiver;
-$2=self["@superSends"];
-if(($receiver = $2) == null || $receiver.isNil){
-self["@superSends"]=$recv($Dictionary())._new();
+var $1,$receiver;
 $1=self["@superSends"];
+if(($receiver = $1) == null || $receiver.isNil){
+self["@superSends"]=$recv($Dictionary())._new();
+return self["@superSends"];
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"superSends",{},$globals.SemanticAnalyzer)});
 //>>excludeEnd("ctx");
@@ -2157,9 +2098,7 @@ selector: "theClass",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@theClass"];
-return $1;
+return self["@theClass"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -2196,9 +2135,7 @@ selector: "thePackage",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@thePackage"];
-return $1;
+return self["@thePackage"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -2395,7 +2332,6 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
 self._pushScope_(self._newMethodScope());
 $recv(aNode)._scope_(self["@currentScope"]);
 $recv(self["@currentScope"])._node_(aNode);
@@ -2431,7 +2367,7 @@ $ctx1.supercall = false;
 //>>excludeEnd("ctx");;
 $recv(aNode)._classReferences_(self._classReferences());
 $recv(aNode)._sendIndexes_(self._messageSends());
-$1=$recv(aNode)._superSends_($recv(self._superSends())._keys());
+$recv(aNode)._superSends_($recv(self._superSends())._keys());
 self._popScope();
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -2672,7 +2608,7 @@ function $UnknownVar(){return $globals.UnknownVar||(typeof UnknownVar=="undefine
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$3,$2,$4,$5,$6,$7,$8,$9,$10,$11,$receiver;
+var $1,$3,$2,$4,$5,$6,$7,$8,$9,$10,$receiver;
 binding=$recv(self["@currentScope"])._lookupVariable_(aNode);
 $1=binding;
 if(($receiver = $1) == null || $receiver.isNil){
@@ -2711,8 +2647,7 @@ $recv($8)._add_($9);
 self._errorUnknownVariable_(aNode);
 $10=$recv($UnknownVar())._new();
 $recv($10)._name_($recv(aNode)._value());
-$11=$recv($10)._yourself();
-binding=$11;
+binding=$recv($10)._yourself();
 binding;
 };
 } else {
@@ -2743,12 +2678,10 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$1;
-$2=self._new();
-$recv($2)._theClass_(aClass);
-$3=$recv($2)._yourself();
-$1=$3;
-return $1;
+var $1;
+$1=self._new();
+$recv($1)._theClass_(aClass);
+return $recv($1)._yourself();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"on:",{aClass:aClass},$globals.SemanticAnalyzer.klass)});
 //>>excludeEnd("ctx");
@@ -2782,9 +2715,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=" Invalid assignment to variable: ".__comma(self._variableName());
-return $1;
+return " Invalid assignment to variable: ".__comma(self._variableName());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"messageText",{},$globals.InvalidAssignmentError)});
 //>>excludeEnd("ctx");
@@ -2804,9 +2735,7 @@ selector: "variableName",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@variableName"];
-return $1;
+return self["@variableName"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -2877,9 +2806,7 @@ selector: "variableName",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@variableName"];
-return $1;
+return self["@variableName"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -2950,9 +2877,7 @@ selector: "variableName",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@variableName"];
-return $1;
+return self["@variableName"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);

+ 71 - 109
src/Compiler-Tests.js

@@ -40,9 +40,7 @@ function $Smalltalk(){return $globals.Smalltalk||(typeof Smalltalk=="undefined"?
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($Smalltalk())._parse_(aString);
-return $1;
+return $recv($Smalltalk())._parse_(aString);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"parse:",{aString:aString},$globals.ASTParsingTest)});
 //>>excludeEnd("ctx");
@@ -65,9 +63,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=self._analyze_forClass_(self._parse_(aString),aClass);
-return $1;
+return self._analyze_forClass_(self._parse_(aString),aClass);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"parse:forClass:",{aString:aString,aClass:aClass},$globals.ASTParsingTest)});
 //>>excludeEnd("ctx");
@@ -95,20 +91,18 @@ function $AIContext(){return $globals.AIContext||(typeof AIContext=="undefined"?
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$4,$5,$1;
-$2=$recv($ASTPCNodeVisitor())._new();
+var $1,$2,$3;
+$1=$recv($ASTPCNodeVisitor())._new();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["new"]=1;
 //>>excludeEnd("ctx");
-$3=$2;
-$4=$recv($recv($AIContext())._new())._yourself();
+$2=$1;
+$3=$recv($recv($AIContext())._new())._yourself();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["yourself"]=1;
 //>>excludeEnd("ctx");
-$recv($3)._context_($4);
-$5=$recv($2)._yourself();
-$1=$5;
-return $1;
+$recv($2)._context_($3);
+return $recv($1)._yourself();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"astPCNodeVisitor",{},$globals.ASTPCNodeVisitorTest)});
 //>>excludeEnd("ctx");
@@ -133,21 +127,19 @@ function $AIContext(){return $globals.AIContext||(typeof AIContext=="undefined"?
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$4,$5,$1;
-$2=$recv($ASTPCNodeVisitor())._new();
+var $1,$2,$3;
+$1=$recv($ASTPCNodeVisitor())._new();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["new"]=1;
 //>>excludeEnd("ctx");
-$recv($2)._selector_(aString);
-$3=$2;
-$4=$recv($recv($AIContext())._new())._yourself();
+$recv($1)._selector_(aString);
+$2=$1;
+$3=$recv($recv($AIContext())._new())._yourself();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["yourself"]=1;
 //>>excludeEnd("ctx");
-$recv($3)._context_($4);
-$5=$recv($2)._yourself();
-$1=$5;
-return $1;
+$recv($2)._context_($3);
+return $recv($1)._yourself();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"astPCNodeVisitorForSelector:",{aString:aString},$globals.ASTPCNodeVisitorTest)});
 //>>excludeEnd("ctx");
@@ -172,12 +164,11 @@ function $Object(){return $globals.Object||(typeof Object=="undefined"?nil:Objec
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2;
+var $1;
 ast=self._parse_forClass_("foo <consolee.log(1)>",$Object());
 $1=self._astPCNodeVisitor();
 $recv($1)._visit_(ast);
-$2=$recv($1)._currentNode();
-self._assert_($recv($2)._isJSStatementNode());
+self._assert_($recv($recv($1)._currentNode())._isJSStatementNode());
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"testJSStatementNode",{ast:ast,visitor:visitor},$globals.ASTPCNodeVisitorTest)});
@@ -203,12 +194,11 @@ function $Object(){return $globals.Object||(typeof Object=="undefined"?nil:Objec
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2;
+var $1;
 ast=self._parse_forClass_("foo self asString yourself. ^ self asBoolean",$Object());
 $1=self._astPCNodeVisitorForSelector_("yourself");
 $recv($1)._visit_(ast);
-$2=$recv($1)._currentNode();
-self._assert_equals_($recv($2)._selector(),"yourself");
+self._assert_equals_($recv($recv($1)._currentNode())._selector(),"yourself");
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"testMessageSend",{ast:ast},$globals.ASTPCNodeVisitorTest)});
@@ -234,12 +224,11 @@ function $Object(){return $globals.Object||(typeof Object=="undefined"?nil:Objec
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2;
+var $1;
 ast=self._parse_forClass_("foo true ifTrue: [ [ self asString yourself ] value.  ]. ^ self asBoolean",$Object());
 $1=self._astPCNodeVisitorForSelector_("yourself");
 $recv($1)._visit_(ast);
-$2=$recv($1)._currentNode();
-self._assert_equals_($recv($2)._selector(),"yourself");
+self._assert_equals_($recv($recv($1)._currentNode())._selector(),"yourself");
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"testMessageSendWithBlocks",{ast:ast},$globals.ASTPCNodeVisitorTest)});
@@ -265,7 +254,7 @@ function $Object(){return $globals.Object||(typeof Object=="undefined"?nil:Objec
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $3,$4,$2,$1,$5,$6;
+var $3,$4,$2,$1,$5;
 ast=self._parse_forClass_("foo true ifTrue: [ self asString yourself ]. ^ self asBoolean",$Object());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["parse:forClass:"]=1;
@@ -294,8 +283,7 @@ $ctx1.sendIdx["assert:equals:"]=1;
 ast=self._parse_forClass_("foo true ifTrue: [ self asString yourself ]. ^ self asBoolean",$Object());
 $5=self._astPCNodeVisitorForSelector_("asBoolean");
 $recv($5)._visit_(ast);
-$6=$recv($5)._currentNode();
-self._assert_equals_($recv($6)._selector(),"asBoolean");
+self._assert_equals_($recv($recv($5)._currentNode())._selector(),"asBoolean");
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"testMessageSendWithInlining",{ast:ast},$globals.ASTPCNodeVisitorTest)});
@@ -321,12 +309,11 @@ function $Object(){return $globals.Object||(typeof Object=="undefined"?nil:Objec
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2;
+var $1;
 ast=self._parse_forClass_("foo ^ self",$Object());
 $1=self._astPCNodeVisitor();
 $recv($1)._visit_(ast);
-$2=$recv($1)._currentNode();
-self._assert_($recv($2)._isNil());
+self._assert_($recv($recv($1)._currentNode())._isNil());
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"testNoMessageSend",{ast:ast},$globals.ASTPCNodeVisitorTest)});
@@ -352,12 +339,11 @@ function $Object(){return $globals.Object||(typeof Object=="undefined"?nil:Objec
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2;
+var $1;
 ast=self._parse_forClass_("foo <console.log(1)>",$Object());
 $1=self._astPCNodeVisitor();
 $recv($1)._visit_(ast);
-$2=$recv($1)._currentNode();
-self._assert_($recv($2)._isJSStatementNode());
+self._assert_($recv($recv($1)._currentNode())._isJSStatementNode());
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"testPC",{ast:ast,visitor:visitor},$globals.ASTPCNodeVisitorTest)});
@@ -482,12 +468,10 @@ function $Compiler(){return $globals.Compiler||(typeof Compiler=="undefined"?nil
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$1;
-$2=$recv($Compiler())._new();
-$recv($2)._codeGeneratorClass_(self._codeGeneratorClass());
-$3=$recv($2)._yourself();
-$1=$3;
-return $1;
+var $1;
+$1=$recv($Compiler())._new();
+$recv($1)._codeGeneratorClass_(self._codeGeneratorClass());
+return $recv($1)._yourself();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"compiler",{},$globals.CodeGeneratorTest)});
 //>>excludeEnd("ctx");
@@ -570,9 +554,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=self._should_receiver_return_(aString,self["@receiver"],anObject);
-return $1;
+return self._should_receiver_return_(aString,self["@receiver"],anObject);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"should:return:",{aString:aString,anObject:anObject},$globals.CodeGeneratorTest)});
 //>>excludeEnd("ctx");
@@ -1761,7 +1743,7 @@ function $AIContext(){return $globals.AIContext||(typeof AIContext=="undefined"?
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2,$3,$5,$6,$4,$receiver;
+var $1,$2,$3,$receiver;
 interpreter=$recv($ASTInterpreter())._new();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["new"]=1;
@@ -1770,11 +1752,10 @@ ast=self._parse_forClass_(aString,$recv(anObject)._class());
 $1=$recv($AIContext())._new();
 $recv($1)._receiver_(anObject);
 $recv($1)._interpreter_(interpreter);
-$2=$recv($1)._yourself();
-ctx=$2;
-$3=$recv(ast)._sequenceNode();
-if(($receiver = $3) == null || $receiver.isNil){
-$3;
+ctx=$recv($1)._yourself();
+$2=$recv(ast)._sequenceNode();
+if(($receiver = $2) == null || $receiver.isNil){
+$2;
 } else {
 var sequence;
 sequence=$receiver;
@@ -1797,13 +1778,11 @@ return $recv(ctx)._localAt_put_(key,value);
 }, function($ctx2) {$ctx2.fillBlock({key:key,value:value},$ctx1,3)});
 //>>excludeEnd("ctx");
 }));
-$5=interpreter;
-$recv($5)._context_(ctx);
-$recv($5)._interpret_($recv(ast)._nextChild());
-$recv($5)._proceed();
-$6=$recv($5)._result();
-$4=$6;
-return $4;
+$3=interpreter;
+$recv($3)._context_(ctx);
+$recv($3)._interpret_($recv(ast)._nextChild());
+$recv($3)._proceed();
+return $recv($3)._result();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"interpret:receiver:withArguments:",{aString:aString,anObject:anObject,aDictionary:aDictionary,ctx:ctx,ast:ast,interpreter:interpreter},$globals.ASTInterpreterTest)});
 //>>excludeEnd("ctx");
@@ -1827,9 +1806,7 @@ function $Smalltalk(){return $globals.Smalltalk||(typeof Smalltalk=="undefined"?
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($Smalltalk())._parse_(aString);
-return $1;
+return $recv($Smalltalk())._parse_(aString);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"parse:",{aString:aString},$globals.ASTInterpreterTest)});
 //>>excludeEnd("ctx");
@@ -1852,9 +1829,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=self._analyze_forClass_(self._parse_(aString),aClass);
-return $1;
+return self._analyze_forClass_(self._parse_(aString),aClass);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"parse:forClass:",{aString:aString,aClass:aClass},$globals.ASTInterpreterTest)});
 //>>excludeEnd("ctx");
@@ -1877,10 +1852,8 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
 self["@receiver"]=anObject;
-$1=self._assert_equals_(self._interpret_receiver_withArguments_(aString,self["@receiver"],$globals.HashedCollection._newFromPairs_([])),aResult);
-return $1;
+return self._assert_equals_(self._interpret_receiver_withArguments_(aString,self["@receiver"],$globals.HashedCollection._newFromPairs_([])),aResult);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"should:receiver:return:",{aString:aString,anObject:anObject,aResult:aResult},$globals.ASTInterpreterTest)});
 //>>excludeEnd("ctx");
@@ -1903,9 +1876,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=self._should_receiver_return_(aString,self["@receiver"],anObject);
-return $1;
+return self._should_receiver_return_(aString,self["@receiver"],anObject);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"should:return:",{aString:aString,anObject:anObject},$globals.ASTInterpreterTest)});
 //>>excludeEnd("ctx");
@@ -1935,19 +1906,18 @@ function $ASTDebugger(){return $globals.ASTDebugger||(typeof ASTDebugger=="undef
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2,$3,$4,$6,$7,$5,$receiver;
+var $1,$2,$3,$4,$receiver;
 $1=$recv($AIContext())._new();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["new"]=1;
 //>>excludeEnd("ctx");
 $recv($1)._receiver_(anObject);
 $recv($1)._interpreter_($recv($ASTInterpreter())._new());
-$2=$recv($1)._yourself();
-ctx=$2;
+ctx=$recv($1)._yourself();
 ast=self._parse_forClass_(aString,$recv(anObject)._class());
-$3=$recv(ast)._sequenceNode();
-if(($receiver = $3) == null || $receiver.isNil){
-$3;
+$2=$recv(ast)._sequenceNode();
+if(($receiver = $2) == null || $receiver.isNil){
+$2;
 } else {
 var sequence;
 sequence=$receiver;
@@ -1970,21 +1940,19 @@ return $recv(ctx)._localAt_put_(key,value);
 }, function($ctx2) {$ctx2.fillBlock({key:key,value:value},$ctx1,3)});
 //>>excludeEnd("ctx");
 }));
-$4=$recv(ctx)._interpreter();
+$3=$recv(ctx)._interpreter();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["interpreter"]=1;
 //>>excludeEnd("ctx");
-$recv($4)._context_(ctx);
+$recv($3)._context_(ctx);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["context:"]=1;
 //>>excludeEnd("ctx");
 $recv($recv(ctx)._interpreter())._node_($recv(ast)._nextChild());
 debugger_=$recv($ASTDebugger())._context_(ctx);
-$6=debugger_;
-$recv($6)._proceed();
-$7=$recv($6)._result();
-$5=$7;
-return $5;
+$4=debugger_;
+$recv($4)._proceed();
+return $recv($4)._result();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"interpret:receiver:withArguments:",{aString:aString,anObject:anObject,aDictionary:aDictionary,ctx:ctx,ast:ast,debugger_:debugger_},$globals.ASTDebuggerTest)});
 //>>excludeEnd("ctx");
@@ -2036,20 +2004,19 @@ function $MethodLexicalScope(){return $globals.MethodLexicalScope||(typeof Metho
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2,$3,$4;
+var $1,$2;
 $1=$recv($VariableNode())._new();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["new"]=1;
 //>>excludeEnd("ctx");
 $recv($1)._value_("Object");
-$2=$recv($1)._yourself();
-node=$2;
-$3=$recv($SemanticAnalyzer())._new();
+node=$recv($1)._yourself();
+$2=$recv($SemanticAnalyzer())._new();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["new"]=2;
 //>>excludeEnd("ctx");
-$recv($3)._pushScope_($recv($MethodLexicalScope())._new());
-$4=$recv($3)._visit_(node);
+$recv($2)._pushScope_($recv($MethodLexicalScope())._new());
+$recv($2)._visit_(node);
 self._assert_($recv($recv(node)._binding())._isClassRefVar());
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -2077,14 +2044,13 @@ function $MethodLexicalScope(){return $globals.MethodLexicalScope||(typeof Metho
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2;
+var $1;
 $1=$recv($VariableNode())._new();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["new"]=1;
 //>>excludeEnd("ctx");
 $recv($1)._value_("bzzz");
-$2=$recv($1)._yourself();
-node=$2;
+node=$recv($1)._yourself();
 scope=$recv($MethodLexicalScope())._new();
 $recv(scope)._addIVar_("bzzz");
 self._assert_($recv($recv(scope)._bindingFor_(node))._isInstanceVar());
@@ -2114,7 +2080,7 @@ function $MethodLexicalScope(){return $globals.MethodLexicalScope||(typeof Metho
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2;
+var $1;
 pseudoVars=["self", "super", "true", "false", "nil"];
 $recv(pseudoVars)._do_((function(each){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -2125,8 +2091,7 @@ $1=$recv($VariableNode())._new();
 $ctx2.sendIdx["new"]=1;
 //>>excludeEnd("ctx");
 $recv($1)._value_(each);
-$2=$recv($1)._yourself();
-node=$2;
+node=$recv($1)._yourself();
 node;
 return self._assert_($recv($recv($recv($MethodLexicalScope())._new())._bindingFor_(node))._isPseudoVar());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -2159,14 +2124,13 @@ function $MethodLexicalScope(){return $globals.MethodLexicalScope||(typeof Metho
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2;
+var $1;
 $1=$recv($VariableNode())._new();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["new"]=1;
 //>>excludeEnd("ctx");
 $recv($1)._value_("bzzz");
-$2=$recv($1)._yourself();
-node=$2;
+node=$recv($1)._yourself();
 scope=$recv($MethodLexicalScope())._new();
 $recv(scope)._addTemp_("bzzz");
 self._assert_($recv($recv(scope)._bindingFor_(node))._isTempVar());
@@ -2196,14 +2160,13 @@ function $MethodLexicalScope(){return $globals.MethodLexicalScope||(typeof Metho
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2;
+var $1;
 $1=$recv($VariableNode())._new();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["new"]=1;
 //>>excludeEnd("ctx");
 $recv($1)._value_("bzzz");
-$2=$recv($1)._yourself();
-node=$2;
+node=$recv($1)._yourself();
 self._assert_($recv($recv($recv($MethodLexicalScope())._new())._bindingFor_(node))._isNil());
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -2940,7 +2903,7 @@ function $AIContext(){return $globals.AIContext||(typeof AIContext=="undefined"?
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2,$4,$5,$3,$6;
+var $1,$2,$4,$5,$3;
 $1=$recv($AISemanticAnalyzer())._on_($Object());
 $2=$1;
 $4=$recv($AIContext())._new();
@@ -2952,8 +2915,7 @@ $ctx1.sendIdx["yourself"]=1;
 //>>excludeEnd("ctx");
 $3=$5;
 $recv($2)._context_($3);
-$6=$recv($1)._yourself();
-self["@analyzer"]=$6;
+self["@analyzer"]=$recv($1)._yourself();
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"setUp",{},$globals.AISemanticAnalyzerTest)});

+ 38 - 76
src/Kernel-Announcements.js

@@ -14,9 +14,7 @@ selector: "announcementClass",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@announcementClass"];
-return $1;
+return self["@announcementClass"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -85,27 +83,26 @@ function $Smalltalk(){return $globals.Smalltalk||(typeof Smalltalk=="undefined"?
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $3,$4,$2,$1,$receiver;
-$3=$recv($Smalltalk())._globals();
+var $2,$3,$1,$receiver;
+$2=$recv($Smalltalk())._globals();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["globals"]=1;
 //>>excludeEnd("ctx");
-$4=$recv(self._announcementClass())._name();
+$3=$recv(self._announcementClass())._name();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["name"]=1;
 //>>excludeEnd("ctx");
-$2=$recv($3)._at_($4);
+$1=$recv($2)._at_($3);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["at:"]=1;
 //>>excludeEnd("ctx");
-if(($receiver = $2) == null || $receiver.isNil){
+if(($receiver = $1) == null || $receiver.isNil){
 return false;
 } else {
 var class_;
 class_=$receiver;
-$1=$recv($recv($recv($Smalltalk())._globals())._at_($recv($recv($recv(anAnnouncement)._class())._theNonMetaClass())._name()))._includesBehavior_(class_);
+return $recv($recv($recv($Smalltalk())._globals())._at_($recv($recv($recv(anAnnouncement)._class())._theNonMetaClass())._name()))._includesBehavior_(class_);
 };
-return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"handlesAnnouncement:",{anAnnouncement:anAnnouncement},$globals.AnnouncementSubscription)});
 //>>excludeEnd("ctx");
@@ -128,9 +125,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._valuable())._receiver();
-return $1;
+return $recv(self._valuable())._receiver();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"receiver",{},$globals.AnnouncementSubscription)});
 //>>excludeEnd("ctx");
@@ -150,9 +145,7 @@ selector: "valuable",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@valuable"];
-return $1;
+return self["@valuable"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -195,9 +188,7 @@ selector: "receiver",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@receiver"];
-return $1;
+return self["@receiver"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -234,9 +225,7 @@ selector: "valuable",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@valuable"];
-return $1;
+return self["@valuable"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -276,9 +265,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._valuable())._value();
-return $1;
+return $recv(self._valuable())._value();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"value",{},$globals.AnnouncementValuable)});
 //>>excludeEnd("ctx");
@@ -301,9 +288,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._valuable())._value_(anObject);
-return $1;
+return $recv(self._valuable())._value_(anObject);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"value:",{anObject:anObject},$globals.AnnouncementValuable)});
 //>>excludeEnd("ctx");
@@ -423,7 +408,7 @@ function $AnnouncementValuable(){return $globals.AnnouncementValuable||(typeof A
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$3,$4,$6,$7,$5,$8,$2;
+var $1,$3,$4,$6,$7,$5,$2;
 $1=self["@subscriptions"];
 $3=$recv($AnnouncementSubscription())._new();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -443,8 +428,7 @@ $recv($4)._valuable_($5);
 $ctx1.sendIdx["valuable:"]=1;
 //>>excludeEnd("ctx");
 $recv($3)._announcementClass_(aClass);
-$8=$recv($3)._yourself();
-$2=$8;
+$2=$recv($3)._yourself();
 $recv($1)._add_($2);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -471,11 +455,10 @@ function $AnnouncementSubscription(){return $globals.AnnouncementSubscription||(
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2;
+var $1;
 $1=$recv($AnnouncementSubscription())._new();
 $recv($1)._announcementClass_(aClass);
-$2=$recv($1)._yourself();
-subscription=$2;
+subscription=$recv($1)._yourself();
 $recv(subscription)._valuable_((function(ann){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
@@ -512,7 +495,7 @@ function $MessageSend(){return $globals.MessageSend||(typeof MessageSend=="undef
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$3,$4,$6,$7,$5,$8,$2;
+var $1,$3,$4,$6,$7,$5,$2;
 $1=self["@subscriptions"];
 $3=$recv($AnnouncementSubscription())._new();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -529,8 +512,7 @@ $ctx1.sendIdx["yourself"]=1;
 $5=$7;
 $recv($4)._valuable_($5);
 $recv($3)._announcementClass_(aClass);
-$8=$recv($3)._yourself();
-$2=$8;
+$2=$recv($3)._yourself();
 $recv($1)._add_($2);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -595,9 +577,9 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$receiver;
-$2=self["@current"];
-if(($receiver = $2) == null || $receiver.isNil){
+var $1,$receiver;
+$1=self["@current"];
+if(($receiver = $1) == null || $receiver.isNil){
 self["@current"]=(
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.supercall = true, 
@@ -606,11 +588,10 @@ $globals.SystemAnnouncer.klass.superclass.fn.prototype._new.apply($recv(self), [
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.supercall = false;
 //>>excludeEnd("ctx");;
-$1=self["@current"];
+return self["@current"];
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"current",{},$globals.SystemAnnouncer.klass)});
 //>>excludeEnd("ctx");
@@ -683,9 +664,7 @@ selector: "theClass",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@theClass"];
-return $1;
+return self["@theClass"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -746,9 +725,7 @@ selector: "oldClass",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@oldClass"];
-return $1;
+return self["@oldClass"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -791,9 +768,7 @@ selector: "oldPackage",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@oldPackage"];
-return $1;
+return self["@oldPackage"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -848,9 +823,7 @@ selector: "method",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@method"];
-return $1;
+return self["@method"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -899,9 +872,7 @@ selector: "oldMethod",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@oldMethod"];
-return $1;
+return self["@oldMethod"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -944,9 +915,7 @@ selector: "oldProtocol",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@oldProtocol"];
-return $1;
+return self["@oldProtocol"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -995,9 +964,7 @@ selector: "package",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@package"];
-return $1;
+return self["@package"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -1067,16 +1034,15 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$receiver;
-$2=self._theClass();
-if(($receiver = $2) == null || $receiver.isNil){
-$1=$2;
+var $1,$receiver;
+$1=self._theClass();
+if(($receiver = $1) == null || $receiver.isNil){
+return $1;
 } else {
 var class_;
 class_=$receiver;
-$1=$recv(class_)._packageOfProtocol_(self._protocol());
+return $recv(class_)._packageOfProtocol_(self._protocol());
 };
-return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"package",{},$globals.ProtocolAnnouncement)});
 //>>excludeEnd("ctx");
@@ -1096,9 +1062,7 @@ selector: "protocol",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@protocol"];
-return $1;
+return self["@protocol"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -1135,9 +1099,7 @@ selector: "theClass",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@theClass"];
-return $1;
+return self["@theClass"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);

File diff suppressed because it is too large
+ 128 - 215
src/Kernel-Classes.js


File diff suppressed because it is too large
+ 114 - 225
src/Kernel-Collections.js


+ 29 - 51
src/Kernel-Exceptions.js

@@ -158,9 +158,7 @@ selector: "messageText",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@messageText"];
-return $1;
+return self["@messageText"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -281,9 +279,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=self._signalerContextFrom_(self._context());
-return $1;
+return self._signalerContextFrom_(self._context());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"signalerContext",{},$globals.Error)});
 //>>excludeEnd("ctx");
@@ -306,20 +302,20 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $4,$3,$2,$1;
-$1=$recv(aContext)._findContextSuchThat_((function(context){
+var $3,$2,$1;
+return $recv(aContext)._findContextSuchThat_((function(context){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
-$4=$recv(context)._receiver();
+$3=$recv(context)._receiver();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx2.sendIdx["receiver"]=1;
 //>>excludeEnd("ctx");
-$3=$recv($4).__eq_eq(self);
+$2=$recv($3).__eq_eq(self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx2.sendIdx["=="]=1;
 //>>excludeEnd("ctx");
-$2=$recv($3)._or_((function(){
+$1=$recv($2)._or_((function(){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx3) {
 //>>excludeEnd("ctx");
@@ -328,12 +324,11 @@ return $recv($recv(context)._receiver()).__eq_eq(self._class());
 }, function($ctx3) {$ctx3.fillBlock({},$ctx2,2)});
 //>>excludeEnd("ctx");
 }));
-return $recv($2)._not();
+return $recv($1)._not();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx2) {$ctx2.fillBlock({context:context},$ctx1,1)});
 //>>excludeEnd("ctx");
 }));
-return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"signalerContextFrom:",{aContext:aContext},$globals.Error)});
 //>>excludeEnd("ctx");
@@ -399,9 +394,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._new())._signal();
-return $1;
+return $recv(self._new())._signal();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"signal",{},$globals.Error.klass)});
 //>>excludeEnd("ctx");
@@ -424,9 +417,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._new())._signal_(aString);
-return $1;
+return $recv(self._new())._signal_(aString);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"signal:",{aString:aString},$globals.Error.klass)});
 //>>excludeEnd("ctx");
@@ -472,20 +463,20 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $4,$3,$2,$1;
-$1=$recv(aContext)._findContextSuchThat_((function(context){
+var $3,$2,$1;
+return $recv(aContext)._findContextSuchThat_((function(context){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
-$4=$recv(context)._receiver();
+$3=$recv(context)._receiver();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx2.sendIdx["receiver"]=1;
 //>>excludeEnd("ctx");
-$3=$recv($4).__eq_eq(self);
+$2=$recv($3).__eq_eq(self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx2.sendIdx["=="]=1;
 //>>excludeEnd("ctx");
-$2=$recv($3)._or_((function(){
+$1=$recv($2)._or_((function(){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx3) {
 //>>excludeEnd("ctx");
@@ -505,12 +496,11 @@ return $recv($recv($recv(context)._method())._selector()).__eq("halt");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx2.sendIdx["or:"]=1;
 //>>excludeEnd("ctx");
-return $recv($2)._not();
+return $recv($1)._not();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx2) {$ctx2.fillBlock({context:context},$ctx1,1)});
 //>>excludeEnd("ctx");
 }));
-return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"signalerContextFrom:",{aContext:aContext},$globals.Halt)});
 //>>excludeEnd("ctx");
@@ -560,9 +550,7 @@ selector: "exception",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@exception"];
-return $1;
+return self["@exception"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -627,12 +615,10 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$1;
-$2=self._new();
-$recv($2)._exception_(anException);
-$3=$recv($2)._yourself();
-$1=$3;
-return $1;
+var $1;
+$1=self._new();
+$recv($1)._exception_(anException);
+return $recv($1)._yourself();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"on:",{anException:anException},$globals.JavaScriptException.klass)});
 //>>excludeEnd("ctx");
@@ -655,13 +641,11 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$1;
-$2=self._new();
-$recv($2)._exception_(anException);
-$recv($2)._context_(aMethodContext);
-$3=$recv($2)._yourself();
-$1=$3;
-return $1;
+var $1;
+$1=self._new();
+$recv($1)._exception_(anException);
+$recv($1)._context_(aMethodContext);
+return $recv($1)._yourself();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"on:context:",{anException:anException,aMethodContext:aMethodContext},$globals.JavaScriptException.klass)});
 //>>excludeEnd("ctx");
@@ -686,9 +670,7 @@ selector: "message",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@message"];
-return $1;
+return self["@message"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -753,9 +735,7 @@ selector: "receiver",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@receiver"];
-return $1;
+return self["@receiver"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -798,9 +778,7 @@ selector: "object",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@object"];
-return $1;
+return self["@object"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);

File diff suppressed because it is too large
+ 145 - 219
src/Kernel-Infrastructure.js


+ 105 - 175
src/Kernel-Methods.js

@@ -192,9 +192,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=self._newWithValues_([anObject]);
-return $1;
+return self._newWithValues_([anObject]);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"newValue:",{anObject:anObject},$globals.BlockClosure)});
 //>>excludeEnd("ctx");
@@ -217,9 +215,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=self._newWithValues_([anObject,anObject2]);
-return $1;
+return self._newWithValues_([anObject,anObject2]);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"newValue:value:",{anObject:anObject,anObject2:anObject2},$globals.BlockClosure)});
 //>>excludeEnd("ctx");
@@ -242,9 +238,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=self._newWithValues_([anObject,anObject2,anObject3]);
-return $1;
+return self._newWithValues_([anObject,anObject2,anObject3]);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"newValue:value:value:",{anObject:anObject,anObject2:anObject2,anObject3:anObject3},$globals.BlockClosure)});
 //>>excludeEnd("ctx");
@@ -320,16 +314,16 @@ function $Smalltalk(){return $globals.Smalltalk||(typeof Smalltalk=="undefined"?
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1;
-$1=self._tryCatch_((function(error){
+var $1;
+return self._tryCatch_((function(error){
 var smalltalkError;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
 smalltalkError=$recv($Smalltalk())._asSmalltalkException_(error);
 smalltalkError;
-$2=$recv(smalltalkError)._isKindOf_(anErrorClass);
-if($core.assert($2)){
+$1=$recv(smalltalkError)._isKindOf_(anErrorClass);
+if($core.assert($1)){
 return $recv(aBlock)._value_(smalltalkError);
 } else {
 return $recv(smalltalkError)._resignal();
@@ -338,7 +332,6 @@ return $recv(smalltalkError)._resignal();
 }, function($ctx2) {$ctx2.fillBlock({error:error,smalltalkError:smalltalkError},$ctx1,1)});
 //>>excludeEnd("ctx");
 }));
-return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"on:do:",{anErrorClass:anErrorClass,aBlock:aBlock},$globals.BlockClosure)});
 //>>excludeEnd("ctx");
@@ -380,9 +373,7 @@ function $Date(){return $globals.Date||(typeof Date=="undefined"?nil:Date)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($Date())._millisecondsToRun_(self);
-return $1;
+return $recv($Date())._millisecondsToRun_(self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"timeToRun",{},$globals.BlockClosure)});
 //>>excludeEnd("ctx");
@@ -766,9 +757,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=self._protocol();
-return $1;
+return self._protocol();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"category",{},$globals.CompiledMethod)});
 //>>excludeEnd("ctx");
@@ -809,9 +798,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=self._basicAt_("fn");
-return $1;
+return self._basicAt_("fn");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"fn",{},$globals.CompiledMethod)});
 //>>excludeEnd("ctx");
@@ -919,7 +906,7 @@ var superclass;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2,$3,$receiver;
+var $1,$2,$receiver;
 $1=self._methodClass();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["methodClass"]=1;
@@ -934,8 +921,7 @@ return false;
 } else {
 $2;
 };
-$3=$recv($recv($recv(self._methodClass())._superclass())._lookupSelector_(self._selector()))._notNil();
-return $3;
+return $recv($recv($recv(self._methodClass())._superclass())._lookupSelector_(self._selector()))._notNil();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"isOverride",{superclass:superclass},$globals.CompiledMethod)});
 //>>excludeEnd("ctx");
@@ -958,9 +944,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=self._basicAt_("messageSends");
-return $1;
+return self._basicAt_("messageSends");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"messageSends",{},$globals.CompiledMethod)});
 //>>excludeEnd("ctx");
@@ -983,9 +967,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=self._basicAt_("methodClass");
-return $1;
+return self._basicAt_("methodClass");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"methodClass",{},$globals.CompiledMethod)});
 //>>excludeEnd("ctx");
@@ -1008,16 +990,15 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$receiver;
-$2=self._methodClass();
-if(($receiver = $2) == null || $receiver.isNil){
-$1=$2;
+var $1,$receiver;
+$1=self._methodClass();
+if(($receiver = $1) == null || $receiver.isNil){
+return $1;
 } else {
 var class_;
 class_=$receiver;
-$1=$recv(class_)._packageOfProtocol_(self._protocol());
+return $recv(class_)._packageOfProtocol_(self._protocol());
 };
-return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"package",{},$globals.CompiledMethod)});
 //>>excludeEnd("ctx");
@@ -1040,14 +1021,13 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$receiver;
-$2=self._basicAt_("protocol");
-if(($receiver = $2) == null || $receiver.isNil){
-$1=self._defaultProtocol();
+var $1,$receiver;
+$1=self._basicAt_("protocol");
+if(($receiver = $1) == null || $receiver.isNil){
+return self._defaultProtocol();
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"protocol",{},$globals.CompiledMethod)});
 //>>excludeEnd("ctx");
@@ -1073,17 +1053,16 @@ function $MethodMoved(){return $globals.MethodMoved||(typeof MethodMoved=="undef
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2,$3,$receiver;
+var $1,$2,$receiver;
 oldProtocol=self._protocol();
 self._basicAt_put_("protocol",aString);
 $1=$recv($MethodMoved())._new();
 $recv($1)._method_(self);
 $recv($1)._oldProtocol_(oldProtocol);
-$2=$recv($1)._yourself();
-$recv($recv($SystemAnnouncer())._current())._announce_($2);
-$3=self._methodClass();
-if(($receiver = $3) == null || $receiver.isNil){
-$3;
+$recv($recv($SystemAnnouncer())._current())._announce_($recv($1)._yourself());
+$2=self._methodClass();
+if(($receiver = $2) == null || $receiver.isNil){
+$2;
 } else {
 var methodClass;
 methodClass=$receiver;
@@ -1113,9 +1092,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=self._basicAt_("referencedClasses");
-return $1;
+return self._basicAt_("referencedClasses");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"referencedClasses",{},$globals.CompiledMethod)});
 //>>excludeEnd("ctx");
@@ -1138,9 +1115,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=self._basicAt_("selector");
-return $1;
+return self._basicAt_("selector");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"selector",{},$globals.CompiledMethod)});
 //>>excludeEnd("ctx");
@@ -1187,9 +1162,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._fn())._applyTo_arguments_(anObject,aCollection);
-return $1;
+return $recv(self._fn())._applyTo_arguments_(anObject,aCollection);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"sendTo:arguments:",{anObject:anObject,aCollection:aCollection},$globals.CompiledMethod)});
 //>>excludeEnd("ctx");
@@ -1212,14 +1185,13 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$receiver;
-$2=self._basicAt_("source");
-if(($receiver = $2) == null || $receiver.isNil){
-$1="";
+var $1,$receiver;
+$1=self._basicAt_("source");
+if(($receiver = $1) == null || $receiver.isNil){
+return "";
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"source",{},$globals.CompiledMethod)});
 //>>excludeEnd("ctx");
@@ -1297,9 +1269,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._class())._defaultMaxPoolSize();
-return $1;
+return $recv(self._class())._defaultMaxPoolSize();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"defaultMaxPoolSize",{},$globals.ForkPool)});
 //>>excludeEnd("ctx");
@@ -1388,9 +1358,9 @@ function $Object(){return $globals.Object||(typeof Object=="undefined"?nil:Objec
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1;
+var $1;
 sentinel=$recv($Object())._new();
-$1=(function(){
+return (function(){
 var block;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
@@ -1402,8 +1372,8 @@ return sentinel;
 
 }));
 block;
-$2=$recv(block).__eq_eq(sentinel);
-if(!$core.assert($2)){
+$1=$recv(block).__eq_eq(sentinel);
+if(!$core.assert($1)){
 return $recv((function(){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx3) {
@@ -1426,7 +1396,6 @@ return self._addWorker();
 }, function($ctx2) {$ctx2.fillBlock({block:block},$ctx1,1)});
 //>>excludeEnd("ctx");
 });
-return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"makeWorker",{sentinel:sentinel},$globals.ForkPool)});
 //>>excludeEnd("ctx");
@@ -1449,14 +1418,13 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$receiver;
-$2=self["@maxPoolSize"];
-if(($receiver = $2) == null || $receiver.isNil){
-$1=self._defaultMaxPoolSize();
+var $1,$receiver;
+$1=self["@maxPoolSize"];
+if(($receiver = $1) == null || $receiver.isNil){
+return self._defaultMaxPoolSize();
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"maxPoolSize",{},$globals.ForkPool)});
 //>>excludeEnd("ctx");
@@ -1500,15 +1468,14 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$receiver;
-$2=self["@default"];
-if(($receiver = $2) == null || $receiver.isNil){
-self["@default"]=self._new();
+var $1,$receiver;
 $1=self["@default"];
+if(($receiver = $1) == null || $receiver.isNil){
+self["@default"]=self._new();
+return self["@default"];
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"default",{},$globals.ForkPool.klass)});
 //>>excludeEnd("ctx");
@@ -1570,9 +1537,7 @@ selector: "arguments",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@arguments"];
-return $1;
+return self["@arguments"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -1612,7 +1577,6 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
 (
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.supercall = true, 
@@ -1629,7 +1593,7 @@ $recv(aStream)._nextPutAll_(self._selector());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["nextPutAll:"]=2;
 //>>excludeEnd("ctx");
-$1=$recv(aStream)._nextPutAll_(")");
+$recv(aStream)._nextPutAll_(")");
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"printOn:",{aStream:aStream},$globals.Message)});
@@ -1650,9 +1614,7 @@ selector: "selector",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@selector"];
-return $1;
+return self["@selector"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -1692,9 +1654,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(anObject)._perform_withArguments_(self._selector(),self._arguments());
-return $1;
+return $recv(anObject)._perform_withArguments_(self._selector(),self._arguments());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"sendTo:",{anObject:anObject},$globals.Message)});
 //>>excludeEnd("ctx");
@@ -1718,13 +1678,11 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$1;
-$2=self._new();
-$recv($2)._selector_(aString);
-$recv($2)._arguments_(anArray);
-$3=$recv($2)._yourself();
-$1=$3;
-return $1;
+var $1;
+$1=self._new();
+$recv($1)._selector_(aString);
+$recv($1)._arguments_(anArray);
+return $recv($1)._yourself();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"selector:arguments:",{aString:aString,anArray:anArray},$globals.Message.klass)});
 //>>excludeEnd("ctx");
@@ -1752,9 +1710,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self["@message"])._arguments();
-return $1;
+return $recv(self["@message"])._arguments();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"arguments",{},$globals.MessageSend)});
 //>>excludeEnd("ctx");
@@ -1834,7 +1790,6 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
 (
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.supercall = true, 
@@ -1859,7 +1814,7 @@ $recv(aStream)._nextPutAll_(self._selector());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["nextPutAll:"]=4;
 //>>excludeEnd("ctx");
-$1=$recv(aStream)._nextPutAll_(")");
+$recv(aStream)._nextPutAll_(")");
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"printOn:",{aStream:aStream},$globals.MessageSend)});
@@ -1880,9 +1835,7 @@ selector: "receiver",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@receiver"];
-return $1;
+return self["@receiver"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -1922,9 +1875,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self["@message"])._selector();
-return $1;
+return $recv(self["@message"])._selector();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"selector",{},$globals.MessageSend)});
 //>>excludeEnd("ctx");
@@ -1971,9 +1922,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self["@message"])._sendTo_(self._receiver());
-return $1;
+return $recv(self["@message"])._sendTo_(self._receiver());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"value",{},$globals.MessageSend)});
 //>>excludeEnd("ctx");
@@ -1996,12 +1945,10 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$1;
-$2=self["@message"];
-$recv($2)._arguments_([anObject]);
-$3=$recv($2)._sendTo_(self._receiver());
-$1=$3;
-return $1;
+var $1;
+$1=self["@message"];
+$recv($1)._arguments_([anObject]);
+return $recv($1)._sendTo_(self._receiver());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"value:",{anObject:anObject},$globals.MessageSend)});
 //>>excludeEnd("ctx");
@@ -2024,12 +1971,10 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$1;
-$2=self["@message"];
-$recv($2)._arguments_([firstArgument,secondArgument]);
-$3=$recv($2)._sendTo_(self._receiver());
-$1=$3;
-return $1;
+var $1;
+$1=self["@message"];
+$recv($1)._arguments_([firstArgument,secondArgument]);
+return $recv($1)._sendTo_(self._receiver());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"value:value:",{firstArgument:firstArgument,secondArgument:secondArgument},$globals.MessageSend)});
 //>>excludeEnd("ctx");
@@ -2052,12 +1997,10 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$1;
-$2=self["@message"];
-$recv($2)._arguments_([firstArgument,secondArgument,thirdArgument]);
-$3=$recv($2)._sendTo_(self._receiver());
-$1=$3;
-return $1;
+var $1;
+$1=self["@message"];
+$recv($1)._arguments_([firstArgument,secondArgument,thirdArgument]);
+return $recv($1)._sendTo_(self._receiver());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"value:value:value:",{firstArgument:firstArgument,secondArgument:secondArgument,thirdArgument:thirdArgument},$globals.MessageSend)});
 //>>excludeEnd("ctx");
@@ -2080,10 +2023,8 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
 self._arguments_(aCollection);
-$1=self._value();
-return $1;
+return self._value();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"valueWithPossibleArguments:",{aCollection:aCollection},$globals.MessageSend)});
 //>>excludeEnd("ctx");
@@ -2254,7 +2195,7 @@ var context;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2;
+var $1;
 var $early={};
 try {
 context=self;
@@ -2272,8 +2213,7 @@ return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
 $1=$recv(testBlock)._value_(context);
 if($core.assert($1)){
-$2=context;
-throw $early=[$2];
+throw $early=[context];
 };
 context=$recv(context)._outerContext();
 return context;
@@ -2354,9 +2294,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._selector())._isNil();
-return $1;
+return $recv(self._selector())._isNil();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"isBlockContext",{},$globals.MethodContext)});
 //>>excludeEnd("ctx");
@@ -2404,7 +2342,7 @@ var method,lookupClass,receiverClass,supercall;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$3,$2,$4,$6,$5,$7,$9,$8,$receiver;
+var $1,$3,$2,$4,$6,$5,$7,$8,$receiver;
 $1=self._methodContext();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["methodContext"]=1;
@@ -2441,13 +2379,12 @@ var outer;
 outer=$receiver;
 supercall=$recv(outer)._supercall();
 };
-$9=supercall;
-if($core.assert($9)){
-$8=$recv($recv($recv(method)._methodClass())._superclass())._lookupSelector_($recv(self._methodContext())._selector());
+$8=supercall;
+if($core.assert($8)){
+return $recv($recv($recv(method)._methodClass())._superclass())._lookupSelector_($recv(self._methodContext())._selector());
 } else {
-$8=method;
+return method;
 };
-return $8;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"method",{method:method,lookupClass:lookupClass,receiverClass:receiverClass,supercall:supercall},$globals.MethodContext)});
 //>>excludeEnd("ctx");
@@ -2470,20 +2407,19 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$3,$2,$receiver;
+var $1,$2,$receiver;
 $1=self._isBlockContext();
 if(!$core.assert($1)){
 return self;
 };
-$3=self._outerContext();
-if(($receiver = $3) == null || $receiver.isNil){
-$2=$3;
+$2=self._outerContext();
+if(($receiver = $2) == null || $receiver.isNil){
+return $2;
 } else {
 var outer;
 outer=$receiver;
-$2=$recv(outer)._methodContext();
+return $recv(outer)._methodContext();
 };
-return $2;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"methodContext",{},$globals.MethodContext)});
 //>>excludeEnd("ctx");
@@ -2530,7 +2466,6 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
 (
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.supercall = true, 
@@ -2547,7 +2482,7 @@ $recv(aStream)._nextPutAll_(self._asString());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["nextPutAll:"]=2;
 //>>excludeEnd("ctx");
-$1=$recv(aStream)._nextPutAll_(")");
+$recv(aStream)._nextPutAll_(")");
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"printOn:",{aStream:aStream},$globals.MethodContext)});
@@ -2571,26 +2506,25 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $3,$2,$1;
-$2=$recv(self._isBlockContext())._and_((function(){
+var $2,$1;
+$1=$recv(self._isBlockContext())._and_((function(){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
-$3=self._outerContext();
+$2=self._outerContext();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx2.sendIdx["outerContext"]=1;
 //>>excludeEnd("ctx");
-return $recv($3)._notNil();
+return $recv($2)._notNil();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)});
 //>>excludeEnd("ctx");
 }));
-if($core.assert($2)){
-$1=$recv(self._outerContext())._receiver();
+if($core.assert($1)){
+return $recv(self._outerContext())._receiver();
 } else {
-$1=self._basicReceiver();
+return self._basicReceiver();
 };
-return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"receiver",{},$globals.MethodContext)});
 //>>excludeEnd("ctx");
@@ -3047,9 +2981,7 @@ function $Smalltalk(){return $globals.Smalltalk||(typeof Smalltalk=="undefined"?
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($Smalltalk())._existsJsGlobal_(aString);
-return $1;
+return $recv($Smalltalk())._existsJsGlobal_(aString);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"exists:",{aString:aString},$globals.NativeFunction.klass)});
 //>>excludeEnd("ctx");
@@ -3546,12 +3478,10 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$1;
-$2=self._new();
-$recv($2)._rawTimeout_(anObject);
-$3=$recv($2)._yourself();
-$1=$3;
-return $1;
+var $1;
+$1=self._new();
+$recv($1)._rawTimeout_(anObject);
+return $recv($1)._yourself();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"on:",{anObject:anObject},$globals.Timeout.klass)});
 //>>excludeEnd("ctx");

File diff suppressed because it is too large
+ 137 - 246
src/Kernel-Objects.js


File diff suppressed because it is too large
+ 158 - 230
src/Kernel-Tests.js


+ 8 - 21
src/Platform-Browser.js

@@ -14,9 +14,7 @@ selector: "globals",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=window;
-return $1;
+return window;
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -39,12 +37,11 @@ function $NativeFunction(){return $globals.NativeFunction||(typeof NativeFunctio
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$receiver;
+var $receiver;
 if(($receiver = $XMLHttpRequest()) == null || $receiver.isNil){
 self._error_("XMLHttpRequest not available.");
 } else {
-$1=$recv($NativeFunction())._constructorOf_($XMLHttpRequest());
-return $1;
+return $recv($NativeFunction())._constructorOf_($XMLHttpRequest());
 };
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -128,9 +125,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(window)._alert_(aString);
-return $1;
+return $recv(window)._alert_(aString);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"alert:",{aString:aString},$globals.BrowserTerminal)});
 //>>excludeEnd("ctx");
@@ -153,9 +148,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(window)._confirm_(aString);
-return $1;
+return $recv(window)._confirm_(aString);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"confirm:",{aString:aString},$globals.BrowserTerminal)});
 //>>excludeEnd("ctx");
@@ -178,9 +171,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(window)._prompt_(aString);
-return $1;
+return $recv(window)._prompt_(aString);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"prompt:",{aString:aString},$globals.BrowserTerminal)});
 //>>excludeEnd("ctx");
@@ -203,9 +194,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(window)._prompt_default_(aString,defaultString);
-return $1;
+return $recv(window)._prompt_default_(aString,defaultString);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"prompt:default:",{aString:aString,defaultString:defaultString},$globals.BrowserTerminal)});
 //>>excludeEnd("ctx");
@@ -282,9 +271,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=self._postMessageTo_origin_(aFrame,"*");
-return $1;
+return self._postMessageTo_origin_(aFrame,"*");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"postMessageTo:",{aFrame:aFrame},$globals.Object)});
 //>>excludeEnd("ctx");

File diff suppressed because it is too large
+ 120 - 199
src/Platform-ImportExport.js


+ 53 - 130
src/Platform-Services.js

@@ -312,10 +312,8 @@ function $PlatformInterface(){return $globals.PlatformInterface||(typeof Platfor
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
 self._deprecatedAPI();
-$1=$recv($PlatformInterface())._ajax_(anObject);
-return $1;
+return $recv($PlatformInterface())._ajax_(anObject);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"ajax:",{anObject:anObject},$globals.InterfacingObject)});
 //>>excludeEnd("ctx");
@@ -339,9 +337,7 @@ function $Terminal(){return $globals.Terminal||(typeof Terminal=="undefined"?nil
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($Terminal())._alert_(aString);
-return $1;
+return $recv($Terminal())._alert_(aString);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"alert:",{aString:aString},$globals.InterfacingObject)});
 //>>excludeEnd("ctx");
@@ -365,9 +361,7 @@ function $Terminal(){return $globals.Terminal||(typeof Terminal=="undefined"?nil
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($Terminal())._confirm_(aString);
-return $1;
+return $recv($Terminal())._confirm_(aString);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"confirm:",{aString:aString},$globals.InterfacingObject)});
 //>>excludeEnd("ctx");
@@ -391,9 +385,7 @@ function $Terminal(){return $globals.Terminal||(typeof Terminal=="undefined"?nil
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($Terminal())._prompt_(aString);
-return $1;
+return $recv($Terminal())._prompt_(aString);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"prompt:",{aString:aString},$globals.InterfacingObject)});
 //>>excludeEnd("ctx");
@@ -417,9 +409,7 @@ function $Terminal(){return $globals.Terminal||(typeof Terminal=="undefined"?nil
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($Terminal())._prompt_default_(aString,defaultString);
-return $1;
+return $recv($Terminal())._prompt_default_(aString,defaultString);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"prompt:default:",{aString:aString,defaultString:defaultString},$globals.InterfacingObject)});
 //>>excludeEnd("ctx");
@@ -448,7 +438,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2,$3,$4,$5;
+var $1,$2,$3,$4;
 $1=self._classBuilder();
 $2=$recv(aClass)._superclass();
 $3=$recv(aClass)._name();
@@ -457,8 +447,7 @@ $ctx1.sendIdx["name"]=1;
 //>>excludeEnd("ctx");
 $4=$recv($recv(aClass)._instanceVariableNames())._copy();
 $recv($4)._add_(aString);
-$5=$recv($4)._yourself();
-$recv($1)._addSubclassOf_named_instanceVariableNames_package_($2,$3,$5,$recv($recv(aClass)._package())._name());
+$recv($1)._addSubclassOf_named_instanceVariableNames_package_($2,$3,$recv($4)._yourself(),$recv($recv(aClass)._package())._name());
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"addInstVarNamed:to:",{aString:aString,aClass:aClass},$globals.Environment)});
@@ -483,9 +472,7 @@ function $Smalltalk(){return $globals.Smalltalk||(typeof Smalltalk=="undefined"?
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($recv($Smalltalk())._core())._allSelectors();
-return $1;
+return $recv($recv($Smalltalk())._core())._allSelectors();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"allSelectors",{},$globals.Environment)});
 //>>excludeEnd("ctx");
@@ -509,8 +496,7 @@ function $Smalltalk(){return $globals.Smalltalk||(typeof Smalltalk=="undefined"?
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($recv($Smalltalk())._classes())._collect_((function(each){
+return $recv($recv($Smalltalk())._classes())._collect_((function(each){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
@@ -519,7 +505,6 @@ return $recv(each)._name();
 }, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1,1)});
 //>>excludeEnd("ctx");
 }));
-return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"availableClassNames",{},$globals.Environment)});
 //>>excludeEnd("ctx");
@@ -543,8 +528,7 @@ function $Smalltalk(){return $globals.Smalltalk||(typeof Smalltalk=="undefined"?
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($recv($Smalltalk())._packages())._collect_((function(each){
+return $recv($recv($Smalltalk())._packages())._collect_((function(each){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
@@ -553,7 +537,6 @@ return $recv(each)._name();
 }, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1,1)});
 //>>excludeEnd("ctx");
 }));
-return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"availablePackageNames",{},$globals.Environment)});
 //>>excludeEnd("ctx");
@@ -577,7 +560,7 @@ var protocols;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2,$receiver;
+var $1,$receiver;
 protocols=$recv(aClass)._protocols();
 $1=$recv(aClass)._superclass();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -588,8 +571,7 @@ $1;
 } else {
 $recv(protocols)._addAll_(self._availableProtocolsFor_($recv(aClass)._superclass()));
 };
-$2=$recv($recv($recv(protocols)._asSet())._asArray())._sort();
-return $2;
+return $recv($recv($recv(protocols)._asSet())._asArray())._sort();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"availableProtocolsFor:",{aClass:aClass,protocols:protocols},$globals.Environment)});
 //>>excludeEnd("ctx");
@@ -613,9 +595,7 @@ function $ClassBuilder(){return $globals.ClassBuilder||(typeof ClassBuilder=="un
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($ClassBuilder())._new();
-return $1;
+return $recv($ClassBuilder())._new();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"classBuilder",{},$globals.Environment)});
 //>>excludeEnd("ctx");
@@ -639,14 +619,13 @@ function $Smalltalk(){return $globals.Smalltalk||(typeof Smalltalk=="undefined"?
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$receiver;
-$2=$recv($recv($Smalltalk())._globals())._at_($recv(aString)._asSymbol());
-if(($receiver = $2) == null || $receiver.isNil){
-$1=self._error_("Invalid class name");
+var $1,$receiver;
+$1=$recv($recv($Smalltalk())._globals())._at_($recv(aString)._asSymbol());
+if(($receiver = $1) == null || $receiver.isNil){
+return self._error_("Invalid class name");
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"classNamed:",{aString:aString},$globals.Environment)});
 //>>excludeEnd("ctx");
@@ -670,9 +649,7 @@ function $Smalltalk(){return $globals.Smalltalk||(typeof Smalltalk=="undefined"?
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($Smalltalk())._classes();
-return $1;
+return $recv($Smalltalk())._classes();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"classes",{},$globals.Environment)});
 //>>excludeEnd("ctx");
@@ -785,9 +762,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(class_)._compile_protocol_(sourceCode,protocol);
-return $1;
+return $recv(class_)._compile_protocol_(sourceCode,protocol);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"compileMethod:for:protocol:",{sourceCode:sourceCode,class_:class_,protocol:protocol},$globals.Environment)});
 //>>excludeEnd("ctx");
@@ -848,9 +823,7 @@ function $DoIt(){return $globals.DoIt||(typeof DoIt=="undefined"?nil:DoIt)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($DoIt())._new();
-return $1;
+return $recv($DoIt())._new();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"doItReceiver",{},$globals.Environment)});
 //>>excludeEnd("ctx");
@@ -874,9 +847,7 @@ function $Evaluator(){return $globals.Evaluator||(typeof Evaluator=="undefined"?
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($Evaluator())._evaluate_for_(aString,anObject);
-return $1;
+return $recv($Evaluator())._evaluate_for_(aString,anObject);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"evaluate:for:",{aString:aString,anObject:anObject},$globals.Environment)});
 //>>excludeEnd("ctx");
@@ -1071,9 +1042,7 @@ function $Smalltalk(){return $globals.Smalltalk||(typeof Smalltalk=="undefined"?
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($Smalltalk())._packages();
-return $1;
+return $recv($Smalltalk())._packages();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"packages",{},$globals.Environment)});
 //>>excludeEnd("ctx");
@@ -1432,9 +1401,7 @@ function $Smalltalk(){return $globals.Smalltalk||(typeof Smalltalk=="undefined"?
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($recv($recv($Smalltalk())._globals())._at_("SystemAnnouncer"))._current();
-return $1;
+return $recv($recv($recv($Smalltalk())._globals())._at_("SystemAnnouncer"))._current();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"systemAnnouncer",{},$globals.Environment)});
 //>>excludeEnd("ctx");
@@ -1521,14 +1488,13 @@ function $JQuery(){return $globals.JQuery||(typeof JQuery=="undefined"?nil:JQuer
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$receiver;
+var $receiver;
 self._deprecatedAPI_("Use Platform newXhr or dedicated library.");
 if(($receiver = $JQuery()) == null || $receiver.isNil){
-$1=self._error_("JQuery wrapper not loaded, cannot do AJAX.");
+return self._error_("JQuery wrapper not loaded, cannot do AJAX.");
 } else {
-$1=$recv($recv($JQuery())._current())._ajax_(anObject);
+return $recv($recv($JQuery())._current())._ajax_(anObject);
 };
-return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"ajax:",{anObject:anObject},$globals.PlatformInterface.klass)});
 //>>excludeEnd("ctx");
@@ -1552,10 +1518,8 @@ function $Terminal(){return $globals.Terminal||(typeof Terminal=="undefined"?nil
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
 self._deprecatedAPI_("Use Terminal alert:");
-$1=$recv($Terminal())._alert_(aString);
-return $1;
+return $recv($Terminal())._alert_(aString);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"alert:",{aString:aString},$globals.PlatformInterface.klass)});
 //>>excludeEnd("ctx");
@@ -1579,10 +1543,8 @@ function $Terminal(){return $globals.Terminal||(typeof Terminal=="undefined"?nil
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
 self._deprecatedAPI_("Use Terminal confirm:");
-$1=$recv($Terminal())._confirm_(aString);
-return $1;
+return $recv($Terminal())._confirm_(aString);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"confirm:",{aString:aString},$globals.PlatformInterface.klass)});
 //>>excludeEnd("ctx");
@@ -1606,16 +1568,14 @@ function $PlatformInterface(){return $globals.PlatformInterface||(typeof Platfor
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
 self._deprecatedAPI_("Use Smalltalk existsJsGlobal:");
-$1=$recv($recv($PlatformInterface())._globals())._at_ifPresent_ifAbsent_(aString,(function(){
+return $recv($recv($PlatformInterface())._globals())._at_ifPresent_ifAbsent_(aString,(function(){
 return true;
 
 }),(function(){
 return false;
 
 }));
-return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"existsGlobal:",{aString:aString},$globals.PlatformInterface.klass)});
 //>>excludeEnd("ctx");
@@ -1639,10 +1599,8 @@ function $Platform(){return $globals.Platform||(typeof Platform=="undefined"?nil
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
 self._deprecatedAPI_("Use Platform globals");
-$1=$recv($Platform())._globals();
-return $1;
+return $recv($Platform())._globals();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"globals",{},$globals.PlatformInterface.klass)});
 //>>excludeEnd("ctx");
@@ -1666,10 +1624,8 @@ function $Platform(){return $globals.Platform||(typeof Platform=="undefined"?nil
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
 self._deprecatedAPI_("Use Platform newXhr");
-$1=$recv($Platform())._newXhr();
-return $1;
+return $recv($Platform())._newXhr();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"newXhr",{},$globals.PlatformInterface.klass)});
 //>>excludeEnd("ctx");
@@ -1693,10 +1649,8 @@ function $Terminal(){return $globals.Terminal||(typeof Terminal=="undefined"?nil
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
 self._deprecatedAPI_("Use Terminal prompt:");
-$1=$recv($Terminal())._prompt_(aString);
-return $1;
+return $recv($Terminal())._prompt_(aString);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"prompt:",{aString:aString},$globals.PlatformInterface.klass)});
 //>>excludeEnd("ctx");
@@ -1720,10 +1674,8 @@ function $Terminal(){return $globals.Terminal||(typeof Terminal=="undefined"?nil
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
 self._deprecatedAPI_("Use Terminal prompt:default:");
-$1=$recv($Terminal())._prompt_default_(aString,defaultString);
-return $1;
+return $recv($Terminal())._prompt_default_(aString,defaultString);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"prompt:default:",{aString:aString,defaultString:defaultString},$globals.PlatformInterface.klass)});
 //>>excludeEnd("ctx");
@@ -1750,9 +1702,7 @@ selector: "current",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@current"];
-return $1;
+return self["@current"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -1876,13 +1826,12 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2;
+var $1;
 $1=$recv(anError)._wasHandled();
 if($core.assert($1)){
 return self;
 };
-$2=$recv(self._current())._handleError_(anError);
-return $2;
+return $recv(self._current())._handleError_(anError);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"handleUnhandledError:",{anError:anError},$globals.ErrorHandler.klass)});
 //>>excludeEnd("ctx");
@@ -1911,9 +1860,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._current())._findClass_(aClass);
-return $1;
+return $recv(self._current())._findClass_(aClass);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"findClass:",{aClass:aClass},$globals.Finder.klass)});
 //>>excludeEnd("ctx");
@@ -1936,9 +1883,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._current())._findMethod_(aCompiledMethod);
-return $1;
+return $recv(self._current())._findMethod_(aCompiledMethod);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"findMethod:",{aCompiledMethod:aCompiledMethod},$globals.Finder.klass)});
 //>>excludeEnd("ctx");
@@ -1961,9 +1906,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._current())._findString_(aString);
-return $1;
+return $recv(self._current())._findString_(aString);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"findString:",{aString:aString},$globals.Finder.klass)});
 //>>excludeEnd("ctx");
@@ -1992,9 +1935,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._current())._inspect_(anObject);
-return $1;
+return $recv(self._current())._inspect_(anObject);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"inspect:",{anObject:anObject},$globals.Inspector.klass)});
 //>>excludeEnd("ctx");
@@ -2023,9 +1964,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._current())._globals();
-return $1;
+return $recv(self._current())._globals();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"globals",{},$globals.Platform.klass)});
 //>>excludeEnd("ctx");
@@ -2048,9 +1987,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._current())._newXhr();
-return $1;
+return $recv(self._current())._newXhr();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"newXhr",{},$globals.Platform.klass)});
 //>>excludeEnd("ctx");
@@ -2109,9 +2046,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._current())._alert_(aString);
-return $1;
+return $recv(self._current())._alert_(aString);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"alert:",{aString:aString},$globals.Terminal.klass)});
 //>>excludeEnd("ctx");
@@ -2134,9 +2069,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._current())._confirm_(aString);
-return $1;
+return $recv(self._current())._confirm_(aString);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"confirm:",{aString:aString},$globals.Terminal.klass)});
 //>>excludeEnd("ctx");
@@ -2159,9 +2092,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._current())._prompt_(aString);
-return $1;
+return $recv(self._current())._prompt_(aString);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"prompt:",{aString:aString},$globals.Terminal.klass)});
 //>>excludeEnd("ctx");
@@ -2184,9 +2115,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._current())._prompt_default_(aString,defaultString);
-return $1;
+return $recv(self._current())._prompt_default_(aString,defaultString);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"prompt:default:",{aString:aString,defaultString:defaultString},$globals.Terminal.klass)});
 //>>excludeEnd("ctx");
@@ -2338,7 +2267,6 @@ function $Dictionary(){return $globals.Dictionary||(typeof Dictionary=="undefine
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
 variables=$recv($Dictionary())._new();
 $recv(variables)._at_put_("#self",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -2358,7 +2286,7 @@ return $recv(variables)._at_put_(key,value);
 //>>excludeEnd("ctx");
 }));
 $recv(anInspector)._setLabel_(self._printString());
-$1=$recv(anInspector)._setVariables_(variables);
+$recv(anInspector)._setVariables_(variables);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"inspectOn:",{anInspector:anInspector,variables:variables},$globals.AssociativeCollection)});
@@ -2384,7 +2312,6 @@ function $Dictionary(){return $globals.Dictionary||(typeof Dictionary=="undefine
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
 variables=$recv($Dictionary())._new();
 $recv(variables)._at_put_("#self",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -2400,7 +2327,7 @@ return $recv(variables)._at_put_(i,each);
 //>>excludeEnd("ctx");
 }));
 $recv(anInspector)._setLabel_(self._printString());
-$1=$recv(anInspector)._setVariables_(variables);
+$recv(anInspector)._setVariables_(variables);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"inspectOn:",{anInspector:anInspector,variables:variables},$globals.Collection)});
@@ -2426,7 +2353,6 @@ function $Dictionary(){return $globals.Dictionary||(typeof Dictionary=="undefine
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
 variables=$recv($Dictionary())._new();
 $recv(variables)._at_put_("#self",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -2458,7 +2384,7 @@ $ctx1.sendIdx["at:put:"]=7;
 //>>excludeEnd("ctx");
 $recv(variables)._at_put_("#milliseconds",self._milliseconds());
 $recv(anInspector)._setLabel_(self._printString());
-$1=$recv(anInspector)._setVariables_(variables);
+$recv(anInspector)._setVariables_(variables);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"inspectOn:",{anInspector:anInspector,variables:variables},$globals.Date)});
@@ -2515,7 +2441,6 @@ function $Dictionary(){return $globals.Dictionary||(typeof Dictionary=="undefine
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
 variables=$recv($Dictionary())._new();
 $recv(variables)._at_put_("#self",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -2547,7 +2472,7 @@ return $recv(variables)._at_put_(each,self._instVarAt_(each));
 //>>excludeEnd("ctx");
 }));
 $recv(anInspector)._setLabel_(self._printString());
-$1=$recv(anInspector)._setVariables_(variables);
+$recv(anInspector)._setVariables_(variables);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"inspectOn:",{anInspector:anInspector,variables:variables},$globals.MethodContext)});
@@ -2573,7 +2498,6 @@ function $Dictionary(){return $globals.Dictionary||(typeof Dictionary=="undefine
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
 variables=$recv($Dictionary())._new();
 $recv(variables)._at_put_("#self",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -2589,7 +2513,7 @@ return $recv(variables)._at_put_(each,self._instVarAt_(each));
 //>>excludeEnd("ctx");
 }));
 $recv(anInspector)._setLabel_(self._printString());
-$1=$recv(anInspector)._setVariables_(variables);
+$recv(anInspector)._setVariables_(variables);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"inspectOn:",{anInspector:anInspector,variables:variables},$globals.Object)});
@@ -2640,7 +2564,6 @@ function $Dictionary(){return $globals.Dictionary||(typeof Dictionary=="undefine
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
 variables=$recv($Dictionary())._new();
 $recv(variables)._at_put_("#self",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -2659,7 +2582,7 @@ return i;
 //>>excludeEnd("ctx");
 }));
 $recv(anInspector)._setLabel_(self._printString());
-$1=$recv(anInspector)._setVariables_(variables);
+$recv(anInspector)._setVariables_(variables);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"inspectOn:",{anInspector:anInspector,variables:variables,i:i},$globals.Set)});

+ 1 - 3
src/SUnit-Tests.js

@@ -492,8 +492,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($recv(aCollection)._collect_((function(each){
+return $recv($recv(aCollection)._collect_((function(each){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
@@ -502,7 +501,6 @@ return $recv(each)._selector();
 }, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1,1)});
 //>>excludeEnd("ctx");
 })))._asSet();
-return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"selectorSetOf:",{aCollection:aCollection},$globals.SUnitAsyncTest)});
 //>>excludeEnd("ctx");

+ 53 - 98
src/SUnit.js

@@ -14,9 +14,7 @@ selector: "result",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@result"];
-return $1;
+return self["@result"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -112,23 +110,22 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$6,$5,$4,$3,$1;
-$2=$recv(actual).__eq(expected);
-$6=$recv(expected)._printString();
+var $1,$5,$4,$3,$2;
+$1=$recv(actual).__eq(expected);
+$5=$recv(expected)._printString();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["printString"]=1;
 //>>excludeEnd("ctx");
-$5="Expected: ".__comma($6);
-$4=$recv($5).__comma(" but was: ");
+$4="Expected: ".__comma($5);
+$3=$recv($4).__comma(" but was: ");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx[","]=2;
 //>>excludeEnd("ctx");
-$3=$recv($4).__comma($recv(actual)._printString());
+$2=$recv($3).__comma($recv(actual)._printString());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx[","]=1;
 //>>excludeEnd("ctx");
-$1=self._assert_description_($2,$3);
-return $1;
+return self._assert_description_($1,$2);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"assert:equals:",{actual:actual,expected:expected},$globals.TestCase)});
 //>>excludeEnd("ctx");
@@ -152,22 +149,21 @@ var c;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1;
+var $1;
 self._errorIfNotAsync_("#async");
 c=self["@context"];
-$1=(function(){
+return (function(){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
-$2=self._isAsync();
-if($core.assert($2)){
+$1=self._isAsync();
+if($core.assert($1)){
 return $recv(c)._execute_(aBlock);
 };
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)});
 //>>excludeEnd("ctx");
 });
-return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"async:",{aBlock:aBlock,c:c},$globals.TestCase)});
 //>>excludeEnd("ctx");
@@ -286,9 +282,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self["@asyncTimeout"])._notNil();
-return $1;
+return $recv(self["@asyncTimeout"])._notNil();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"isAsync",{},$globals.TestCase)});
 //>>excludeEnd("ctx");
@@ -358,9 +352,7 @@ selector: "selector",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@testSelector"];
-return $1;
+return self["@testSelector"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -515,10 +507,10 @@ function $TestFailure(){return $globals.TestFailure||(typeof TestFailure=="undef
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2;
+var $1;
 $1=$recv($TestFailure())._new();
 $recv($1)._messageText_(aString);
-$2=$recv($1)._signal();
+$recv($1)._signal();
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"signalFailure:",{aString:aString},$globals.TestCase)});
@@ -602,14 +594,13 @@ var selectors;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2;
+var $1;
 selectors=self._testSelectors();
 $1=self._shouldInheritSelectors();
 if($core.assert($1)){
 $recv(selectors)._addAll_($recv(self._superclass())._allTestSelectors());
 };
-$2=selectors;
-return $2;
+return selectors;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"allTestSelectors",{selectors:selectors},$globals.TestCase.klass)});
 //>>excludeEnd("ctx");
@@ -632,8 +623,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._allTestSelectors())._collect_((function(each){
+return $recv(self._allTestSelectors())._collect_((function(each){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
@@ -642,7 +632,6 @@ return self._selector_(each);
 }, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1,1)});
 //>>excludeEnd("ctx");
 }));
-return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"buildSuite",{},$globals.TestCase.klass)});
 //>>excludeEnd("ctx");
@@ -683,9 +672,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._name()).__eq("TestCase");
-return $1;
+return $recv(self._name()).__eq("TestCase");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"isAbstract",{},$globals.TestCase.klass)});
 //>>excludeEnd("ctx");
@@ -727,12 +714,10 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$1;
-$2=self._new();
-$recv($2)._setTestSelector_(aSelector);
-$3=$recv($2)._yourself();
-$1=$3;
-return $1;
+var $1;
+$1=self._new();
+$recv($1)._setTestSelector_(aSelector);
+return $recv($1)._yourself();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"selector:",{aSelector:aSelector},$globals.TestCase.klass)});
 //>>excludeEnd("ctx");
@@ -755,9 +740,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=self.__tild_eq(self._lookupHierarchyRoot());
-return $1;
+return self.__tild_eq(self._lookupHierarchyRoot());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"shouldInheritSelectors",{},$globals.TestCase.klass)});
 //>>excludeEnd("ctx");
@@ -780,8 +763,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($recv(self._methodDictionary())._keys())._select_((function(each){
+return $recv($recv(self._methodDictionary())._keys())._select_((function(each){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
@@ -790,7 +772,6 @@ return $recv(each)._match_("^test");
 }, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1,1)});
 //>>excludeEnd("ctx");
 }));
-return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"testSelectors",{},$globals.TestCase.klass)});
 //>>excludeEnd("ctx");
@@ -940,12 +921,10 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$1;
-$2=self._new();
-$recv($2)._testCase_(aTestCase);
-$3=$recv($2)._yourself();
-$1=$3;
-return $1;
+var $1;
+$1=self._new();
+$recv($1)._testCase_(aTestCase);
+return $recv($1)._yourself();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"testCase:",{aTestCase:aTestCase},$globals.TestContext.klass)});
 //>>excludeEnd("ctx");
@@ -1125,8 +1104,8 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$1;
-$2=(
+var $1;
+$1=(
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.supercall = true, 
 //>>excludeEnd("ctx");
@@ -1134,11 +1113,9 @@ $globals.ReportingTestContext.klass.superclass.fn.prototype._testCase_.apply($re
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.supercall = false;
 //>>excludeEnd("ctx");;
-$recv($2)._result_(aTestResult);
-$recv($2)._finished_(aBlock);
-$3=$recv($2)._yourself();
-$1=$3;
-return $1;
+$recv($1)._result_(aTestResult);
+$recv($1)._finished_(aBlock);
+return $recv($1)._yourself();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"testCase:result:finished:",{aTestCase:aTestCase,aTestResult:aTestResult,aBlock:aBlock},$globals.ReportingTestContext.klass)});
 //>>excludeEnd("ctx");
@@ -1217,9 +1194,7 @@ selector: "errors",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@errors"];
-return $1;
+return self["@errors"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -1237,9 +1212,7 @@ selector: "failures",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@failures"];
-return $1;
+return self["@failures"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -1325,16 +1298,15 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $3,$2,$1;
-$3=self._runs();
+var $2,$1;
+$2=self._runs();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["runs"]=1;
 //>>excludeEnd("ctx");
-$2=$recv($3).__eq_eq(self._total());
-if(!$core.assert($2)){
-$1=$recv(aBlock)._value_($recv(self._runs()).__plus((1)));
+$1=$recv($2).__eq_eq(self._total());
+if(!$core.assert($1)){
+return $recv(aBlock)._value_($recv(self._runs()).__plus((1)));
 };
-return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"nextRunDo:",{aBlock:aBlock},$globals.TestResult)});
 //>>excludeEnd("ctx");
@@ -1416,9 +1388,7 @@ selector: "runs",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@runs"];
-return $1;
+return self["@runs"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -1474,9 +1444,7 @@ selector: "timestamp",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@timestamp"];
-return $1;
+return self["@timestamp"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -1494,9 +1462,7 @@ selector: "total",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@total"];
-return $1;
+return self["@total"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -1539,9 +1505,7 @@ selector: "announcer",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@announcer"];
-return $1;
+return self["@announcer"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -1563,8 +1527,7 @@ function $ReportingTestContext(){return $globals.ReportingTestContext||(typeof R
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($ReportingTestContext())._testCase_result_finished_($recv(self["@suite"])._at_(anInteger),self["@result"],(function(){
+return $recv($ReportingTestContext())._testCase_result_finished_($recv(self["@suite"])._at_(anInteger),self["@result"],(function(){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
@@ -1573,7 +1536,6 @@ return self._resume();
 }, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)});
 //>>excludeEnd("ctx");
 }));
-return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"contextOf:",{anInteger:anInteger},$globals.TestSuiteRunner)});
 //>>excludeEnd("ctx");
@@ -1647,9 +1609,7 @@ selector: "result",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@result"];
-return $1;
+return self["@result"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -1765,8 +1725,8 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1;
-$2=(
+var $1;
+$1=(
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.supercall = true, 
 //>>excludeEnd("ctx");
@@ -1774,8 +1734,7 @@ $globals.TestSuiteRunner.klass.superclass.fn.prototype._new.apply($recv(self), [
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.supercall = false;
 //>>excludeEnd("ctx");;
-$1=$recv($2)._suite_(aCollection);
-return $1;
+return $recv($1)._suite_(aCollection);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"on:",{aCollection:aCollection},$globals.TestSuiteRunner.klass)});
 //>>excludeEnd("ctx");
@@ -1799,8 +1758,7 @@ function $TestCase(){return $globals.TestCase||(typeof TestCase=="undefined"?nil
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._includesBehavior_($TestCase()))._and_((function(){
+return $recv(self._includesBehavior_($TestCase()))._and_((function(){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
@@ -1809,7 +1767,6 @@ return $recv(self._isAbstract())._not();
 }, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)});
 //>>excludeEnd("ctx");
 }));
-return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"isTestClass",{},$globals.Behavior)});
 //>>excludeEnd("ctx");
@@ -1832,8 +1789,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._classes())._anySatisfy_((function(each){
+return $recv(self._classes())._anySatisfy_((function(each){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
@@ -1842,7 +1798,6 @@ return $recv(each)._isTestClass();
 }, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1,1)});
 //>>excludeEnd("ctx");
 }));
-return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"isTestPackage",{},$globals.Package)});
 //>>excludeEnd("ctx");

Some files were not shown because too many files changed in this diff