Browse Source

globals -> $globals

Herbert Vojčík 9 years ago
parent
commit
e8a1aea319

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


+ 18 - 18
src/Benchfib.js

@@ -4,7 +4,7 @@ var smalltalk=$vm,_st=$recv,globals=$globals;
 $vm.addPackage('Benchfib');
 $vm.packages["Benchfib"].transport = {"type":"amd","amdNamespace":"amber_core"};
 
-$vm.addClass('Benchfib', globals.Object, [], 'Benchfib');
+$vm.addClass('Benchfib', $globals.Object, [], 'Benchfib');
 
 $vm.addMethod(
 $vm.method({
@@ -20,7 +20,7 @@ result=(0)._tinyBenchmarks();
 _st(console)._log_("0 tinyBenchmarks => ".__comma(result));
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"main",{result:result},globals.Benchfib.klass)});
+}, function($ctx1) {$ctx1.fill(self,"main",{result:result},$globals.Benchfib.klass)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -30,7 +30,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: ["tinyBenchmarks", "log:", ","]
 }),
-globals.Benchfib.klass);
+$globals.Benchfib.klass);
 
 $vm.addMethod(
 $vm.method({
@@ -62,7 +62,7 @@ $ctx1.sendIdx["+"]=1;
 };
 return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"benchFib",{},globals.Number)});
+}, function($ctx1) {$ctx1.fill(self,"benchFib",{},$globals.Number)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -72,7 +72,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: ["ifTrue:ifFalse:", "<", "+", "benchFib", "-"]
 }),
-globals.Number);
+$globals.Number);
 
 $vm.addMethod(
 $vm.method({
@@ -81,7 +81,7 @@ protocol: '*Benchfib',
 fn: function (){
 var self=this;
 var size,flags,prime,k,count;
-function $Array(){return globals.Array||(typeof Array=="undefined"?nil:Array)}
+function $Array(){return $globals.Array||(typeof Array=="undefined"?nil:Array)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $vm.withContext(function($ctx1) { 
 //>>excludeEnd("ctx");
@@ -159,7 +159,7 @@ $ctx1.sendIdx["to:do:"]=1;
 $2=count;
 return $2;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"benchmark",{size:size,flags:flags,prime:prime,k:k,count:count},globals.Number)});
+}, function($ctx1) {$ctx1.fill(self,"benchmark",{size:size,flags:flags,prime:prime,k:k,count:count},$globals.Number)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -169,7 +169,7 @@ referencedClasses: ["Array"],
 //>>excludeEnd("ide");
 messageSends: ["to:do:", "new", "timesRepeat:", "add:", "ifTrue:", "at:", "+", "whileTrue:", "<=", "at:put:"]
 }),
-globals.Number);
+$globals.Number);
 
 $vm.addMethod(
 $vm.method({
@@ -186,7 +186,7 @@ return 1;
 return (this-1)._jsbenchFib() + (this-2)._jsbenchFib() + 1;};
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"jsbenchFib",{},globals.Number)});
+}, function($ctx1) {$ctx1.fill(self,"jsbenchFib",{},$globals.Number)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -196,7 +196,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.Number);
+$globals.Number);
 
 $vm.addMethod(
 $vm.method({
@@ -231,7 +231,7 @@ for (var z=0;z<this;z++) {
 return count;
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"jsbenchmark",{},globals.Number)});
+}, function($ctx1) {$ctx1.fill(self,"jsbenchmark",{},$globals.Number)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -241,7 +241,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.Number);
+$globals.Number);
 
 $vm.addMethod(
 $vm.method({
@@ -250,7 +250,7 @@ protocol: '*Benchfib',
 fn: function (){
 var self=this;
 var t1,t2,r,n1,n2;
-function $Date(){return globals.Date||(typeof Date=="undefined"?nil:Date)}
+function $Date(){return $globals.Date||(typeof Date=="undefined"?nil:Date)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $vm.withContext(function($ctx1) { 
 //>>excludeEnd("ctx");
@@ -353,7 +353,7 @@ $ctx1.sendIdx[","]=1;
 //>>excludeEnd("ctx");
 return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"jstinyBenchmarks",{t1:t1,t2:t2,r:r,n1:n1,n2:n2},globals.Number)});
+}, function($ctx1) {$ctx1.fill(self,"jstinyBenchmarks",{t1:t1,t2:t2,r:r,n1:n1,n2:n2},$globals.Number)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -363,7 +363,7 @@ referencedClasses: ["Date"],
 //>>excludeEnd("ide");
 messageSends: ["whileTrue:", "millisecondsToRun:", "jsbenchmark", "<", "*", "jsbenchFib", "+", ",", "printString", "/"]
 }),
-globals.Number);
+$globals.Number);
 
 $vm.addMethod(
 $vm.method({
@@ -372,7 +372,7 @@ protocol: '*Benchfib',
 fn: function (){
 var self=this;
 var t1,t2,r,n1,n2;
-function $Date(){return globals.Date||(typeof Date=="undefined"?nil:Date)}
+function $Date(){return $globals.Date||(typeof Date=="undefined"?nil:Date)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $vm.withContext(function($ctx1) { 
 //>>excludeEnd("ctx");
@@ -475,7 +475,7 @@ $ctx1.sendIdx[","]=1;
 //>>excludeEnd("ctx");
 return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"tinyBenchmarks",{t1:t1,t2:t2,r:r,n1:n1,n2:n2},globals.Number)});
+}, function($ctx1) {$ctx1.fill(self,"tinyBenchmarks",{t1:t1,t2:t2,r:r,n1:n1,n2:n2},$globals.Number)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -485,6 +485,6 @@ referencedClasses: ["Date"],
 //>>excludeEnd("ide");
 messageSends: ["whileTrue:", "millisecondsToRun:", "benchmark", "<", "*", "benchFib", "+", ",", "printString", "/"]
 }),
-globals.Number);
+$globals.Number);
 
 });

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


File diff suppressed because it is too large
+ 120 - 120
src/Compiler-Core.js


+ 32 - 32
src/Compiler-Exceptions.js

@@ -4,33 +4,33 @@ var smalltalk=$vm,_st=$recv,globals=$globals;
 $vm.addPackage('Compiler-Exceptions');
 $vm.packages["Compiler-Exceptions"].transport = {"type":"amd","amdNamespace":"amber_core"};
 
-$vm.addClass('CompilerError', globals.Error, [], 'Compiler-Exceptions');
+$vm.addClass('CompilerError', $globals.Error, [], 'Compiler-Exceptions');
 //>>excludeStart("ide", pragmas.excludeIdeData);
-globals.CompilerError.comment="I am the common superclass of all compiling errors.";
+$globals.CompilerError.comment="I am the common superclass of all compiling errors.";
 //>>excludeEnd("ide");
 
 
-$vm.addClass('ParseError', globals.CompilerError, [], 'Compiler-Exceptions');
+$vm.addClass('ParseError', $globals.CompilerError, [], 'Compiler-Exceptions');
 //>>excludeStart("ide", pragmas.excludeIdeData);
-globals.ParseError.comment="Instance of ParseError are signaled on any parsing error.\x0aSee `Smalltalk >> #parse:`";
+$globals.ParseError.comment="Instance of ParseError are signaled on any parsing error.\x0aSee `Smalltalk >> #parse:`";
 //>>excludeEnd("ide");
 
 
-$vm.addClass('SemanticError', globals.CompilerError, [], 'Compiler-Exceptions');
+$vm.addClass('SemanticError', $globals.CompilerError, [], 'Compiler-Exceptions');
 //>>excludeStart("ide", pragmas.excludeIdeData);
-globals.SemanticError.comment="I represent an abstract semantic error thrown by the SemanticAnalyzer.\x0aSemantic errors can be unknown variable errors, etc.\x0aSee my subclasses for concrete errors.\x0a\x0aThe IDE should catch instances of Semantic error to deal with them when compiling";
+$globals.SemanticError.comment="I represent an abstract semantic error thrown by the SemanticAnalyzer.\x0aSemantic errors can be unknown variable errors, etc.\x0aSee my subclasses for concrete errors.\x0a\x0aThe IDE should catch instances of Semantic error to deal with them when compiling";
 //>>excludeEnd("ide");
 
 
-$vm.addClass('InliningError', globals.SemanticError, [], 'Compiler-Exceptions');
+$vm.addClass('InliningError', $globals.SemanticError, [], 'Compiler-Exceptions');
 //>>excludeStart("ide", pragmas.excludeIdeData);
-globals.InliningError.comment="Instances of InliningError are signaled when using an `InliningCodeGenerator`in a `Compiler`.";
+$globals.InliningError.comment="Instances of InliningError are signaled when using an `InliningCodeGenerator`in a `Compiler`.";
 //>>excludeEnd("ide");
 
 
-$vm.addClass('InvalidAssignmentError', globals.SemanticError, ['variableName'], 'Compiler-Exceptions');
+$vm.addClass('InvalidAssignmentError', $globals.SemanticError, ['variableName'], 'Compiler-Exceptions');
 //>>excludeStart("ide", pragmas.excludeIdeData);
-globals.InvalidAssignmentError.comment="I get signaled when a pseudo variable gets assigned.";
+$globals.InvalidAssignmentError.comment="I get signaled when a pseudo variable gets assigned.";
 //>>excludeEnd("ide");
 $vm.addMethod(
 $vm.method({
@@ -45,7 +45,7 @@ var $1;
 $1=" Invalid assignment to variable: ".__comma(self._variableName());
 return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"messageText",{},globals.InvalidAssignmentError)});
+}, function($ctx1) {$ctx1.fill(self,"messageText",{},$globals.InvalidAssignmentError)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -55,7 +55,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: [",", "variableName"]
 }),
-globals.InvalidAssignmentError);
+$globals.InvalidAssignmentError);
 
 $vm.addMethod(
 $vm.method({
@@ -75,7 +75,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.InvalidAssignmentError);
+$globals.InvalidAssignmentError);
 
 $vm.addMethod(
 $vm.method({
@@ -94,13 +94,13 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.InvalidAssignmentError);
+$globals.InvalidAssignmentError);
 
 
 
-$vm.addClass('ShadowingVariableError', globals.SemanticError, ['variableName'], 'Compiler-Exceptions');
+$vm.addClass('ShadowingVariableError', $globals.SemanticError, ['variableName'], 'Compiler-Exceptions');
 //>>excludeStart("ide", pragmas.excludeIdeData);
-globals.ShadowingVariableError.comment="I get signaled when a variable in a block or method scope shadows a variable of the same name in an outer scope.";
+$globals.ShadowingVariableError.comment="I get signaled when a variable in a block or method scope shadows a variable of the same name in an outer scope.";
 //>>excludeEnd("ide");
 $vm.addMethod(
 $vm.method({
@@ -118,7 +118,7 @@ $ctx1.sendIdx[","]=1;
 //>>excludeEnd("ctx");
 return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"messageText",{},globals.ShadowingVariableError)});
+}, function($ctx1) {$ctx1.fill(self,"messageText",{},$globals.ShadowingVariableError)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -128,7 +128,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: [",", "variableName"]
 }),
-globals.ShadowingVariableError);
+$globals.ShadowingVariableError);
 
 $vm.addMethod(
 $vm.method({
@@ -148,7 +148,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.ShadowingVariableError);
+$globals.ShadowingVariableError);
 
 $vm.addMethod(
 $vm.method({
@@ -167,13 +167,13 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.ShadowingVariableError);
+$globals.ShadowingVariableError);
 
 
 
-$vm.addClass('UnknownVariableError', globals.SemanticError, ['variableName'], 'Compiler-Exceptions');
+$vm.addClass('UnknownVariableError', $globals.SemanticError, ['variableName'], 'Compiler-Exceptions');
 //>>excludeStart("ide", pragmas.excludeIdeData);
-globals.UnknownVariableError.comment="I get signaled when a variable is not defined.\x0aThe default behavior is to allow it, as this is how Amber currently is able to seamlessly send messages to JavaScript objects.";
+$globals.UnknownVariableError.comment="I get signaled when a variable is not defined.\x0aThe default behavior is to allow it, as this is how Amber currently is able to seamlessly send messages to JavaScript objects.";
 //>>excludeEnd("ide");
 $vm.addMethod(
 $vm.method({
@@ -191,7 +191,7 @@ $ctx1.sendIdx[","]=1;
 //>>excludeEnd("ctx");
 return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"messageText",{},globals.UnknownVariableError)});
+}, function($ctx1) {$ctx1.fill(self,"messageText",{},$globals.UnknownVariableError)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -201,7 +201,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: [",", "variableName"]
 }),
-globals.UnknownVariableError);
+$globals.UnknownVariableError);
 
 $vm.addMethod(
 $vm.method({
@@ -221,7 +221,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.UnknownVariableError);
+$globals.UnknownVariableError);
 
 $vm.addMethod(
 $vm.method({
@@ -240,13 +240,13 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.UnknownVariableError);
+$globals.UnknownVariableError);
 
 
 
-$vm.addClass('RethrowErrorHandler', globals.Object, [], 'Compiler-Exceptions');
+$vm.addClass('RethrowErrorHandler', $globals.Object, [], 'Compiler-Exceptions');
 //>>excludeStart("ide", pragmas.excludeIdeData);
-globals.RethrowErrorHandler.comment="This class is used in the commandline version of the compiler.\x0aIt uses the handleError: message of ErrorHandler for printing the stacktrace and throws the error again as JS exception.\x0aAs a result Smalltalk errors are not swallowd by the Amber runtime and compilation can be aborted.";
+$globals.RethrowErrorHandler.comment="This class is used in the commandline version of the compiler.\x0aIt uses the handleError: message of ErrorHandler for printing the stacktrace and throws the error again as JS exception.\x0aAs a result Smalltalk errors are not swallowd by the Amber runtime and compilation can be aborted.";
 //>>excludeEnd("ide");
 $vm.addMethod(
 $vm.method({
@@ -260,7 +260,7 @@ return $vm.withContext(function($ctx1) {
 throw anError;
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"basicSignal:",{anError:anError},globals.RethrowErrorHandler)});
+}, function($ctx1) {$ctx1.fill(self,"basicSignal:",{anError:anError},$globals.RethrowErrorHandler)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -270,7 +270,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.RethrowErrorHandler);
+$globals.RethrowErrorHandler);
 
 $vm.addMethod(
 $vm.method({
@@ -284,7 +284,7 @@ return $vm.withContext(function($ctx1) {
 self._basicSignal_(anError);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"handleError:",{anError:anError},globals.RethrowErrorHandler)});
+}, function($ctx1) {$ctx1.fill(self,"handleError:",{anError:anError},$globals.RethrowErrorHandler)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -294,7 +294,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: ["basicSignal:"]
 }),
-globals.RethrowErrorHandler);
+$globals.RethrowErrorHandler);
 
 
 });

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


+ 2 - 2
src/Compiler-IR.st

@@ -966,7 +966,7 @@ visitIRDynamicArray: anIRDynamicArray
 !
 
 visitIRDynamicDictionary: anIRDynamicDictionary
-	self stream nextPutAll: 'globals.HashedCollection._newFromPairs_(['.
+	self stream nextPutAll: '$globals.HashedCollection._newFromPairs_(['.
 		anIRDynamicDictionary instructions
 			do: [ :each | self visit: each ]
 			separatedBy: [ self stream nextPutAll: ',' ].
@@ -1157,7 +1157,7 @@ nextPutClassRefFunction: aString
 	stream
 		nextPutAll: 'function $';
 		nextPutAll: aString;
-		nextPutAll: '(){return globals.';
+		nextPutAll: '(){return $globals.';
 		nextPutAll: aString;
 		nextPutAll: '||(typeof ';
 		nextPutAll: aString;

File diff suppressed because it is too large
+ 129 - 129
src/Compiler-Inlining.js


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


File diff suppressed because it is too large
+ 121 - 121
src/Compiler-Semantic.js


File diff suppressed because it is too large
+ 116 - 116
src/Compiler-Tests.js


+ 13 - 13
src/Examples.js

@@ -4,9 +4,9 @@ var smalltalk=$vm,_st=$recv,globals=$globals;
 $vm.addPackage('Examples');
 $vm.packages["Examples"].transport = {"type":"amd","amdNamespace":"amber_core"};
 
-$vm.addClass('Counter', globals.Widget, ['count', 'header'], 'Examples');
+$vm.addClass('Counter', $globals.Widget, ['count', 'header'], 'Examples');
 //>>excludeStart("ide", pragmas.excludeIdeData);
-globals.Counter.comment="This is a trivial Widget example mimicking the classic Counter example in Seaside.\x0aIn order to play with it, just evaluate the doit below in a workspace.\x0aThen take a look in the HTML document above the IDE.\x0a\x0a\x09\x09Counter tryExample";
+$globals.Counter.comment="This is a trivial Widget example mimicking the classic Counter example in Seaside.\x0aIn order to play with it, just evaluate the doit below in a workspace.\x0aThen take a look in the HTML document above the IDE.\x0a\x0a\x09\x09Counter tryExample";
 //>>excludeEnd("ide");
 $vm.addMethod(
 $vm.method({
@@ -29,7 +29,7 @@ return _st(html)._with_(_st(self["@count"])._asString());
 }));
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"decrease",{},globals.Counter)});
+}, function($ctx1) {$ctx1.fill(self,"decrease",{},$globals.Counter)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -39,7 +39,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: ["-", "contents:", "with:", "asString"]
 }),
-globals.Counter);
+$globals.Counter);
 
 $vm.addMethod(
 $vm.method({
@@ -62,7 +62,7 @@ return _st(html)._with_(_st(self["@count"])._asString());
 }));
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"increase",{},globals.Counter)});
+}, function($ctx1) {$ctx1.fill(self,"increase",{},$globals.Counter)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -72,7 +72,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: ["+", "contents:", "with:", "asString"]
 }),
-globals.Counter);
+$globals.Counter);
 
 $vm.addMethod(
 $vm.method({
@@ -87,14 +87,14 @@ return $vm.withContext(function($ctx1) {
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.supercall = true, 
 //>>excludeEnd("ctx");
-globals.Counter.superclass.fn.prototype._initialize.apply(_st(self), []));
+$globals.Counter.superclass.fn.prototype._initialize.apply(_st(self), []));
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.supercall = false;
 //>>excludeEnd("ctx");;
 self["@count"]=(0);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"initialize",{},globals.Counter)});
+}, function($ctx1) {$ctx1.fill(self,"initialize",{},$globals.Counter)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -104,7 +104,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: ["initialize"]
 }),
-globals.Counter);
+$globals.Counter);
 
 $vm.addMethod(
 $vm.method({
@@ -156,7 +156,7 @@ return self._decrease();
 }));
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"renderOn:",{html:html},globals.Counter)});
+}, function($ctx1) {$ctx1.fill(self,"renderOn:",{html:html},$globals.Counter)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -166,7 +166,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: ["with:", "h1", "asString", "yourself", "button", "onClick:", "increase", "decrease"]
 }),
-globals.Counter);
+$globals.Counter);
 
 
 $vm.addMethod(
@@ -181,7 +181,7 @@ return $vm.withContext(function($ctx1) {
 _st(self._new())._appendToJQuery_("body"._asJQuery());
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"tryExample",{},globals.Counter.klass)});
+}, function($ctx1) {$ctx1.fill(self,"tryExample",{},$globals.Counter.klass)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -191,6 +191,6 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: ["appendToJQuery:", "new", "asJQuery"]
 }),
-globals.Counter.klass);
+$globals.Counter.klass);
 
 });

File diff suppressed because it is too large
+ 120 - 120
src/IDE.js


+ 124 - 124
src/Kernel-Announcements.js

@@ -4,9 +4,9 @@ var smalltalk=$vm,_st=$recv,globals=$globals;
 $vm.addPackage('Kernel-Announcements');
 $vm.packages["Kernel-Announcements"].transport = {"type":"amd","amdNamespace":"amber_core"};
 
-$vm.addClass('AnnouncementSubscription', globals.Object, ['valuable', 'announcementClass'], 'Kernel-Announcements');
+$vm.addClass('AnnouncementSubscription', $globals.Object, ['valuable', 'announcementClass'], 'Kernel-Announcements');
 //>>excludeStart("ide", pragmas.excludeIdeData);
-globals.AnnouncementSubscription.comment="I am a single entry in a subscription registry of an `Announcer`.\x0aSeveral subscriptions by the same object is possible.";
+$globals.AnnouncementSubscription.comment="I am a single entry in a subscription registry of an `Announcer`.\x0aSeveral subscriptions by the same object is possible.";
 //>>excludeEnd("ide");
 $vm.addMethod(
 $vm.method({
@@ -26,7 +26,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.AnnouncementSubscription);
+$globals.AnnouncementSubscription);
 
 $vm.addMethod(
 $vm.method({
@@ -45,7 +45,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.AnnouncementSubscription);
+$globals.AnnouncementSubscription);
 
 $vm.addMethod(
 $vm.method({
@@ -61,7 +61,7 @@ self._deprecatedAPI();
 $1=self._valuable();
 return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"block",{},globals.AnnouncementSubscription)});
+}, function($ctx1) {$ctx1.fill(self,"block",{},$globals.AnnouncementSubscription)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -71,7 +71,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: ["deprecatedAPI", "valuable"]
 }),
-globals.AnnouncementSubscription);
+$globals.AnnouncementSubscription);
 
 $vm.addMethod(
 $vm.method({
@@ -86,7 +86,7 @@ self._deprecatedAPI();
 self._valuable_(aValuable);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"block:",{aValuable:aValuable},globals.AnnouncementSubscription)});
+}, function($ctx1) {$ctx1.fill(self,"block:",{aValuable:aValuable},$globals.AnnouncementSubscription)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -96,7 +96,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: ["deprecatedAPI", "valuable:"]
 }),
-globals.AnnouncementSubscription);
+$globals.AnnouncementSubscription);
 
 $vm.addMethod(
 $vm.method({
@@ -114,7 +114,7 @@ _st(self._valuable())._value_(anAnnouncement);
 };
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"deliver:",{anAnnouncement:anAnnouncement},globals.AnnouncementSubscription)});
+}, function($ctx1) {$ctx1.fill(self,"deliver:",{anAnnouncement:anAnnouncement},$globals.AnnouncementSubscription)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -124,7 +124,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: ["ifTrue:", "handlesAnnouncement:", "value:", "valuable"]
 }),
-globals.AnnouncementSubscription);
+$globals.AnnouncementSubscription);
 
 $vm.addMethod(
 $vm.method({
@@ -132,7 +132,7 @@ selector: "handlesAnnouncement:",
 protocol: 'announcing',
 fn: function (anAnnouncement){
 var self=this;
-function $Smalltalk(){return globals.Smalltalk||(typeof Smalltalk=="undefined"?nil:Smalltalk)}
+function $Smalltalk(){return $globals.Smalltalk||(typeof Smalltalk=="undefined"?nil:Smalltalk)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $vm.withContext(function($ctx1) { 
 //>>excludeEnd("ctx");
@@ -158,7 +158,7 @@ $1=_st(_st(_st($Smalltalk())._globals())._at_(_st(_st(_st(anAnnouncement)._class
 };
 return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"handlesAnnouncement:",{anAnnouncement:anAnnouncement},globals.AnnouncementSubscription)});
+}, function($ctx1) {$ctx1.fill(self,"handlesAnnouncement:",{anAnnouncement:anAnnouncement},$globals.AnnouncementSubscription)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -168,7 +168,7 @@ referencedClasses: ["Smalltalk"],
 //>>excludeEnd("ide");
 messageSends: ["ifNil:ifNotNil:", "at:", "globals", "name", "announcementClass", "includesBehavior:", "theNonMetaClass", "class"]
 }),
-globals.AnnouncementSubscription);
+$globals.AnnouncementSubscription);
 
 $vm.addMethod(
 $vm.method({
@@ -183,7 +183,7 @@ var $1;
 $1=_st(self._valuable())._receiver();
 return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"receiver",{},globals.AnnouncementSubscription)});
+}, function($ctx1) {$ctx1.fill(self,"receiver",{},$globals.AnnouncementSubscription)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -193,7 +193,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: ["receiver", "valuable"]
 }),
-globals.AnnouncementSubscription);
+$globals.AnnouncementSubscription);
 
 $vm.addMethod(
 $vm.method({
@@ -213,7 +213,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.AnnouncementSubscription);
+$globals.AnnouncementSubscription);
 
 $vm.addMethod(
 $vm.method({
@@ -232,13 +232,13 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.AnnouncementSubscription);
+$globals.AnnouncementSubscription);
 
 
 
-$vm.addClass('AnnouncementValuable', globals.Object, ['valuable', 'receiver'], 'Kernel-Announcements');
+$vm.addClass('AnnouncementValuable', $globals.Object, ['valuable', 'receiver'], 'Kernel-Announcements');
 //>>excludeStart("ide", pragmas.excludeIdeData);
-globals.AnnouncementValuable.comment="I wrap `valuable` objects (typically instances of `BlockClosure`) with a `receiver` to be able to unregister subscriptions based on a `receiver`.";
+$globals.AnnouncementValuable.comment="I wrap `valuable` objects (typically instances of `BlockClosure`) with a `receiver` to be able to unregister subscriptions based on a `receiver`.";
 //>>excludeEnd("ide");
 $vm.addMethod(
 $vm.method({
@@ -258,7 +258,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.AnnouncementValuable);
+$globals.AnnouncementValuable);
 
 $vm.addMethod(
 $vm.method({
@@ -277,7 +277,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.AnnouncementValuable);
+$globals.AnnouncementValuable);
 
 $vm.addMethod(
 $vm.method({
@@ -297,7 +297,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.AnnouncementValuable);
+$globals.AnnouncementValuable);
 
 $vm.addMethod(
 $vm.method({
@@ -316,7 +316,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.AnnouncementValuable);
+$globals.AnnouncementValuable);
 
 $vm.addMethod(
 $vm.method({
@@ -331,7 +331,7 @@ var $1;
 $1=_st(self._valuable())._value();
 return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"value",{},globals.AnnouncementValuable)});
+}, function($ctx1) {$ctx1.fill(self,"value",{},$globals.AnnouncementValuable)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -341,7 +341,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: ["value", "valuable"]
 }),
-globals.AnnouncementValuable);
+$globals.AnnouncementValuable);
 
 $vm.addMethod(
 $vm.method({
@@ -356,7 +356,7 @@ var $1;
 $1=_st(self._valuable())._value_(anObject);
 return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"value:",{anObject:anObject},globals.AnnouncementValuable)});
+}, function($ctx1) {$ctx1.fill(self,"value:",{anObject:anObject},$globals.AnnouncementValuable)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -366,13 +366,13 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: ["value:", "valuable"]
 }),
-globals.AnnouncementValuable);
+$globals.AnnouncementValuable);
 
 
 
-$vm.addClass('Announcer', globals.Object, ['registry', 'subscriptions'], 'Kernel-Announcements');
+$vm.addClass('Announcer', $globals.Object, ['registry', 'subscriptions'], 'Kernel-Announcements');
 //>>excludeStart("ide", pragmas.excludeIdeData);
-globals.Announcer.comment="I hold annoncement subscriptions (instances of `AnnouncementSubscription`) in a private registry.\x0aI announce (trigger) announces, which are then dispatched to all subscriptions.\x0a\x0aThe code is based on the announcements as [described by Vassili Bykov](http://www.cincomsmalltalk.com/userblogs/vbykov/blogView?searchCategory=Announcements%20Framework).\x0a\x0a## API\x0a\x0aUse `#announce:` to trigger an announcement.\x0a\x0aUse `#on:do:` or `#on:send:to:` to register subscriptions.\x0a\x0aWhen using `#on:send:to:`, unregistration can be done with `#unregister:`.\x0a\x0a## Usage example:\x0a\x0a    SystemAnnouncer current\x0a        on: ClassAdded\x0a        do: [ :ann | window alert: ann theClass name, ' added' ].";
+$globals.Announcer.comment="I hold annoncement subscriptions (instances of `AnnouncementSubscription`) in a private registry.\x0aI announce (trigger) announces, which are then dispatched to all subscriptions.\x0a\x0aThe code is based on the announcements as [described by Vassili Bykov](http://www.cincomsmalltalk.com/userblogs/vbykov/blogView?searchCategory=Announcements%20Framework).\x0a\x0a## API\x0a\x0aUse `#announce:` to trigger an announcement.\x0a\x0aUse `#on:do:` or `#on:send:to:` to register subscriptions.\x0a\x0aWhen using `#on:send:to:`, unregistration can be done with `#unregister:`.\x0a\x0a## Usage example:\x0a\x0a    SystemAnnouncer current\x0a        on: ClassAdded\x0a        do: [ :ann | window alert: ann theClass name, ' added' ].";
 //>>excludeEnd("ide");
 $vm.addMethod(
 $vm.method({
@@ -394,7 +394,7 @@ return _st(each)._deliver_(anAnnouncement);
 }));
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"announce:",{anAnnouncement:anAnnouncement},globals.Announcer)});
+}, function($ctx1) {$ctx1.fill(self,"announce:",{anAnnouncement:anAnnouncement},$globals.Announcer)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -404,7 +404,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: ["do:", "deliver:"]
 }),
-globals.Announcer);
+$globals.Announcer);
 
 $vm.addMethod(
 $vm.method({
@@ -412,7 +412,7 @@ selector: "initialize",
 protocol: 'initialization',
 fn: function (){
 var self=this;
-function $OrderedCollection(){return globals.OrderedCollection||(typeof OrderedCollection=="undefined"?nil:OrderedCollection)}
+function $OrderedCollection(){return $globals.OrderedCollection||(typeof OrderedCollection=="undefined"?nil:OrderedCollection)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $vm.withContext(function($ctx1) { 
 //>>excludeEnd("ctx");
@@ -420,14 +420,14 @@ return $vm.withContext(function($ctx1) {
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.supercall = true, 
 //>>excludeEnd("ctx");
-globals.Announcer.superclass.fn.prototype._initialize.apply(_st(self), []));
+$globals.Announcer.superclass.fn.prototype._initialize.apply(_st(self), []));
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.supercall = false;
 //>>excludeEnd("ctx");;
 self["@subscriptions"]=_st($OrderedCollection())._new();
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"initialize",{},globals.Announcer)});
+}, function($ctx1) {$ctx1.fill(self,"initialize",{},$globals.Announcer)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -437,7 +437,7 @@ referencedClasses: ["OrderedCollection"],
 //>>excludeEnd("ide");
 messageSends: ["initialize", "new"]
 }),
-globals.Announcer);
+$globals.Announcer);
 
 $vm.addMethod(
 $vm.method({
@@ -451,7 +451,7 @@ return $vm.withContext(function($ctx1) {
 self._on_do_for_(aClass,aBlock,nil);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"on:do:",{aClass:aClass,aBlock:aBlock},globals.Announcer)});
+}, function($ctx1) {$ctx1.fill(self,"on:do:",{aClass:aClass,aBlock:aBlock},$globals.Announcer)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -461,7 +461,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: ["on:do:for:"]
 }),
-globals.Announcer);
+$globals.Announcer);
 
 $vm.addMethod(
 $vm.method({
@@ -469,8 +469,8 @@ selector: "on:do:for:",
 protocol: 'subscribing',
 fn: function (aClass,aBlock,aReceiver){
 var self=this;
-function $AnnouncementSubscription(){return globals.AnnouncementSubscription||(typeof AnnouncementSubscription=="undefined"?nil:AnnouncementSubscription)}
-function $AnnouncementValuable(){return globals.AnnouncementValuable||(typeof AnnouncementValuable=="undefined"?nil:AnnouncementValuable)}
+function $AnnouncementSubscription(){return $globals.AnnouncementSubscription||(typeof AnnouncementSubscription=="undefined"?nil:AnnouncementSubscription)}
+function $AnnouncementValuable(){return $globals.AnnouncementValuable||(typeof AnnouncementValuable=="undefined"?nil:AnnouncementValuable)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $vm.withContext(function($ctx1) { 
 //>>excludeEnd("ctx");
@@ -499,7 +499,7 @@ $2=$8;
 _st($1)._add_($2);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"on:do:for:",{aClass:aClass,aBlock:aBlock,aReceiver:aReceiver},globals.Announcer)});
+}, function($ctx1) {$ctx1.fill(self,"on:do:for:",{aClass:aClass,aBlock:aBlock,aReceiver:aReceiver},$globals.Announcer)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -509,7 +509,7 @@ referencedClasses: ["AnnouncementSubscription", "AnnouncementValuable"],
 //>>excludeEnd("ide");
 messageSends: ["add:", "valuable:", "new", "receiver:", "yourself", "announcementClass:"]
 }),
-globals.Announcer);
+$globals.Announcer);
 
 $vm.addMethod(
 $vm.method({
@@ -518,7 +518,7 @@ protocol: 'subscribing',
 fn: function (aClass,aBlock){
 var self=this;
 var subscription;
-function $AnnouncementSubscription(){return globals.AnnouncementSubscription||(typeof AnnouncementSubscription=="undefined"?nil:AnnouncementSubscription)}
+function $AnnouncementSubscription(){return $globals.AnnouncementSubscription||(typeof AnnouncementSubscription=="undefined"?nil:AnnouncementSubscription)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $vm.withContext(function($ctx1) { 
 //>>excludeEnd("ctx");
@@ -540,7 +540,7 @@ return _st(aBlock)._value_(ann);
 _st(self["@subscriptions"])._add_(subscription);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"on:doOnce:",{aClass:aClass,aBlock:aBlock,subscription:subscription},globals.Announcer)});
+}, function($ctx1) {$ctx1.fill(self,"on:doOnce:",{aClass:aClass,aBlock:aBlock,subscription:subscription},$globals.Announcer)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -550,7 +550,7 @@ referencedClasses: ["AnnouncementSubscription"],
 //>>excludeEnd("ide");
 messageSends: ["announcementClass:", "new", "yourself", "valuable:", "remove:", "value:", "add:"]
 }),
-globals.Announcer);
+$globals.Announcer);
 
 $vm.addMethod(
 $vm.method({
@@ -558,8 +558,8 @@ selector: "on:send:to:",
 protocol: 'subscribing',
 fn: function (aClass,aSelector,anObject){
 var self=this;
-function $AnnouncementSubscription(){return globals.AnnouncementSubscription||(typeof AnnouncementSubscription=="undefined"?nil:AnnouncementSubscription)}
-function $MessageSend(){return globals.MessageSend||(typeof MessageSend=="undefined"?nil:MessageSend)}
+function $AnnouncementSubscription(){return $globals.AnnouncementSubscription||(typeof AnnouncementSubscription=="undefined"?nil:AnnouncementSubscription)}
+function $MessageSend(){return $globals.MessageSend||(typeof MessageSend=="undefined"?nil:MessageSend)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $vm.withContext(function($ctx1) { 
 //>>excludeEnd("ctx");
@@ -585,7 +585,7 @@ $2=$8;
 _st($1)._add_($2);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"on:send:to:",{aClass:aClass,aSelector:aSelector,anObject:anObject},globals.Announcer)});
+}, function($ctx1) {$ctx1.fill(self,"on:send:to:",{aClass:aClass,aSelector:aSelector,anObject:anObject},$globals.Announcer)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -595,7 +595,7 @@ referencedClasses: ["AnnouncementSubscription", "MessageSend"],
 //>>excludeEnd("ide");
 messageSends: ["add:", "valuable:", "new", "receiver:", "selector:", "yourself", "announcementClass:"]
 }),
-globals.Announcer);
+$globals.Announcer);
 
 $vm.addMethod(
 $vm.method({
@@ -617,7 +617,7 @@ return _st(_st(each)._receiver()).__eq(anObject);
 }));
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"unsubscribe:",{anObject:anObject},globals.Announcer)});
+}, function($ctx1) {$ctx1.fill(self,"unsubscribe:",{anObject:anObject},$globals.Announcer)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -627,16 +627,16 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: ["reject:", "=", "receiver"]
 }),
-globals.Announcer);
+$globals.Announcer);
 
 
 
-$vm.addClass('SystemAnnouncer', globals.Announcer, [], 'Kernel-Announcements');
+$vm.addClass('SystemAnnouncer', $globals.Announcer, [], 'Kernel-Announcements');
 //>>excludeStart("ide", pragmas.excludeIdeData);
-globals.SystemAnnouncer.comment="My unique instance is the global announcer handling all Amber system-related announces.\x0a\x0a## API\x0a\x0aAccess to the unique instance is done via `#current`";
+$globals.SystemAnnouncer.comment="My unique instance is the global announcer handling all Amber system-related announces.\x0a\x0a## API\x0a\x0aAccess to the unique instance is done via `#current`";
 //>>excludeEnd("ide");
 
-globals.SystemAnnouncer.klass.iVarNames = ['current'];
+$globals.SystemAnnouncer.klass.iVarNames = ['current'];
 $vm.addMethod(
 $vm.method({
 selector: "current",
@@ -653,7 +653,7 @@ self["@current"]=(
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.supercall = true, 
 //>>excludeEnd("ctx");
-globals.SystemAnnouncer.klass.superclass.fn.prototype._new.apply(_st(self), []));
+$globals.SystemAnnouncer.klass.superclass.fn.prototype._new.apply(_st(self), []));
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.supercall = false;
 //>>excludeEnd("ctx");;
@@ -663,7 +663,7 @@ $1=$2;
 };
 return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"current",{},globals.SystemAnnouncer.klass)});
+}, function($ctx1) {$ctx1.fill(self,"current",{},$globals.SystemAnnouncer.klass)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -673,7 +673,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: ["ifNil:", "new"]
 }),
-globals.SystemAnnouncer.klass);
+$globals.SystemAnnouncer.klass);
 
 $vm.addMethod(
 $vm.method({
@@ -687,7 +687,7 @@ return $vm.withContext(function($ctx1) {
 self._shouldNotImplement();
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"new",{},globals.SystemAnnouncer.klass)});
+}, function($ctx1) {$ctx1.fill(self,"new",{},$globals.SystemAnnouncer.klass)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -697,12 +697,12 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: ["shouldNotImplement"]
 }),
-globals.SystemAnnouncer.klass);
+$globals.SystemAnnouncer.klass);
 
 
-$vm.addClass('SystemAnnouncement', globals.Object, [], 'Kernel-Announcements');
+$vm.addClass('SystemAnnouncement', $globals.Object, [], 'Kernel-Announcements');
 //>>excludeStart("ide", pragmas.excludeIdeData);
-globals.SystemAnnouncement.comment="I am the superclass of all system announcements";
+$globals.SystemAnnouncement.comment="I am the superclass of all system announcements";
 //>>excludeEnd("ide");
 
 $vm.addMethod(
@@ -721,12 +721,12 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.SystemAnnouncement.klass);
+$globals.SystemAnnouncement.klass);
 
 
-$vm.addClass('ClassAnnouncement', globals.SystemAnnouncement, ['theClass'], 'Kernel-Announcements');
+$vm.addClass('ClassAnnouncement', $globals.SystemAnnouncement, ['theClass'], 'Kernel-Announcements');
 //>>excludeStart("ide", pragmas.excludeIdeData);
-globals.ClassAnnouncement.comment="I am the abstract superclass of class-related announcements.";
+$globals.ClassAnnouncement.comment="I am the abstract superclass of class-related announcements.";
 //>>excludeEnd("ide");
 $vm.addMethod(
 $vm.method({
@@ -746,7 +746,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.ClassAnnouncement);
+$globals.ClassAnnouncement);
 
 $vm.addMethod(
 $vm.method({
@@ -765,31 +765,31 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.ClassAnnouncement);
+$globals.ClassAnnouncement);
 
 
 
-$vm.addClass('ClassAdded', globals.ClassAnnouncement, [], 'Kernel-Announcements');
+$vm.addClass('ClassAdded', $globals.ClassAnnouncement, [], 'Kernel-Announcements');
 //>>excludeStart("ide", pragmas.excludeIdeData);
-globals.ClassAdded.comment="I am emitted when a class is added to the system.\x0aSee ClassBuilder >> #addSubclassOf:... methods";
+$globals.ClassAdded.comment="I am emitted when a class is added to the system.\x0aSee ClassBuilder >> #addSubclassOf:... methods";
 //>>excludeEnd("ide");
 
 
-$vm.addClass('ClassCommentChanged', globals.ClassAnnouncement, [], 'Kernel-Announcements');
+$vm.addClass('ClassCommentChanged', $globals.ClassAnnouncement, [], 'Kernel-Announcements');
 //>>excludeStart("ide", pragmas.excludeIdeData);
-globals.ClassCommentChanged.comment="I am emitted when the comment of a class changes. (Behavior >> #comment)";
+$globals.ClassCommentChanged.comment="I am emitted when the comment of a class changes. (Behavior >> #comment)";
 //>>excludeEnd("ide");
 
 
-$vm.addClass('ClassDefinitionChanged', globals.ClassAnnouncement, [], 'Kernel-Announcements');
+$vm.addClass('ClassDefinitionChanged', $globals.ClassAnnouncement, [], 'Kernel-Announcements');
 //>>excludeStart("ide", pragmas.excludeIdeData);
-globals.ClassDefinitionChanged.comment="I am emitted when the definition of a class changes.\x0aSee ClassBuilder >> #class:instanceVariableNames:";
+$globals.ClassDefinitionChanged.comment="I am emitted when the definition of a class changes.\x0aSee ClassBuilder >> #class:instanceVariableNames:";
 //>>excludeEnd("ide");
 
 
-$vm.addClass('ClassMigrated', globals.ClassAnnouncement, ['oldClass'], 'Kernel-Announcements');
+$vm.addClass('ClassMigrated', $globals.ClassAnnouncement, ['oldClass'], 'Kernel-Announcements');
 //>>excludeStart("ide", pragmas.excludeIdeData);
-globals.ClassMigrated.comment="I am emitted when a class is migrated.";
+$globals.ClassMigrated.comment="I am emitted when a class is migrated.";
 //>>excludeEnd("ide");
 $vm.addMethod(
 $vm.method({
@@ -809,7 +809,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.ClassMigrated);
+$globals.ClassMigrated);
 
 $vm.addMethod(
 $vm.method({
@@ -828,13 +828,13 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.ClassMigrated);
+$globals.ClassMigrated);
 
 
 
-$vm.addClass('ClassMoved', globals.ClassAnnouncement, ['oldPackage'], 'Kernel-Announcements');
+$vm.addClass('ClassMoved', $globals.ClassAnnouncement, ['oldPackage'], 'Kernel-Announcements');
 //>>excludeStart("ide", pragmas.excludeIdeData);
-globals.ClassMoved.comment="I am emitted when a class is moved from one package to another.";
+$globals.ClassMoved.comment="I am emitted when a class is moved from one package to another.";
 //>>excludeEnd("ide");
 $vm.addMethod(
 $vm.method({
@@ -854,7 +854,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.ClassMoved);
+$globals.ClassMoved);
 
 $vm.addMethod(
 $vm.method({
@@ -873,25 +873,25 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.ClassMoved);
+$globals.ClassMoved);
 
 
 
-$vm.addClass('ClassRemoved', globals.ClassAnnouncement, [], 'Kernel-Announcements');
+$vm.addClass('ClassRemoved', $globals.ClassAnnouncement, [], 'Kernel-Announcements');
 //>>excludeStart("ide", pragmas.excludeIdeData);
-globals.ClassRemoved.comment="I am emitted when a class is removed.\x0aSee Smalltalk >> #removeClass:";
+$globals.ClassRemoved.comment="I am emitted when a class is removed.\x0aSee Smalltalk >> #removeClass:";
 //>>excludeEnd("ide");
 
 
-$vm.addClass('ClassRenamed', globals.ClassAnnouncement, [], 'Kernel-Announcements');
+$vm.addClass('ClassRenamed', $globals.ClassAnnouncement, [], 'Kernel-Announcements');
 //>>excludeStart("ide", pragmas.excludeIdeData);
-globals.ClassRenamed.comment="I am emitted when a class is renamed.\x0aSee ClassBuilder >> #renameClass:to:";
+$globals.ClassRenamed.comment="I am emitted when a class is renamed.\x0aSee ClassBuilder >> #renameClass:to:";
 //>>excludeEnd("ide");
 
 
-$vm.addClass('MethodAnnouncement', globals.SystemAnnouncement, ['method'], 'Kernel-Announcements');
+$vm.addClass('MethodAnnouncement', $globals.SystemAnnouncement, ['method'], 'Kernel-Announcements');
 //>>excludeStart("ide", pragmas.excludeIdeData);
-globals.MethodAnnouncement.comment="I am the abstract superclass of method-related announcements.";
+$globals.MethodAnnouncement.comment="I am the abstract superclass of method-related announcements.";
 //>>excludeEnd("ide");
 $vm.addMethod(
 $vm.method({
@@ -911,7 +911,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.MethodAnnouncement);
+$globals.MethodAnnouncement);
 
 $vm.addMethod(
 $vm.method({
@@ -930,19 +930,19 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.MethodAnnouncement);
+$globals.MethodAnnouncement);
 
 
 
-$vm.addClass('MethodAdded', globals.MethodAnnouncement, [], 'Kernel-Announcements');
+$vm.addClass('MethodAdded', $globals.MethodAnnouncement, [], 'Kernel-Announcements');
 //>>excludeStart("ide", pragmas.excludeIdeData);
-globals.MethodAdded.comment="I am emitted when a `CompiledMethod` is added to a class.";
+$globals.MethodAdded.comment="I am emitted when a `CompiledMethod` is added to a class.";
 //>>excludeEnd("ide");
 
 
-$vm.addClass('MethodModified', globals.MethodAnnouncement, ['oldMethod'], 'Kernel-Announcements');
+$vm.addClass('MethodModified', $globals.MethodAnnouncement, ['oldMethod'], 'Kernel-Announcements');
 //>>excludeStart("ide", pragmas.excludeIdeData);
-globals.MethodModified.comment="I am emitted when a `CompiledMethod` is modified (a new method is installed). I hold a reference to the old method being replaced.";
+$globals.MethodModified.comment="I am emitted when a `CompiledMethod` is modified (a new method is installed). I hold a reference to the old method being replaced.";
 //>>excludeEnd("ide");
 $vm.addMethod(
 $vm.method({
@@ -962,7 +962,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.MethodModified);
+$globals.MethodModified);
 
 $vm.addMethod(
 $vm.method({
@@ -981,13 +981,13 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.MethodModified);
+$globals.MethodModified);
 
 
 
-$vm.addClass('MethodMoved', globals.MethodAnnouncement, ['oldProtocol'], 'Kernel-Announcements');
+$vm.addClass('MethodMoved', $globals.MethodAnnouncement, ['oldProtocol'], 'Kernel-Announcements');
 //>>excludeStart("ide", pragmas.excludeIdeData);
-globals.MethodMoved.comment="I am emitted when a `CompiledMethod` is moved to another protocol. I hold a refernce to the old protocol of the method.";
+$globals.MethodMoved.comment="I am emitted when a `CompiledMethod` is moved to another protocol. I hold a refernce to the old protocol of the method.";
 //>>excludeEnd("ide");
 $vm.addMethod(
 $vm.method({
@@ -1007,7 +1007,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.MethodMoved);
+$globals.MethodMoved);
 
 $vm.addMethod(
 $vm.method({
@@ -1026,19 +1026,19 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.MethodMoved);
+$globals.MethodMoved);
 
 
 
-$vm.addClass('MethodRemoved', globals.MethodAnnouncement, [], 'Kernel-Announcements');
+$vm.addClass('MethodRemoved', $globals.MethodAnnouncement, [], 'Kernel-Announcements');
 //>>excludeStart("ide", pragmas.excludeIdeData);
-globals.MethodRemoved.comment="I am emitted when a `CompiledMethod` is removed from a class.";
+$globals.MethodRemoved.comment="I am emitted when a `CompiledMethod` is removed from a class.";
 //>>excludeEnd("ide");
 
 
-$vm.addClass('PackageAnnouncement', globals.SystemAnnouncement, ['package'], 'Kernel-Announcements');
+$vm.addClass('PackageAnnouncement', $globals.SystemAnnouncement, ['package'], 'Kernel-Announcements');
 //>>excludeStart("ide", pragmas.excludeIdeData);
-globals.PackageAnnouncement.comment="I am the abstract superclass of package-related announcements.";
+$globals.PackageAnnouncement.comment="I am the abstract superclass of package-related announcements.";
 //>>excludeEnd("ide");
 $vm.addMethod(
 $vm.method({
@@ -1058,7 +1058,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.PackageAnnouncement);
+$globals.PackageAnnouncement);
 
 $vm.addMethod(
 $vm.method({
@@ -1077,37 +1077,37 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.PackageAnnouncement);
+$globals.PackageAnnouncement);
 
 
 
-$vm.addClass('PackageAdded', globals.PackageAnnouncement, [], 'Kernel-Announcements');
+$vm.addClass('PackageAdded', $globals.PackageAnnouncement, [], 'Kernel-Announcements');
 //>>excludeStart("ide", pragmas.excludeIdeData);
-globals.PackageAdded.comment="I am emitted when a `Package` is added to the system.";
+$globals.PackageAdded.comment="I am emitted when a `Package` is added to the system.";
 //>>excludeEnd("ide");
 
 
-$vm.addClass('PackageClean', globals.PackageAnnouncement, [], 'Kernel-Announcements');
+$vm.addClass('PackageClean', $globals.PackageAnnouncement, [], 'Kernel-Announcements');
 //>>excludeStart("ide", pragmas.excludeIdeData);
-globals.PackageClean.comment="I am emitted when a package is committed and becomes clean.";
+$globals.PackageClean.comment="I am emitted when a package is committed and becomes clean.";
 //>>excludeEnd("ide");
 
 
-$vm.addClass('PackageDirty', globals.PackageAnnouncement, [], 'Kernel-Announcements');
+$vm.addClass('PackageDirty', $globals.PackageAnnouncement, [], 'Kernel-Announcements');
 //>>excludeStart("ide", pragmas.excludeIdeData);
-globals.PackageDirty.comment="I am emitted when a package becomes dirty.";
+$globals.PackageDirty.comment="I am emitted when a package becomes dirty.";
 //>>excludeEnd("ide");
 
 
-$vm.addClass('PackageRemoved', globals.PackageAnnouncement, [], 'Kernel-Announcements');
+$vm.addClass('PackageRemoved', $globals.PackageAnnouncement, [], 'Kernel-Announcements');
 //>>excludeStart("ide", pragmas.excludeIdeData);
-globals.PackageRemoved.comment="I am emitted when a `Package` is removed from the system.";
+$globals.PackageRemoved.comment="I am emitted when a `Package` is removed from the system.";
 //>>excludeEnd("ide");
 
 
-$vm.addClass('ProtocolAnnouncement', globals.SystemAnnouncement, ['theClass', 'protocol'], 'Kernel-Announcements');
+$vm.addClass('ProtocolAnnouncement', $globals.SystemAnnouncement, ['theClass', 'protocol'], 'Kernel-Announcements');
 //>>excludeStart("ide", pragmas.excludeIdeData);
-globals.ProtocolAnnouncement.comment="I am the abstract superclass of protocol-related announcements.";
+$globals.ProtocolAnnouncement.comment="I am the abstract superclass of protocol-related announcements.";
 //>>excludeEnd("ide");
 $vm.addMethod(
 $vm.method({
@@ -1115,7 +1115,7 @@ selector: "package",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $Package(){return globals.Package||(typeof Package=="undefined"?nil:Package)}
+function $Package(){return $globals.Package||(typeof Package=="undefined"?nil:Package)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $vm.withContext(function($ctx1) { 
 //>>excludeEnd("ctx");
@@ -1135,7 +1135,7 @@ return nil;
 }));
 return $4;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"package",{},globals.ProtocolAnnouncement)});
+}, function($ctx1) {$ctx1.fill(self,"package",{},$globals.ProtocolAnnouncement)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -1145,7 +1145,7 @@ referencedClasses: ["Package"],
 //>>excludeEnd("ide");
 messageSends: ["ifFalse:", "beginsWith:", "protocol", "package", "theClass", "named:ifAbsent:", "allButFirst"]
 }),
-globals.ProtocolAnnouncement);
+$globals.ProtocolAnnouncement);
 
 $vm.addMethod(
 $vm.method({
@@ -1165,7 +1165,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.ProtocolAnnouncement);
+$globals.ProtocolAnnouncement);
 
 $vm.addMethod(
 $vm.method({
@@ -1184,7 +1184,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.ProtocolAnnouncement);
+$globals.ProtocolAnnouncement);
 
 $vm.addMethod(
 $vm.method({
@@ -1204,7 +1204,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.ProtocolAnnouncement);
+$globals.ProtocolAnnouncement);
 
 $vm.addMethod(
 $vm.method({
@@ -1223,19 +1223,19 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.ProtocolAnnouncement);
+$globals.ProtocolAnnouncement);
 
 
 
-$vm.addClass('ProtocolAdded', globals.ProtocolAnnouncement, [], 'Kernel-Announcements');
+$vm.addClass('ProtocolAdded', $globals.ProtocolAnnouncement, [], 'Kernel-Announcements');
 //>>excludeStart("ide", pragmas.excludeIdeData);
-globals.ProtocolAdded.comment="I am emitted when a protocol is added to a class.";
+$globals.ProtocolAdded.comment="I am emitted when a protocol is added to a class.";
 //>>excludeEnd("ide");
 
 
-$vm.addClass('ProtocolRemoved', globals.ProtocolAnnouncement, [], 'Kernel-Announcements');
+$vm.addClass('ProtocolRemoved', $globals.ProtocolAnnouncement, [], 'Kernel-Announcements');
 //>>excludeStart("ide", pragmas.excludeIdeData);
-globals.ProtocolRemoved.comment="I am emitted when a protocol is removed from a class.";
+$globals.ProtocolRemoved.comment="I am emitted when a protocol is removed from a class.";
 //>>excludeEnd("ide");
 
 });

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


+ 7 - 7
src/Kernel-Classes.st

@@ -119,7 +119,7 @@ methodAt: aString
 !
 
 methodDictionary
-	<var dict = globals.HashedCollection._new();
+	<var dict = $globals.HashedCollection._new();
 	var methods = self.methods;
 	Object.keys(methods).forEach(function(i) {
 		if(methods[i].selector) {
@@ -451,7 +451,7 @@ subclass: aString instanceVariableNames: aString2 package: aString3
 !Class methodsFor: 'converting'!
 
 asJavascript
-	^ 'globals.', self name
+	^ '$globals.', self name
 ! !
 
 !Class methodsFor: 'printing'!
@@ -517,7 +517,7 @@ theNonMetaClass
 !Metaclass methodsFor: 'converting'!
 
 asJavascript
-	^ 'globals.', self instanceClass name, '.klass'
+	^ '$globals.', self instanceClass name, '.klass'
 ! !
 
 !Metaclass methodsFor: 'printing'!
@@ -713,7 +713,7 @@ installMethod: aCompiledMethod forClass: aBehavior protocol: aString
 basicAddSubclassOf: aClass named: aString instanceVariableNames: aCollection package: packageName
 	<
 		$vm.addClass(aString, aClass, aCollection, packageName);
-		return globals[aString]
+		return $globals[aString]
 	>
 !
 
@@ -733,8 +733,8 @@ basicRemoveClass: aClass
 
 basicRenameClass: aClass to: aString
 	<
-		globals[aString] = aClass;
-		delete globals[aClass.className];
+		$globals[aString] = aClass;
+		delete $globals[aClass.className];
 		aClass.className = aString;
 	>
 !
@@ -749,7 +749,7 @@ basicSwapClassNames: aClass with: anotherClass
 
 rawRenameClass: aClass to: aString
 	<
-		globals[aString] = aClass;
+		$globals[aString] = aClass;
 	>
 ! !
 

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


+ 64 - 64
src/Kernel-Exceptions.js

@@ -4,9 +4,9 @@ var smalltalk=$vm,_st=$recv,globals=$globals;
 $vm.addPackage('Kernel-Exceptions');
 $vm.packages["Kernel-Exceptions"].transport = {"type":"amd","amdNamespace":"amber_core"};
 
-$vm.addClass('Error', globals.Object, ['messageText'], 'Kernel-Exceptions');
+$vm.addClass('Error', $globals.Object, ['messageText'], 'Kernel-Exceptions');
 //>>excludeStart("ide", pragmas.excludeIdeData);
-globals.Error.comment="From the ANSI standard:\x0a\x0aThis protocol describes the behavior of instances of class `Error`.\x0aThese are used to represent error conditions that prevent the normal continuation of processing.\x0aActual error exceptions used by an application may be subclasses of this class.\x0aAs `Error` is explicitly specified to be subclassable, conforming implementations must implement its behavior in a non-fragile manner.";
+$globals.Error.comment="From the ANSI standard:\x0a\x0aThis protocol describes the behavior of instances of class `Error`.\x0aThese are used to represent error conditions that prevent the normal continuation of processing.\x0aActual error exceptions used by an application may be subclasses of this class.\x0aAs `Error` is explicitly specified to be subclassable, conforming implementations must implement its behavior in a non-fragile manner.";
 //>>excludeEnd("ide");
 $vm.addMethod(
 $vm.method({
@@ -20,7 +20,7 @@ return $vm.withContext(function($ctx1) {
 self.amberHandled = true;
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"beHandled",{},globals.Error)});
+}, function($ctx1) {$ctx1.fill(self,"beHandled",{},$globals.Error)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -30,7 +30,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.Error);
+$globals.Error);
 
 $vm.addMethod(
 $vm.method({
@@ -44,7 +44,7 @@ return $vm.withContext(function($ctx1) {
 self.amberHandled = false;
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"beUnhandled",{},globals.Error)});
+}, function($ctx1) {$ctx1.fill(self,"beUnhandled",{},$globals.Error)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -54,7 +54,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.Error);
+$globals.Error);
 
 $vm.addMethod(
 $vm.method({
@@ -68,7 +68,7 @@ return $vm.withContext(function($ctx1) {
 return self.context;
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"context",{},globals.Error)});
+}, function($ctx1) {$ctx1.fill(self,"context",{},$globals.Error)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -78,7 +78,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.Error);
+$globals.Error);
 
 $vm.addMethod(
 $vm.method({
@@ -92,7 +92,7 @@ return $vm.withContext(function($ctx1) {
 self._messageText_("Errorclass: ".__comma(_st(self._class())._name()));
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"initialize",{},globals.Error)});
+}, function($ctx1) {$ctx1.fill(self,"initialize",{},$globals.Error)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -102,7 +102,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: ["messageText:", ",", "name", "class"]
 }),
-globals.Error);
+$globals.Error);
 
 $vm.addMethod(
 $vm.method({
@@ -116,7 +116,7 @@ return $vm.withContext(function($ctx1) {
 return self.smalltalkError === true;
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"isSmalltalkError",{},globals.Error)});
+}, function($ctx1) {$ctx1.fill(self,"isSmalltalkError",{},$globals.Error)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -126,7 +126,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.Error);
+$globals.Error);
 
 $vm.addMethod(
 $vm.method({
@@ -140,7 +140,7 @@ return $vm.withContext(function($ctx1) {
 return self.stack;
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"jsStack",{},globals.Error)});
+}, function($ctx1) {$ctx1.fill(self,"jsStack",{},$globals.Error)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -150,7 +150,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.Error);
+$globals.Error);
 
 $vm.addMethod(
 $vm.method({
@@ -170,7 +170,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.Error);
+$globals.Error);
 
 $vm.addMethod(
 $vm.method({
@@ -189,7 +189,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.Error);
+$globals.Error);
 
 $vm.addMethod(
 $vm.method({
@@ -206,7 +206,7 @@ return $vm.withContext(function($ctx1) {
 	;
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"resignal",{},globals.Error)});
+}, function($ctx1) {$ctx1.fill(self,"resignal",{},$globals.Error)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -216,7 +216,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.Error);
+$globals.Error);
 
 $vm.addMethod(
 $vm.method({
@@ -235,7 +235,7 @@ return $vm.withContext(function($ctx1) {
 	;
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"signal",{},globals.Error)});
+}, function($ctx1) {$ctx1.fill(self,"signal",{},$globals.Error)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -245,7 +245,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.Error);
+$globals.Error);
 
 $vm.addMethod(
 $vm.method({
@@ -260,7 +260,7 @@ self._messageText_(aString);
 self._signal();
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"signal:",{aString:aString},globals.Error)});
+}, function($ctx1) {$ctx1.fill(self,"signal:",{aString:aString},$globals.Error)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -270,7 +270,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: ["messageText:", "signal"]
 }),
-globals.Error);
+$globals.Error);
 
 $vm.addMethod(
 $vm.method({
@@ -285,7 +285,7 @@ var $1;
 $1=self._signalerContextFrom_(self._context());
 return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"signalerContext",{},globals.Error)});
+}, function($ctx1) {$ctx1.fill(self,"signalerContext",{},$globals.Error)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -295,7 +295,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: ["signalerContextFrom:", "context"]
 }),
-globals.Error);
+$globals.Error);
 
 $vm.addMethod(
 $vm.method({
@@ -335,7 +335,7 @@ return _st($2)._not();
 }));
 return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"signalerContextFrom:",{aContext:aContext},globals.Error)});
+}, function($ctx1) {$ctx1.fill(self,"signalerContextFrom:",{aContext:aContext},$globals.Error)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -345,7 +345,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: ["findContextSuchThat:", "not", "or:", "==", "receiver", "class"]
 }),
-globals.Error);
+$globals.Error);
 
 $vm.addMethod(
 $vm.method({
@@ -359,7 +359,7 @@ return $vm.withContext(function($ctx1) {
 return self.amberHandled || false;
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"wasHandled",{},globals.Error)});
+}, function($ctx1) {$ctx1.fill(self,"wasHandled",{},$globals.Error)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -369,7 +369,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.Error);
+$globals.Error);
 
 
 $vm.addMethod(
@@ -388,7 +388,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.Error.klass);
+$globals.Error.klass);
 
 $vm.addMethod(
 $vm.method({
@@ -403,7 +403,7 @@ var $1;
 $1=_st(self._new())._signal();
 return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"signal",{},globals.Error.klass)});
+}, function($ctx1) {$ctx1.fill(self,"signal",{},$globals.Error.klass)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -413,7 +413,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: ["signal", "new"]
 }),
-globals.Error.klass);
+$globals.Error.klass);
 
 $vm.addMethod(
 $vm.method({
@@ -428,7 +428,7 @@ var $1;
 $1=_st(self._new())._signal_(aString);
 return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"signal:",{aString:aString},globals.Error.klass)});
+}, function($ctx1) {$ctx1.fill(self,"signal:",{aString:aString},$globals.Error.klass)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -438,12 +438,12 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: ["signal:", "new"]
 }),
-globals.Error.klass);
+$globals.Error.klass);
 
 
-$vm.addClass('Halt', globals.Error, [], 'Kernel-Exceptions');
+$vm.addClass('Halt', $globals.Error, [], 'Kernel-Exceptions');
 //>>excludeStart("ide", pragmas.excludeIdeData);
-globals.Halt.comment="I am provided to support `Object>>#halt`.";
+$globals.Halt.comment="I am provided to support `Object>>#halt`.";
 //>>excludeEnd("ide");
 $vm.addMethod(
 $vm.method({
@@ -461,7 +461,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.Halt);
+$globals.Halt);
 
 $vm.addMethod(
 $vm.method({
@@ -512,7 +512,7 @@ return _st($2)._not();
 }));
 return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"signalerContextFrom:",{aContext:aContext},globals.Halt)});
+}, function($ctx1) {$ctx1.fill(self,"signalerContextFrom:",{aContext:aContext},$globals.Halt)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -522,13 +522,13 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: ["findContextSuchThat:", "not", "or:", "==", "receiver", "class", "=", "selector", "method"]
 }),
-globals.Halt);
+$globals.Halt);
 
 
 
-$vm.addClass('JavaScriptException', globals.Error, ['exception'], 'Kernel-Exceptions');
+$vm.addClass('JavaScriptException', $globals.Error, ['exception'], 'Kernel-Exceptions');
 //>>excludeStart("ide", pragmas.excludeIdeData);
-globals.JavaScriptException.comment="A JavaScriptException is thrown when a non-Smalltalk exception occurs while in the Smalltalk stack.\x0aSee `boot.js` `inContext()` and `BlockClosure >> on:do:`";
+$globals.JavaScriptException.comment="A JavaScriptException is thrown when a non-Smalltalk exception occurs while in the Smalltalk stack.\x0aSee `boot.js` `inContext()` and `BlockClosure >> on:do:`";
 //>>excludeEnd("ide");
 $vm.addMethod(
 $vm.method({
@@ -542,7 +542,7 @@ return $vm.withContext(function($ctx1) {
 self.context = aMethodContext;
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"context:",{aMethodContext:aMethodContext},globals.JavaScriptException)});
+}, function($ctx1) {$ctx1.fill(self,"context:",{aMethodContext:aMethodContext},$globals.JavaScriptException)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -552,7 +552,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.JavaScriptException);
+$globals.JavaScriptException);
 
 $vm.addMethod(
 $vm.method({
@@ -572,7 +572,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.JavaScriptException);
+$globals.JavaScriptException);
 
 $vm.addMethod(
 $vm.method({
@@ -591,7 +591,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.JavaScriptException);
+$globals.JavaScriptException);
 
 $vm.addMethod(
 $vm.method({
@@ -605,7 +605,7 @@ return $vm.withContext(function($ctx1) {
 return 'JavaScript exception: ' + self["@exception"].toString();
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"messageText",{},globals.JavaScriptException)});
+}, function($ctx1) {$ctx1.fill(self,"messageText",{},$globals.JavaScriptException)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -615,7 +615,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.JavaScriptException);
+$globals.JavaScriptException);
 
 
 $vm.addMethod(
@@ -634,7 +634,7 @@ $3=_st($2)._yourself();
 $1=$3;
 return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"on:",{anException:anException},globals.JavaScriptException.klass)});
+}, function($ctx1) {$ctx1.fill(self,"on:",{anException:anException},$globals.JavaScriptException.klass)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -644,7 +644,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: ["exception:", "new", "yourself"]
 }),
-globals.JavaScriptException.klass);
+$globals.JavaScriptException.klass);
 
 $vm.addMethod(
 $vm.method({
@@ -663,7 +663,7 @@ $3=_st($2)._yourself();
 $1=$3;
 return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"on:context:",{anException:anException,aMethodContext:aMethodContext},globals.JavaScriptException.klass)});
+}, function($ctx1) {$ctx1.fill(self,"on:context:",{anException:anException,aMethodContext:aMethodContext},$globals.JavaScriptException.klass)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -673,12 +673,12 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: ["exception:", "new", "context:", "yourself"]
 }),
-globals.JavaScriptException.klass);
+$globals.JavaScriptException.klass);
 
 
-$vm.addClass('MessageNotUnderstood', globals.Error, ['message', 'receiver'], 'Kernel-Exceptions');
+$vm.addClass('MessageNotUnderstood', $globals.Error, ['message', 'receiver'], 'Kernel-Exceptions');
 //>>excludeStart("ide", pragmas.excludeIdeData);
-globals.MessageNotUnderstood.comment="This exception is provided to support `Object>>doesNotUnderstand:`.";
+$globals.MessageNotUnderstood.comment="This exception is provided to support `Object>>doesNotUnderstand:`.";
 //>>excludeEnd("ide");
 $vm.addMethod(
 $vm.method({
@@ -698,7 +698,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.MessageNotUnderstood);
+$globals.MessageNotUnderstood);
 
 $vm.addMethod(
 $vm.method({
@@ -717,7 +717,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.MessageNotUnderstood);
+$globals.MessageNotUnderstood);
 
 $vm.addMethod(
 $vm.method({
@@ -735,7 +735,7 @@ $ctx1.sendIdx[","]=1;
 //>>excludeEnd("ctx");
 return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"messageText",{},globals.MessageNotUnderstood)});
+}, function($ctx1) {$ctx1.fill(self,"messageText",{},$globals.MessageNotUnderstood)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -745,7 +745,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: [",", "asString", "receiver", "selector", "message"]
 }),
-globals.MessageNotUnderstood);
+$globals.MessageNotUnderstood);
 
 $vm.addMethod(
 $vm.method({
@@ -765,7 +765,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.MessageNotUnderstood);
+$globals.MessageNotUnderstood);
 
 $vm.addMethod(
 $vm.method({
@@ -784,13 +784,13 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.MessageNotUnderstood);
+$globals.MessageNotUnderstood);
 
 
 
-$vm.addClass('NonBooleanReceiver', globals.Error, ['object'], 'Kernel-Exceptions');
+$vm.addClass('NonBooleanReceiver', $globals.Error, ['object'], 'Kernel-Exceptions');
 //>>excludeStart("ide", pragmas.excludeIdeData);
-globals.NonBooleanReceiver.comment="NonBooleanReceiver exceptions may be thrown when executing inlined methods such as `#ifTrue:` with a non boolean receiver.";
+$globals.NonBooleanReceiver.comment="NonBooleanReceiver exceptions may be thrown when executing inlined methods such as `#ifTrue:` with a non boolean receiver.";
 //>>excludeEnd("ide");
 $vm.addMethod(
 $vm.method({
@@ -810,7 +810,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.NonBooleanReceiver);
+$globals.NonBooleanReceiver);
 
 $vm.addMethod(
 $vm.method({
@@ -829,13 +829,13 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.NonBooleanReceiver);
+$globals.NonBooleanReceiver);
 
 
 
-$vm.addClass('PackageCommitError', globals.Error, [], 'Kernel-Exceptions');
+$vm.addClass('PackageCommitError', $globals.Error, [], 'Kernel-Exceptions');
 //>>excludeStart("ide", pragmas.excludeIdeData);
-globals.PackageCommitError.comment="I get signaled when an attempt to commit a package has failed.";
+$globals.PackageCommitError.comment="I get signaled when an attempt to commit a package has failed.";
 //>>excludeEnd("ide");
 
 });

File diff suppressed because it is too large
+ 129 - 129
src/Kernel-ImportExport.js


+ 1 - 1
src/Kernel-ImportExport.st

@@ -253,7 +253,7 @@ jsClassNameFor: aClass
 		ifFalse: [
 			aClass
 				ifNil: [ 'null' ]
-				ifNotNil: [ 'globals.', aClass name ] ]
+				ifNotNil: [ '$globals.', aClass name ] ]
 ! !
 
 !Exporter methodsFor: 'output'!

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


+ 4 - 2
src/Kernel-Infrastructure.st

@@ -1141,7 +1141,7 @@ current
 
 globals
 	"Future compatibility to be able to use Smalltalk globals at: ..."
-	<return globals>
+	<return $globals>
 !
 
 includesKey: aKey
@@ -1349,7 +1349,9 @@ SmalltalkImage class instanceVariableNames: 'current'!
 !SmalltalkImage class methodsFor: 'initialization'!
 
 initialize
-	globals at: 'Smalltalk' put: self current
+	| st |
+	st := self current.
+	st globals at: 'Smalltalk' put: st
 ! !
 
 !SmalltalkImage class methodsFor: 'instance creation'!

File diff suppressed because it is too large
+ 118 - 118
src/Kernel-Methods.js


+ 2 - 2
src/Kernel-Methods.st

@@ -174,14 +174,14 @@ fork
 valueWithInterval: aNumber
 	<
 		var interval = setInterval(self, aNumber);
-		return globals.Timeout._on_(interval);
+		return $globals.Timeout._on_(interval);
 	>
 !
 
 valueWithTimeout: aNumber
 	<
 		var timeout = setTimeout(self, aNumber);
-		return globals.Timeout._on_(timeout);
+		return $globals.Timeout._on_(timeout);
 	>
 ! !
 

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


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


+ 1 - 1
src/Kernel-Tests.st

@@ -147,7 +147,7 @@ testNewWithValues
 	self._assert_equals_(result.name, 'theTestPrototype');
 
 	"newWithValues: cannot help if the argument list is wrong, and should warn that a mistake was made."
-	self._should_raise_(function () {wrappedConstructor._newWithValues_('single argument');}, globals.Error);
+	self._should_raise_(function () {wrappedConstructor._newWithValues_('single argument');}, $globals.Error);
 >
 !
 

+ 10 - 10
src/Kernel-Transcript.js

@@ -4,9 +4,9 @@ var smalltalk=$vm,_st=$recv,globals=$globals;
 $vm.addPackage('Kernel-Transcript');
 $vm.packages["Kernel-Transcript"].transport = {"type":"amd","amdNamespace":"amber_core"};
 
-$vm.addClass('ConsoleTranscript', globals.Object, ['textarea'], 'Kernel-Transcript');
+$vm.addClass('ConsoleTranscript', $globals.Object, ['textarea'], 'Kernel-Transcript');
 //>>excludeStart("ide", pragmas.excludeIdeData);
-globals.ConsoleTranscript.comment="I am a specific transcript emitting to the JavaScript console.\x0a\x0aIf no other transcript is registered, I am the default.";
+$globals.ConsoleTranscript.comment="I am a specific transcript emitting to the JavaScript console.\x0a\x0aIf no other transcript is registered, I am the default.";
 //>>excludeEnd("ide");
 $vm.addMethod(
 $vm.method({
@@ -24,7 +24,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.ConsoleTranscript);
+$globals.ConsoleTranscript);
 
 $vm.addMethod(
 $vm.method({
@@ -42,7 +42,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.ConsoleTranscript);
+$globals.ConsoleTranscript);
 
 $vm.addMethod(
 $vm.method({
@@ -60,7 +60,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.ConsoleTranscript);
+$globals.ConsoleTranscript);
 
 $vm.addMethod(
 $vm.method({
@@ -74,7 +74,7 @@ return $vm.withContext(function($ctx1) {
 console.log(String(_st(anObject)._asString()));
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"show:",{anObject:anObject},globals.ConsoleTranscript)});
+}, function($ctx1) {$ctx1.fill(self,"show:",{anObject:anObject},$globals.ConsoleTranscript)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -84,7 +84,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.ConsoleTranscript);
+$globals.ConsoleTranscript);
 
 
 $vm.addMethod(
@@ -93,14 +93,14 @@ selector: "initialize",
 protocol: 'initialization',
 fn: function (){
 var self=this;
-function $Transcript(){return globals.Transcript||(typeof Transcript=="undefined"?nil:Transcript)}
+function $Transcript(){return $globals.Transcript||(typeof Transcript=="undefined"?nil:Transcript)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $vm.withContext(function($ctx1) { 
 //>>excludeEnd("ctx");
 _st($Transcript())._registerIfNone_(self._new());
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"initialize",{},globals.ConsoleTranscript.klass)});
+}, function($ctx1) {$ctx1.fill(self,"initialize",{},$globals.ConsoleTranscript.klass)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -110,6 +110,6 @@ referencedClasses: ["Transcript"],
 //>>excludeEnd("ide");
 messageSends: ["registerIfNone:", "new"]
 }),
-globals.ConsoleTranscript.klass);
+$globals.ConsoleTranscript.klass);
 
 });

+ 57 - 57
src/SUnit-Tests.js

@@ -4,9 +4,9 @@ var smalltalk=$vm,_st=$recv,globals=$globals;
 $vm.addPackage('SUnit-Tests');
 $vm.packages["SUnit-Tests"].transport = {"type":"amd","amdNamespace":"amber_core"};
 
-$vm.addClass('ExampleSetTest', globals.TestCase, ['empty', 'full'], 'SUnit-Tests');
+$vm.addClass('ExampleSetTest', $globals.TestCase, ['empty', 'full'], 'SUnit-Tests');
 //>>excludeStart("ide", pragmas.excludeIdeData);
-globals.ExampleSetTest.comment="ExampleSetTest is taken from Pharo 1.4.\x0a\x0aTHe purpose of this class is to demonstrate a simple use case of the test framework.";
+$globals.ExampleSetTest.comment="ExampleSetTest is taken from Pharo 1.4.\x0a\x0aTHe purpose of this class is to demonstrate a simple use case of the test framework.";
 //>>excludeEnd("ide");
 $vm.addMethod(
 $vm.method({
@@ -14,7 +14,7 @@ selector: "setUp",
 protocol: 'running',
 fn: function (){
 var self=this;
-function $Set(){return globals.Set||(typeof Set=="undefined"?nil:Set)}
+function $Set(){return $globals.Set||(typeof Set=="undefined"?nil:Set)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $vm.withContext(function($ctx1) { 
 //>>excludeEnd("ctx");
@@ -22,7 +22,7 @@ self["@empty"]=_st($Set())._new();
 self["@full"]=_st($Set())._with_with_((5),"abc");
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"setUp",{},globals.ExampleSetTest)});
+}, function($ctx1) {$ctx1.fill(self,"setUp",{},$globals.ExampleSetTest)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -32,7 +32,7 @@ referencedClasses: ["Set"],
 //>>excludeEnd("ide");
 messageSends: ["new", "with:with:"]
 }),
-globals.ExampleSetTest);
+$globals.ExampleSetTest);
 
 $vm.addMethod(
 $vm.method({
@@ -47,7 +47,7 @@ _st(self["@empty"])._add_((5));
 self._assert_(_st(self["@empty"])._includes_((5)));
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"testAdd",{},globals.ExampleSetTest)});
+}, function($ctx1) {$ctx1.fill(self,"testAdd",{},$globals.ExampleSetTest)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -57,7 +57,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: ["add:", "assert:", "includes:"]
 }),
-globals.ExampleSetTest);
+$globals.ExampleSetTest);
 
 $vm.addMethod(
 $vm.method({
@@ -72,7 +72,7 @@ _st(self["@empty"])._addAll_((1)._to_((100)));
 self._assert_equals_(_st(self["@empty"])._size(),(100));
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"testGrow",{},globals.ExampleSetTest)});
+}, function($ctx1) {$ctx1.fill(self,"testGrow",{},$globals.ExampleSetTest)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -82,7 +82,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: ["addAll:", "to:", "assert:equals:", "size"]
 }),
-globals.ExampleSetTest);
+$globals.ExampleSetTest);
 
 $vm.addMethod(
 $vm.method({
@@ -90,7 +90,7 @@ selector: "testIllegal",
 protocol: 'tests',
 fn: function (){
 var self=this;
-function $Error(){return globals.Error||(typeof Error=="undefined"?nil:Error)}
+function $Error(){return $globals.Error||(typeof Error=="undefined"?nil:Error)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $vm.withContext(function($ctx1) { 
 //>>excludeEnd("ctx");
@@ -117,7 +117,7 @@ return _st(self["@empty"])._at_put_((5),"abc");
 }),$Error());
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"testIllegal",{},globals.ExampleSetTest)});
+}, function($ctx1) {$ctx1.fill(self,"testIllegal",{},$globals.ExampleSetTest)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -127,7 +127,7 @@ referencedClasses: ["Error"],
 //>>excludeEnd("ide");
 messageSends: ["should:raise:", "at:", "at:put:"]
 }),
-globals.ExampleSetTest);
+$globals.ExampleSetTest);
 
 $vm.addMethod(
 $vm.method({
@@ -150,7 +150,7 @@ $ctx1.sendIdx["assert:"]=1;
 self._assert_(_st(self["@full"])._includes_("abc"));
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"testIncludes",{},globals.ExampleSetTest)});
+}, function($ctx1) {$ctx1.fill(self,"testIncludes",{},$globals.ExampleSetTest)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -160,7 +160,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: ["assert:", "includes:"]
 }),
-globals.ExampleSetTest);
+$globals.ExampleSetTest);
 
 $vm.addMethod(
 $vm.method({
@@ -192,7 +192,7 @@ _st(self["@full"])._add_((5));
 self._assert_equals_(_st(self["@full"])._occurrencesOf_((5)),(1));
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"testOccurrences",{},globals.ExampleSetTest)});
+}, function($ctx1) {$ctx1.fill(self,"testOccurrences",{},$globals.ExampleSetTest)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -202,7 +202,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: ["assert:equals:", "occurrencesOf:", "add:"]
 }),
-globals.ExampleSetTest);
+$globals.ExampleSetTest);
 
 $vm.addMethod(
 $vm.method({
@@ -223,7 +223,7 @@ self._assert_($1);
 self._deny_(_st(self["@full"])._includes_((5)));
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"testRemove",{},globals.ExampleSetTest)});
+}, function($ctx1) {$ctx1.fill(self,"testRemove",{},$globals.ExampleSetTest)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -233,11 +233,11 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: ["remove:", "assert:", "includes:", "deny:"]
 }),
-globals.ExampleSetTest);
+$globals.ExampleSetTest);
 
 
 
-$vm.addClass('SUnitAsyncTest', globals.TestCase, ['flag'], 'SUnit-Tests');
+$vm.addClass('SUnitAsyncTest', $globals.TestCase, ['flag'], 'SUnit-Tests');
 $vm.addMethod(
 $vm.method({
 selector: "fakeError",
@@ -262,7 +262,7 @@ return self._error_("Intentional");
 })))._valueWithTimeout_((20));
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"fakeError",{},globals.SUnitAsyncTest)});
+}, function($ctx1) {$ctx1.fill(self,"fakeError",{},$globals.SUnitAsyncTest)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -272,7 +272,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: ["timeout:", "valueWithTimeout:", "async:", "error:"]
 }),
-globals.SUnitAsyncTest);
+$globals.SUnitAsyncTest);
 
 $vm.addMethod(
 $vm.method({
@@ -296,7 +296,7 @@ return self._error_("Intentional");
 })))._valueWithTimeout_((20));
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"fakeErrorFailingInTearDown",{},globals.SUnitAsyncTest)});
+}, function($ctx1) {$ctx1.fill(self,"fakeErrorFailingInTearDown",{},$globals.SUnitAsyncTest)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -306,7 +306,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: ["timeout:", "valueWithTimeout:", "async:", "error:"]
 }),
-globals.SUnitAsyncTest);
+$globals.SUnitAsyncTest);
 
 $vm.addMethod(
 $vm.method({
@@ -332,7 +332,7 @@ return self._assert_(false);
 })))._valueWithTimeout_((20));
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"fakeFailure",{},globals.SUnitAsyncTest)});
+}, function($ctx1) {$ctx1.fill(self,"fakeFailure",{},$globals.SUnitAsyncTest)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -342,7 +342,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: ["timeout:", "valueWithTimeout:", "async:", "assert:"]
 }),
-globals.SUnitAsyncTest);
+$globals.SUnitAsyncTest);
 
 $vm.addMethod(
 $vm.method({
@@ -385,7 +385,7 @@ $ctx1.sendIdx["valueWithTimeout:"]=1;
 //>>excludeEnd("ctx");
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"fakeMultipleTimeoutFailing",{},globals.SUnitAsyncTest)});
+}, function($ctx1) {$ctx1.fill(self,"fakeMultipleTimeoutFailing",{},$globals.SUnitAsyncTest)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -395,7 +395,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: ["timeout:", "valueWithTimeout:", "async:", "finished"]
 }),
-globals.SUnitAsyncTest);
+$globals.SUnitAsyncTest);
 
 $vm.addMethod(
 $vm.method({
@@ -438,7 +438,7 @@ $ctx1.sendIdx["valueWithTimeout:"]=1;
 //>>excludeEnd("ctx");
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"fakeMultipleTimeoutPassing",{},globals.SUnitAsyncTest)});
+}, function($ctx1) {$ctx1.fill(self,"fakeMultipleTimeoutPassing",{},$globals.SUnitAsyncTest)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -448,7 +448,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: ["timeout:", "valueWithTimeout:", "async:", "finished"]
 }),
-globals.SUnitAsyncTest);
+$globals.SUnitAsyncTest);
 
 $vm.addMethod(
 $vm.method({
@@ -471,7 +471,7 @@ return self._finished();
 })))._valueWithTimeout_((20));
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"fakeTimeout",{},globals.SUnitAsyncTest)});
+}, function($ctx1) {$ctx1.fill(self,"fakeTimeout",{},$globals.SUnitAsyncTest)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -481,7 +481,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: ["timeout:", "valueWithTimeout:", "async:", "finished"]
 }),
-globals.SUnitAsyncTest);
+$globals.SUnitAsyncTest);
 
 $vm.addMethod(
 $vm.method({
@@ -504,7 +504,7 @@ return _st(each)._selector();
 })))._asSet();
 return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"selectorSetOf:",{aCollection:aCollection},globals.SUnitAsyncTest)});
+}, function($ctx1) {$ctx1.fill(self,"selectorSetOf:",{aCollection:aCollection},$globals.SUnitAsyncTest)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -514,7 +514,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: ["asSet", "collect:", "selector"]
 }),
-globals.SUnitAsyncTest);
+$globals.SUnitAsyncTest);
 
 $vm.addMethod(
 $vm.method({
@@ -533,7 +533,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-globals.SUnitAsyncTest);
+$globals.SUnitAsyncTest);
 
 $vm.addMethod(
 $vm.method({
@@ -547,7 +547,7 @@ return $vm.withContext(function($ctx1) {
 self._assert_equals_("ok",self["@flag"]);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"tearDown",{},globals.SUnitAsyncTest)});
+}, function($ctx1) {$ctx1.fill(self,"tearDown",{},$globals.SUnitAsyncTest)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -557,7 +557,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: ["assert:equals:"]
 }),
-globals.SUnitAsyncTest);
+$globals.SUnitAsyncTest);
 
 $vm.addMethod(
 $vm.method({
@@ -566,8 +566,8 @@ protocol: 'tests',
 fn: function (){
 var self=this;
 var suite,runner,result,assertBlock;
-function $TestSuiteRunner(){return globals.TestSuiteRunner||(typeof TestSuiteRunner=="undefined"?nil:TestSuiteRunner)}
-function $ResultAnnouncement(){return globals.ResultAnnouncement||(typeof ResultAnnouncement=="undefined"?nil:ResultAnnouncement)}
+function $TestSuiteRunner(){return $globals.TestSuiteRunner||(typeof TestSuiteRunner=="undefined"?nil:TestSuiteRunner)}
+function $ResultAnnouncement(){return $globals.ResultAnnouncement||(typeof ResultAnnouncement=="undefined"?nil:ResultAnnouncement)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $vm.withContext(function($ctx1) { 
 //>>excludeEnd("ctx");
@@ -625,7 +625,7 @@ return _st($4)._ifTrue_(assertBlock);
 _st(runner)._run();
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"testAsyncErrorsAndFailures",{suite:suite,runner:runner,result:result,assertBlock:assertBlock},globals.SUnitAsyncTest)});
+}, function($ctx1) {$ctx1.fill(self,"testAsyncErrorsAndFailures",{suite:suite,runner:runner,result:result,assertBlock:assertBlock},$globals.SUnitAsyncTest)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -635,7 +635,7 @@ referencedClasses: ["TestSuiteRunner", "ResultAnnouncement"],
 //>>excludeEnd("ide");
 messageSends: ["collect:", "selector:", "class", "on:", "timeout:", "result", "async:", "assert:equals:", "selectorSetOf:", "errors", "asSet", "failures", "finished", "on:do:", "announcer", "ifTrue:", "==", "=", "runs", "total", "run"]
 }),
-globals.SUnitAsyncTest);
+$globals.SUnitAsyncTest);
 
 $vm.addMethod(
 $vm.method({
@@ -643,7 +643,7 @@ selector: "testAsyncNeedsTimeout",
 protocol: 'tests',
 fn: function (){
 var self=this;
-function $Error(){return globals.Error||(typeof Error=="undefined"?nil:Error)}
+function $Error(){return $globals.Error||(typeof Error=="undefined"?nil:Error)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $vm.withContext(function($ctx1) { 
 //>>excludeEnd("ctx");
@@ -676,7 +676,7 @@ return self._async_((function(){
 self._finished();
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"testAsyncNeedsTimeout",{},globals.SUnitAsyncTest)});
+}, function($ctx1) {$ctx1.fill(self,"testAsyncNeedsTimeout",{},$globals.SUnitAsyncTest)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -686,7 +686,7 @@ referencedClasses: ["Error"],
 //>>excludeEnd("ide");
 messageSends: ["should:raise:", "async:", "timeout:", "shouldnt:raise:", "finished"]
 }),
-globals.SUnitAsyncTest);
+$globals.SUnitAsyncTest);
 
 $vm.addMethod(
 $vm.method({
@@ -694,7 +694,7 @@ selector: "testFinishedNeedsTimeout",
 protocol: 'tests',
 fn: function (){
 var self=this;
-function $Error(){return globals.Error||(typeof Error=="undefined"?nil:Error)}
+function $Error(){return $globals.Error||(typeof Error=="undefined"?nil:Error)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $vm.withContext(function($ctx1) { 
 //>>excludeEnd("ctx");
@@ -722,7 +722,7 @@ return self._finished();
 }),$Error());
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"testFinishedNeedsTimeout",{},globals.SUnitAsyncTest)});
+}, function($ctx1) {$ctx1.fill(self,"testFinishedNeedsTimeout",{},$globals.SUnitAsyncTest)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -732,7 +732,7 @@ referencedClasses: ["Error"],
 //>>excludeEnd("ide");
 messageSends: ["should:raise:", "finished", "timeout:", "shouldnt:raise:"]
 }),
-globals.SUnitAsyncTest);
+$globals.SUnitAsyncTest);
 
 $vm.addMethod(
 $vm.method({
@@ -762,7 +762,7 @@ self._finished();
 self._deny_(self._isAsync());
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"testIsAsyncReturnsCorrectValues",{},globals.SUnitAsyncTest)});
+}, function($ctx1) {$ctx1.fill(self,"testIsAsyncReturnsCorrectValues",{},$globals.SUnitAsyncTest)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -772,7 +772,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: ["deny:", "isAsync", "timeout:", "assert:", "finished"]
 }),
-globals.SUnitAsyncTest);
+$globals.SUnitAsyncTest);
 
 $vm.addMethod(
 $vm.method({
@@ -799,7 +799,7 @@ return self["@flag"];
 })))._valueWithTimeout_((5));
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"testPass",{},globals.SUnitAsyncTest)});
+}, function($ctx1) {$ctx1.fill(self,"testPass",{},$globals.SUnitAsyncTest)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -809,7 +809,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: ["timeout:", "valueWithTimeout:", "async:", "assert:", "finished"]
 }),
-globals.SUnitAsyncTest);
+$globals.SUnitAsyncTest);
 
 $vm.addMethod(
 $vm.method({
@@ -818,9 +818,9 @@ protocol: 'tests',
 fn: function (){
 var self=this;
 var suite,runner,result,assertBlock;
-function $TestSuiteRunner(){return globals.TestSuiteRunner||(typeof TestSuiteRunner=="undefined"?nil:TestSuiteRunner)}
-function $Set(){return globals.Set||(typeof Set=="undefined"?nil:Set)}
-function $ResultAnnouncement(){return globals.ResultAnnouncement||(typeof ResultAnnouncement=="undefined"?nil:ResultAnnouncement)}
+function $TestSuiteRunner(){return $globals.TestSuiteRunner||(typeof TestSuiteRunner=="undefined"?nil:TestSuiteRunner)}
+function $Set(){return $globals.Set||(typeof Set=="undefined"?nil:Set)}
+function $ResultAnnouncement(){return $globals.ResultAnnouncement||(typeof ResultAnnouncement=="undefined"?nil:ResultAnnouncement)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $vm.withContext(function($ctx1) { 
 //>>excludeEnd("ctx");
@@ -874,7 +874,7 @@ return _st($3)._ifTrue_(assertBlock);
 _st(runner)._run();
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"testTimeouts",{suite:suite,runner:runner,result:result,assertBlock:assertBlock},globals.SUnitAsyncTest)});
+}, function($ctx1) {$ctx1.fill(self,"testTimeouts",{suite:suite,runner:runner,result:result,assertBlock:assertBlock},$globals.SUnitAsyncTest)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -884,7 +884,7 @@ referencedClasses: ["TestSuiteRunner", "Set", "ResultAnnouncement"],
 //>>excludeEnd("ide");
 messageSends: ["collect:", "selector:", "class", "on:", "timeout:", "result", "async:", "assert:equals:", "selectorSetOf:", "errors", "new", "failures", "asSet", "finished", "on:do:", "announcer", "ifTrue:", "==", "=", "runs", "total", "run"]
 }),
-globals.SUnitAsyncTest);
+$globals.SUnitAsyncTest);
 
 $vm.addMethod(
 $vm.method({
@@ -946,7 +946,7 @@ return self._assert_equals_(x,(1));
 })))._valueWithTimeout_((0));
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"testTwoAsyncPassesWithFinishedOnlyOneIsRun",{x:x},globals.SUnitAsyncTest)});
+}, function($ctx1) {$ctx1.fill(self,"testTwoAsyncPassesWithFinishedOnlyOneIsRun",{x:x},$globals.SUnitAsyncTest)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -956,7 +956,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: ["timeout:", "valueWithTimeout:", "async:", "finished", "+", "assert:equals:"]
 }),
-globals.SUnitAsyncTest);
+$globals.SUnitAsyncTest);
 
 
 });

File diff suppressed because it is too large
+ 123 - 123
src/SUnit.js


File diff suppressed because it is too large
+ 113 - 113
src/Web.js


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