Prechádzať zdrojové kódy

Move ivars from `obj["@x"]` to `obj.x`.

Step 2: Compiler compiles dot notation,
recompile and apply to code base.
Herby Vojčík 5 rokov pred
rodič
commit
f785e6564b
2 zmenil súbory, kde vykonal 26 pridanie a 26 odobranie
  1. 7 7
      src/Web-Snippets.js
  2. 19 19
      src/Web.js

+ 7 - 7
src/Web-Snippets.js

@@ -171,10 +171,10 @@ var self=this,$self=this;
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$receiver;
-$1=$self["@snippets"];
+$1=$self.snippets;
 if(($receiver = $1) == null || $receiver.a$nil){
-$self["@snippets"]=$globals.HashedCollection._newFromPairs_([]);
-return $self["@snippets"];
+$self.snippets=$globals.HashedCollection._newFromPairs_([]);
+return $self.snippets;
 } else {
 return $1;
 }
@@ -222,7 +222,7 @@ selector: "current",
 protocol: "instance creation",
 fn: function (){
 var self=this,$self=this;
-return $self["@current"];
+return $self.current;
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -244,7 +244,7 @@ var self=this,$self=this;
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$2,$receiver;
-$1=$self["@current"];
+$1=$self.current;
 if(($receiver = $1) == null || $receiver.a$nil){
 $2=(
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -255,8 +255,8 @@ $ctx1.supercall = true,
 $ctx1.supercall = false;
 //>>excludeEnd("ctx");;
 $recv($2)._initializeFromJQuery_($recv(document)._asJQuery());
-$self["@current"]=$recv($2)._yourself();
-$self["@current"];
+$self.current=$recv($2)._yourself();
+$self.current;
 } else {
 $1;
 }

+ 19 - 19
src/Web.js

@@ -1336,10 +1336,10 @@ $ctx1.supercall = true,
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.supercall = false;
 //>>excludeEnd("ctx");;
-$1=$self["@root"];
+$1=$self.root;
 if(($receiver = $1) == null || $receiver.a$nil){
-$self["@root"]=$recv($globals.TagBrush)._fromString_canvas_("div",self);
-$self["@root"];
+$self.root=$recv($globals.TagBrush)._fromString_canvas_("div",self);
+$self.root;
 } else {
 $1;
 }
@@ -1366,7 +1366,7 @@ var self=this,$self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$self["@root"]=$recv($globals.TagBrush)._fromJQuery_canvas_(aJQuery,self);
+$self.root=$recv($globals.TagBrush)._fromJQuery_canvas_(aJQuery,self);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"initializeFromJQuery:",{aJQuery:aJQuery},$globals.HTMLCanvas)});
@@ -1939,7 +1939,7 @@ selector: "root",
 protocol: "accessing",
 fn: function (){
 var self=this,$self=this;
-return $self["@root"];
+return $self.root;
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -1957,7 +1957,7 @@ selector: "root:",
 protocol: "accessing",
 fn: function (aTagBrush){
 var self=this,$self=this;
-$self["@root"]=aTagBrush;
+$self.root=aTagBrush;
 return self;
 
 },
@@ -2327,7 +2327,7 @@ var self=this,$self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-return $recv($self["@root"])._addBrush_($self._newTag_(aString));
+return $recv($self.root)._addBrush_($self._newTag_(aString));
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"tag:",{aString:aString},$globals.HTMLCanvas)});
 //>>excludeEnd("ctx");
@@ -2827,13 +2827,13 @@ var root;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-root=$recv($self["@canvas"])._root();
-$recv($self["@canvas"])._root_(self);
+root=$recv($self.canvas)._root();
+$recv($self.canvas)._root_(self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["root:"]=1;
 //>>excludeEnd("ctx");
-$recv(aBlock)._value_($self["@canvas"]);
-$recv($self["@canvas"])._root_(root);
+$recv(aBlock)._value_($self.canvas);
+$recv($self.canvas)._root_(root);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"appendBlock:",{aBlock:aBlock,root:root},$globals.TagBrush)});
@@ -2931,7 +2931,7 @@ selector: "asDomNode",
 protocol: "converting",
 fn: function (){
 var self=this,$self=this;
-return $self["@element"];
+return $self.element;
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -3219,7 +3219,7 @@ selector: "element",
 protocol: "accessing",
 fn: function (){
 var self=this,$self=this;
-return $self["@element"];
+return $self.element;
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -3384,8 +3384,8 @@ var self=this,$self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$self["@element"]=$recv(aJQuery)._get_((0));
-$self["@canvas"]=aCanvas;
+$self.element=$recv(aJQuery)._get_((0));
+$self.canvas=aCanvas;
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"initializeFromJQuery:canvas:",{aJQuery:aJQuery,aCanvas:aCanvas},$globals.TagBrush)});
@@ -3409,8 +3409,8 @@ var self=this,$self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$self["@element"]=$recv(document)._createElement_(aString);
-$self["@canvas"]=aCanvas;
+$self.element=$recv(document)._createElement_(aString);
+$self.canvas=aCanvas;
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"initializeFromString:canvas:",{aString:aString,aCanvas:aCanvas},$globals.TagBrush)});
@@ -4648,9 +4648,9 @@ var self=this,$self=this;
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1;
-$1=$recv($globals.PlatformDom)._isDomNode_($self["@jsObject"]);
+$1=$recv($globals.PlatformDom)._isDomNode_($self.jsObject);
 if($core.assert($1)){
-$recv(aTagBrush)._appendChild_($self["@jsObject"]);
+$recv(aTagBrush)._appendChild_($self.jsObject);
 } else {
 $recv(aTagBrush)._append_($self._asString());
 }