Recompile.

src/Silk-Tests.js

@@ -1,13 +1,15 @@
-define("silk/Silk-Tests", ["amber/boot"
+define(["amber/boot"
 //>>excludeStart("imports", pragmas.excludeImports);
 , "amber/jquery/Wrappers-JQuery"
 //>>excludeEnd("imports");
-, "domite/DOMite-Tests", "amber_core/SUnit"], function($boot
+, "amber_core/SUnit", "domite/DOMite-Tests"], function($boot
 //>>excludeStart("imports", pragmas.excludeImports);
 
 //>>excludeEnd("imports");
 ){"use strict";
-var $core=$boot.api,nil=$boot.nil,$recv=$boot.asReceiver,$globals=$boot.globals;
+if(!$boot.nilAsReceiver)$boot.nilAsReceiver=$boot.nil;
+var $core=$boot.api,nil=$boot.nilAsReceiver,$recv=$boot.asReceiver,$globals=$boot.globals;
+if(!$boot.nilAsClass)$boot.nilAsClass=$boot.dnu;
 $core.addPackage('Silk-Tests');
 $core.packages["Silk-Tests"].innerEval = function (expr) { return eval(expr); };
 $core.packages["Silk-Tests"].imports = ["amber/jquery/Wrappers-JQuery"];
@@ -20,8 +22,7 @@ selector: "testedClass",
 protocol: 'fixture',
 fn: function (){
 var self=this;
-function $Silk(){return $globals.Silk||(typeof Silk=="undefined"?nil:Silk)}
-return $Silk();
+return $globals.Silk;
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -84,11 +85,10 @@ protocol: 'fixture',
 fn: function (aStringArray){
 var self=this;
 var sanitizedBody,err;
-function $Error(){return $globals.Error||(typeof Error=="undefined"?nil:Error)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$1,$4,$5,$receiver;
+var $2,$3,$1,$4,$receiver;
 var $early={};
 try {
 sanitizedBody=$recv($recv($recv(document)._body())._innerHTML())._replace_with_("\x5cs*","");
@@ -116,13 +116,12 @@ $ctx3.sendIdx["size"]=2;
 //>>excludeEnd("ctx");
 $1=$recv($2).__gt_eq($3);
 self._assert_($1);
-$4=self._assert_equals_($recv(sanitizedBody)._last_($recv(sanitizedAssertion)._size()),sanitizedAssertion);
-$4;
+self._assert_equals_($recv(sanitizedBody)._last_($recv(sanitizedAssertion)._size()),sanitizedAssertion);
 throw $early=[self];
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx3) {$ctx3.fillBlock({},$ctx2,2)});
 //>>excludeEnd("ctx");
-}))._on_do_($Error(),(function(e){
+}))._on_do_($globals.Error,(function(e){
 err=e;
 return err;
 
@@ -131,12 +130,12 @@ return err;
 }, function($ctx2) {$ctx2.fillBlock({aString:aString,sanitizedAssertion:sanitizedAssertion},$ctx1,1)});
 //>>excludeEnd("ctx");
 }));
-$5=err;
-if(($receiver = $5) == null || $receiver.isNil){
-$5;
+$4=err;
+if(($receiver = $4) == null || $receiver.isNil){
+$4;
 } else {
 $recv(err)._signal();
-};
+}
 return self;
 }
 catch(e) {if(e===$early)return e[0]; throw e}
@@ -222,7 +221,7 @@ var d,tbl;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2,$3,$4;
+var $1,$2,$3;
 d="html body div#fixture"._asSilk();
 tbl=$recv(d)._TABLE();
 $1=$recv(tbl)._TR();
@@ -250,7 +249,7 @@ $recv($3)._TD_("E");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["TD:"]=5;
 //>>excludeEnd("ctx");
-$4=$recv($3)._TD_("F");
+$recv($3)._TD_("F");
 self._assertBodyEndsWith_(">sentinel<table><tr><td>A</td><td>B</td><td>C</td></tr><tr><td>D</td><td>E</td><td>F</td></tr></table></div>");
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -273,43 +272,40 @@ protocol: 'testing',
 fn: function (){
 var self=this;
 var d,tbl;
-function $Silk(){return $globals.Silk||(typeof Silk=="undefined"?nil:Silk)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2,$4,$5,$6,$3,$8,$10,$11,$9,$7;
+var $1,$3,$4,$5,$2,$7,$8,$6;
 d="html body div#fixture"._asSilk();
 tbl=$recv(d)._TABLE();
 $1=tbl;
-$2=$1;
-$4=$recv($Silk())._TD_("A");
+$3=$recv($globals.Silk)._TD_("A");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["TD:"]=1;
 //>>excludeEnd("ctx");
-$5=$recv($Silk())._TD_("B");
+$4=$recv($globals.Silk)._TD_("B");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["TD:"]=2;
 //>>excludeEnd("ctx");
-$6=$recv($Silk())._TD_("C");
+$5=$recv($globals.Silk)._TD_("C");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["TD:"]=3;
 //>>excludeEnd("ctx");
-$3=[$4,$5,$6];
-$recv($2)._TR_($3);
+$2=[$3,$4,$5];
+$recv($1)._TR_($2);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["TR:"]=1;
 //>>excludeEnd("ctx");
-$8=$1;
-$10=$recv($Silk())._TD_("D");
+$7=$recv($globals.Silk)._TD_("D");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["TD:"]=4;
 //>>excludeEnd("ctx");
-$11=$recv($Silk())._TD_("E");
+$8=$recv($globals.Silk)._TD_("E");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["TD:"]=5;
 //>>excludeEnd("ctx");
-$9=[$10,$11,$recv($Silk())._TD_("F")];
-$7=$recv($8)._TR_($9);
+$6=[$7,$8,$recv($globals.Silk)._TD_("F")];
+$recv($1)._TR_($6);
 self._assertBodyEndsWith_(">sentinel<table><tr><td>A</td><td>B</td><td>C</td></tr><tr><td>D</td><td>E</td><td>F</td></tr></table></div>");
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -332,7 +328,6 @@ protocol: 'testing',
 fn: function (){
 var self=this;
 var s;
-function $Transcript(){return $globals.Transcript||(typeof Transcript=="undefined"?nil:Transcript)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -388,7 +383,7 @@ $recv($recv(s)._BUTTON_("do something"))._on_bind_("click",(function(){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
-return $recv($Transcript())._show_("button pressed");
+return $recv($globals.Transcript)._show_("button pressed");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)});
 //>>excludeEnd("ctx");

src/Silk.js

@@ -1,5 +1,7 @@
-define("silk/Silk", ["amber/boot", "domite/DOMite", "amber_core/Kernel-Objects", "amber_core/Kernel-Methods", "amber_core/Kernel-Collections", "amber_core/Kernel-Infrastructure"], function($boot){"use strict";
-var $core=$boot.api,nil=$boot.nil,$recv=$boot.asReceiver,$globals=$boot.globals;
+define(["amber/boot", "amber_core/Kernel-Collections", "amber_core/Kernel-Infrastructure", "amber_core/Kernel-Methods", "amber_core/Kernel-Objects", "domite/DOMite"], function($boot){"use strict";
+if(!$boot.nilAsReceiver)$boot.nilAsReceiver=$boot.nil;
+var $core=$boot.api,nil=$boot.nilAsReceiver,$recv=$boot.asReceiver,$globals=$boot.globals;
+if(!$boot.nilAsClass)$boot.nilAsClass=$boot.dnu;
 $core.addPackage('Silk');
 $core.packages["Silk"].innerEval = function (expr) { return eval(expr); };
 $core.packages["Silk"].transport = {"type":"amd","amdNamespace":"silk"};
@@ -22,9 +24,9 @@ $1=$recv(self._class())._tryMakeDnuElement_(aMessage);
 if(($receiver = $1) == null || $receiver.isNil){
 $2=(
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-$ctx1.supercall = true, 
+$ctx1.supercall = true,
 //>>excludeEnd("ctx");
-$globals.Silk.superclass.fn.prototype._doesNotUnderstand_.apply($recv(self), [aMessage]));
+($globals.Silk.superclass||$boot.nilAsClass).fn.prototype._doesNotUnderstand_.apply($recv(self), [aMessage]));
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.supercall = false;
 //>>excludeEnd("ctx");;
@@ -34,7 +36,7 @@ var newElement;
 newElement=$receiver;
 self.__lt_lt(newElement);
 return newElement;
-};
+}
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"doesNotUnderstand:",{aMessage:aMessage},$globals.Silk)});
@@ -63,15 +65,15 @@ $1=$recv(anObject)._renderOnSilk_(self);
 if(($receiver = $1) == null || $receiver.isNil){
 (
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-$ctx1.supercall = true, 
+$ctx1.supercall = true,
 //>>excludeEnd("ctx");
-$globals.Silk.superclass.fn.prototype._nextPut_.apply($recv(self), [anObject]));
+($globals.Silk.superclass||$boot.nilAsClass).fn.prototype._nextPut_.apply($recv(self), [anObject]));
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.supercall = false;
 //>>excludeEnd("ctx");;
 } else {
 $1;
-};
+}
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"nextPut:",{anObject:anObject},$globals.Silk)});
@@ -101,9 +103,9 @@ $1=self._tryMakeDnuElement_(aMessage);
 if(($receiver = $1) == null || $receiver.isNil){
 $2=(
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-$ctx1.supercall = true, 
+$ctx1.supercall = true,
 //>>excludeEnd("ctx");
-$globals.Silk.klass.superclass.fn.prototype._doesNotUnderstand_.apply($recv(self), [aMessage]));
+($globals.Silk.klass.superclass||$boot.nilAsClass).fn.prototype._doesNotUnderstand_.apply($recv(self), [aMessage]));
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.supercall = false;
 //>>excludeEnd("ctx");;
@@ -112,7 +114,7 @@ return $2;
 var newElement;
 newElement=$receiver;
 return newElement;
-};
+}
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"doesNotUnderstand:",{aMessage:aMessage},$globals.Silk.klass)});
@@ -137,7 +139,7 @@ var selector,newElement,useArg;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2,$3,$4,$5;
+var $1,$2,$3,$4;
 selector=$recv(aMessage)._selector();
 $1=$recv($recv(selector)._asUppercase()).__eq(selector);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -145,7 +147,7 @@ $ctx1.sendIdx["="]=1;
 //>>excludeEnd("ctx");
 if(!$core.assert($1)){
 return nil;
-};
+}
 $2=$recv($recv(selector)._last()).__eq(":");
 if($core.assert($2)){
 useArg=true;
@@ -155,18 +157,17 @@ selector;
 } else {
 useArg=false;
 useArg;
-};
+}
 $3=$recv(selector)._includes_(":");
 if($core.assert($3)){
 return nil;
-};
+}
 newElement=self._newElement_($recv(selector)._asLowercase());
 $4=useArg;
 if($core.assert($4)){
 $recv(newElement).__lt_lt($recv($recv(aMessage)._arguments())._first());
-};
-$5=newElement;
-return $5;
+}
+return newElement;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"tryMakeDnuElement:",{aMessage:aMessage,selector:selector,newElement:newElement,useArg:useArg},$globals.Silk.klass)});
 //>>excludeEnd("ctx");
@@ -234,13 +235,10 @@ selector: "asSilk",
 protocol: '*Silk',
 fn: function (){
 var self=this;
-function $Silk(){return $globals.Silk||(typeof Silk=="undefined"?nil:Silk)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($Silk())._at_(self._asString());
-return $1;
+return $recv($globals.Silk)._at_(self._asString());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"asSilk",{},$globals.CharacterArray)});
 //>>excludeEnd("ctx");
@@ -260,16 +258,13 @@ selector: "inSilk",
 protocol: '*Silk',
 fn: function (){
 var self=this;
-function $Silk(){return $globals.Silk||(typeof Silk=="undefined"?nil:Silk)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$1;
-$2=$recv($Silk())._newStream();
-$recv($2).__lt_lt(self);
-$3=$recv($2)._yourself();
-$1=$3;
-return $1;
+var $1;
+$1=$recv($globals.Silk)._newStream();
+$recv($1).__lt_lt(self);
+return $recv($1)._yourself();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"inSilk",{},$globals.JSObjectProxy)});
 //>>excludeEnd("ctx");
@@ -289,16 +284,13 @@ selector: "inSilk",
 protocol: '*Silk',
 fn: function (){
 var self=this;
-function $Silk(){return $globals.Silk||(typeof Silk=="undefined"?nil:Silk)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$1;
-$2=$recv($Silk())._newStream();
-$recv($2).__lt_lt(self);
-$3=$recv($2)._yourself();
-$1=$3;
-return $1;
+var $1;
+$1=$recv($globals.Silk)._newStream();
+$recv($1).__lt_lt(self);
+return $recv($1)._yourself();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"inSilk",{},$globals.Object)});
 //>>excludeEnd("ctx");