Home Explore Help
Register Sign In
ajpo-amber
/
amber
forked from amber/amber
2
0
Fork 0
Files
Browse Source

Used a HashedCollection for methodDictionary instead of a Dictionary

Nicolas Petton 13 years ago
parent
239b06df1c
commit
d51eb73c78
3 changed files with 34 additions and 34 deletions
Unified View Show Diff Stats
  1. 16 16
      js/Kernel-Classes.deploy.js
  2. 17 17
      js/Kernel-Classes.js
  3. 1 1
      st/Kernel-Classes.st

+ 16 - 16
js/Kernel-Classes.deploy.js
View File 

@@ -62,7 +62,7 @@ selector: 'allSubclasses',
 
 fn: function (){
 
 fn: function (){
 
 var self=this;
 
 var self=this;
 
 var result=nil;
 
 var result=nil;
 
-(result=smalltalk.send(self, "_subclasses", []));
 
+result=smalltalk.send(self, "_subclasses", []);
 
 smalltalk.send(smalltalk.send(self, "_subclasses", []), "_do_", [(function(each){return smalltalk.send(result, "_addAll_", [smalltalk.send(each, "_allSubclasses", [])]);})]);
 
 smalltalk.send(smalltalk.send(self, "_subclasses", []), "_do_", [(function(each){return smalltalk.send(result, "_addAll_", [smalltalk.send(each, "_allSubclasses", [])]);})]);
 
 return result;
 
 return result;
 
 return self;}
 
 return self;}
 
@@ -97,7 +97,7 @@ smalltalk.method({
 
 selector: 'methodDictionary',
 
 selector: 'methodDictionary',
 
 fn: function (){
 
 fn: function (){
 
 var self=this;
 
 var self=this;
 
-var dict = smalltalk.Dictionary._new();
 
+var dict = smalltalk.HashedCollection._new();
 
 	var methods = self.fn.prototype.methods;
 
 	var methods = self.fn.prototype.methods;
 
 	for(var i in methods) {
 
 	for(var i in methods) {
 
 		if(methods[i].selector) {
 
 		if(methods[i].selector) {
 
@@ -206,7 +206,7 @@ selector: 'protocols',
 
 fn: function (){
 
 fn: function (){
 
 var self=this;
 
 var self=this;
 
 var protocols=nil;
 
 var protocols=nil;
 
-(protocols=smalltalk.send((smalltalk.Array || Array), "_new", []));
 
+protocols=smalltalk.send((smalltalk.Array || Array), "_new", []);
 
 smalltalk.send(smalltalk.send(self, "_methodDictionary", []), "_do_", [(function(each){return ((($receiver = smalltalk.send(protocols, "_includes_", [smalltalk.send(each, "_category", [])])).klass === smalltalk.Boolean) ? (! $receiver ? (function(){return smalltalk.send(protocols, "_add_", [smalltalk.send(each, "_category", [])]);})() : nil) : smalltalk.send($receiver, "_ifFalse_", [(function(){return smalltalk.send(protocols, "_add_", [smalltalk.send(each, "_category", [])]);})]));})]);
 
 smalltalk.send(smalltalk.send(self, "_methodDictionary", []), "_do_", [(function(each){return ((($receiver = smalltalk.send(protocols, "_includes_", [smalltalk.send(each, "_category", [])])).klass === smalltalk.Boolean) ? (! $receiver ? (function(){return smalltalk.send(protocols, "_add_", [smalltalk.send(each, "_category", [])]);})() : nil) : smalltalk.send($receiver, "_ifFalse_", [(function(){return smalltalk.send(protocols, "_add_", [smalltalk.send(each, "_category", [])]);})]));})]);
 
 return smalltalk.send(protocols, "_sort", []);
 
 return smalltalk.send(protocols, "_sort", []);
 
 return self;}
 
 return self;}
 
@@ -220,7 +220,7 @@ selector: 'protocolsDo:',
 
 fn: function (aBlock){
 
 fn: function (aBlock){
 
 var self=this;
 
 var self=this;
 
 var methodsByCategory=nil;
 
 var methodsByCategory=nil;
 
-(methodsByCategory=smalltalk.send((smalltalk.Dictionary || Dictionary), "_new", []));
 
+methodsByCategory=smalltalk.send((smalltalk.Dictionary || Dictionary), "_new", []);
 
 smalltalk.send(smalltalk.send(smalltalk.send(self, "_methodDictionary", []), "_values", []), "_do_", [(function(m){return smalltalk.send(smalltalk.send(methodsByCategory, "_at_ifAbsentPut_", [smalltalk.send(m, "_category", []), (function(){return smalltalk.send((smalltalk.Array || Array), "_new", []);})]), "_add_", [m]);})]);
 
 smalltalk.send(smalltalk.send(smalltalk.send(self, "_methodDictionary", []), "_values", []), "_do_", [(function(m){return smalltalk.send(smalltalk.send(methodsByCategory, "_at_ifAbsentPut_", [smalltalk.send(m, "_category", []), (function(){return smalltalk.send((smalltalk.Array || Array), "_new", []);})]), "_add_", [m]);})]);
 
 smalltalk.send(smalltalk.send(self, "_protocols", []), "_do_", [(function(category){return smalltalk.send(aBlock, "_value_value_", [category, smalltalk.send(methodsByCategory, "_at_", [category])]);})]);
 
 smalltalk.send(smalltalk.send(self, "_protocols", []), "_do_", [(function(category){return smalltalk.send(aBlock, "_value_value_", [category, smalltalk.send(methodsByCategory, "_at_", [category])]);})]);
 
 return self;}
 
 return self;}
 
@@ -234,7 +234,7 @@ selector: 'allInstanceVariableNames',
 
 fn: function (){
 
 fn: function (){
 
 var self=this;
 
 var self=this;
 
 var result=nil;
 
 var result=nil;
 
-(result=smalltalk.send(smalltalk.send(self, "_instanceVariableNames", []), "_copy", []));
 
+result=smalltalk.send(smalltalk.send(self, "_instanceVariableNames", []), "_copy", []);
 
 (($receiver = smalltalk.send(self, "_superclass", [])) != nil && $receiver != undefined) ? (function(){return smalltalk.send(result, "_addAll_", [smalltalk.send(smalltalk.send(self, "_superclass", []), "_allInstanceVariableNames", [])]);})() : nil;
 
 (($receiver = smalltalk.send(self, "_superclass", [])) != nil && $receiver != undefined) ? (function(){return smalltalk.send(result, "_addAll_", [smalltalk.send(smalltalk.send(self, "_superclass", []), "_allInstanceVariableNames", [])]);})() : nil;
 
 return result;
 
 return result;
 
 return self;}
 
 return self;}
 
@@ -292,7 +292,7 @@ selector: 'compile:category:',
 
 fn: function (aString, anotherString){
 
 fn: function (aString, anotherString){
 
 var self=this;
 
 var self=this;
 
 var method=nil;
 
 var method=nil;
 
-(method=smalltalk.send(smalltalk.send((smalltalk.Compiler || Compiler), "_new", []), "_load_forClass_", [aString, self]));
 
+method=smalltalk.send(smalltalk.send((smalltalk.Compiler || Compiler), "_new", []), "_load_forClass_", [aString, self]);
 
 smalltalk.send(method, "_category_", [anotherString]);
 
 smalltalk.send(method, "_category_", [anotherString]);
 
 smalltalk.send(self, "_addCompiledMethod_", [method]);
 
 smalltalk.send(self, "_addCompiledMethod_", [method]);
 
 return self;}
 
 return self;}
 
@@ -532,7 +532,7 @@ selector: 'superclass:subclass:instanceVariableNames:package:',
 
 fn: function (aClass, aString, aString2, aString3){
 
 fn: function (aClass, aString, aString2, aString3){
 
 var self=this;
 
 var self=this;
 
 var newClass=nil;
 
 var newClass=nil;
 
-(newClass=smalltalk.send(self, "_addSubclassOf_named_instanceVariableNames_package_", [aClass, aString, smalltalk.send(self, "_instanceVariableNamesFor_", [aString2]), (($receiver = aString3) == nil || $receiver == undefined) ? (function(){return "unclassified";})() : $receiver]));
 
+newClass=smalltalk.send(self, "_addSubclassOf_named_instanceVariableNames_package_", [aClass, aString, smalltalk.send(self, "_instanceVariableNamesFor_", [aString2]), (($receiver = aString3) == nil || $receiver == undefined) ? (function(){return "unclassified";})() : $receiver]);
 
 smalltalk.send(self, "_setupClass_", [newClass]);
 
 smalltalk.send(self, "_setupClass_", [newClass]);
 
 return newClass;
 
 return newClass;
 
 return self;}
 
 return self;}
 
@@ -558,7 +558,7 @@ selector: 'copyClass:named:',
 
 fn: function (aClass, aString){
 
 fn: function (aClass, aString){
 
 var self=this;
 
 var self=this;
 
 var newClass=nil;
 
 var newClass=nil;
 
-(newClass=smalltalk.send(self, "_addSubclassOf_named_instanceVariableNames_package_", [smalltalk.send(aClass, "_superclass", []), aString, smalltalk.send(aClass, "_instanceVariableNames", []), smalltalk.send(smalltalk.send(aClass, "_package", []), "_name", [])]));
 
+newClass=smalltalk.send(self, "_addSubclassOf_named_instanceVariableNames_package_", [smalltalk.send(aClass, "_superclass", []), aString, smalltalk.send(aClass, "_instanceVariableNames", []), smalltalk.send(smalltalk.send(aClass, "_package", []), "_name", [])]);
 
 smalltalk.send(self, "_setupClass_", [newClass]);
 
 smalltalk.send(self, "_setupClass_", [newClass]);
 
 smalltalk.send(smalltalk.send(smalltalk.send(aClass, "_methodDictionary", []), "_values", []), "_do_", [(function(each){smalltalk.send(newClass, "_addCompiledMethod_", [smalltalk.send(smalltalk.send((smalltalk.Compiler || Compiler), "_new", []), "_load_forClass_", [smalltalk.send(each, "_source", []), newClass])]);return smalltalk.send(smalltalk.send(smalltalk.send(newClass, "_methodDictionary", []), "_at_", [smalltalk.send(each, "_selector", [])]), "_category_", [smalltalk.send(each, "_category", [])]);})]);
 
 smalltalk.send(smalltalk.send(smalltalk.send(aClass, "_methodDictionary", []), "_values", []), "_do_", [(function(each){smalltalk.send(newClass, "_addCompiledMethod_", [smalltalk.send(smalltalk.send((smalltalk.Compiler || Compiler), "_new", []), "_load_forClass_", [smalltalk.send(each, "_source", []), newClass])]);return smalltalk.send(smalltalk.send(smalltalk.send(newClass, "_methodDictionary", []), "_at_", [smalltalk.send(each, "_selector", [])]), "_category_", [smalltalk.send(each, "_category", [])]);})]);
 
 smalltalk.send(smalltalk.send(smalltalk.send(smalltalk.send(aClass, "_class", []), "_methodDictionary", []), "_values", []), "_do_", [(function(each){smalltalk.send(smalltalk.send(newClass, "_class", []), "_addCompiledMethod_", [smalltalk.send(smalltalk.send((smalltalk.Compiler || Compiler), "_new", []), "_load_forClass_", [smalltalk.send(each, "_source", []), smalltalk.send(newClass, "_class", [])])]);return smalltalk.send(smalltalk.send(smalltalk.send(smalltalk.send(newClass, "_class", []), "_methodDictionary", []), "_at_", [smalltalk.send(each, "_selector", [])]), "_category_", [smalltalk.send(each, "_category", [])]);})]);
 
 smalltalk.send(smalltalk.send(smalltalk.send(smalltalk.send(aClass, "_class", []), "_methodDictionary", []), "_values", []), "_do_", [(function(each){smalltalk.send(smalltalk.send(newClass, "_class", []), "_addCompiledMethod_", [smalltalk.send(smalltalk.send((smalltalk.Compiler || Compiler), "_new", []), "_load_forClass_", [smalltalk.send(each, "_source", []), smalltalk.send(newClass, "_class", [])])]);return smalltalk.send(smalltalk.send(smalltalk.send(smalltalk.send(newClass, "_class", []), "_methodDictionary", []), "_at_", [smalltalk.send(each, "_selector", [])]), "_category_", [smalltalk.send(each, "_category", [])]);})]);
 
@@ -578,7 +578,7 @@ selector: 'initialize',
 
 fn: function (){
 
 fn: function (){
 
 var self=this;
 
 var self=this;
 
 smalltalk.send(self, "_initialize", [], smalltalk.Object);
 
 smalltalk.send(self, "_initialize", [], smalltalk.Object);
 
-(self['@chunkParser']=smalltalk.send((smalltalk.ChunkParser || ChunkParser), "_new", []));
 
+self['@chunkParser']=smalltalk.send((smalltalk.ChunkParser || ChunkParser), "_new", []);
 
 return self;}
 
 return self;}
 
 }),
 
 }),
 
 smalltalk.ClassCategoryReader);
 
 smalltalk.ClassCategoryReader);
 
@@ -589,8 +589,8 @@ smalltalk.method({
 
 selector: 'class:category:',
 
 selector: 'class:category:',
 
 fn: function (aClass, aString){
 
 fn: function (aClass, aString){
 
 var self=this;
 
 var self=this;
 
-(self['@class']=aClass);
 
-(self['@category']=aString);
 
+self['@class']=aClass;
 
+self['@category']=aString;
 
 return self;}
 
 return self;}
 
 }),
 
 }),
 
 smalltalk.ClassCategoryReader);
 
 smalltalk.ClassCategoryReader);
 
@@ -602,7 +602,7 @@ selector: 'scanFrom:',
 
 fn: function (aChunkParser){
 
 fn: function (aChunkParser){
 
 var self=this;
 
 var self=this;
 
 var chunk=nil;
 
 var chunk=nil;
 
-(function(){while(!(function(){(chunk=smalltalk.send(aChunkParser, "_nextChunk", []));return smalltalk.send(chunk, "_isEmpty", []);})()) {(function(){return smalltalk.send(self, "_compileMethod_", [chunk]);})()}})();
 
+(function(){while(!(function(){chunk=smalltalk.send(aChunkParser, "_nextChunk", []);return smalltalk.send(chunk, "_isEmpty", []);})()) {(function(){return smalltalk.send(self, "_compileMethod_", [chunk]);})()}})();
 
 return self;}
 
 return self;}
 
 }),
 
 }),
 
 smalltalk.ClassCategoryReader);
 
 smalltalk.ClassCategoryReader);
 
@@ -614,7 +614,7 @@ selector: 'compileMethod:',
 
 fn: function (aString){
 
 fn: function (aString){
 
 var self=this;
 
 var self=this;
 
 var method=nil;
 
 var method=nil;
 
-(method=smalltalk.send(smalltalk.send((smalltalk.Compiler || Compiler), "_new", []), "_load_forClass_", [aString, self['@class']]));
 
+method=smalltalk.send(smalltalk.send((smalltalk.Compiler || Compiler), "_new", []), "_load_forClass_", [aString, self['@class']]);
 
 smalltalk.send(method, "_category_", [self['@category']]);
 
 smalltalk.send(method, "_category_", [self['@category']]);
 
 smalltalk.send(self['@class'], "_addCompiledMethod_", [method]);
 
 smalltalk.send(self['@class'], "_addCompiledMethod_", [method]);
 
 return self;}
 
 return self;}
 
@@ -630,7 +630,7 @@ smalltalk.method({
 
 selector: 'class:',
 
 selector: 'class:',
 
 fn: function (aClass){
 
 fn: function (aClass){
 
 var self=this;
 
 var self=this;
 
-(self['@class']=aClass);
 
+self['@class']=aClass;
 
 return self;}
 
 return self;}
 
 }),
 
 }),
 
 smalltalk.ClassCommentReader);
 
 smalltalk.ClassCommentReader);
 
@@ -642,7 +642,7 @@ selector: 'scanFrom:',
 
 fn: function (aChunkParser){
 
 fn: function (aChunkParser){
 
 var self=this;
 
 var self=this;
 
 var chunk=nil;
 
 var chunk=nil;
 
-(chunk=smalltalk.send(aChunkParser, "_nextChunk", []));
 
+chunk=smalltalk.send(aChunkParser, "_nextChunk", []);
 
 ((($receiver = smalltalk.send(chunk, "_isEmpty", [])).klass === smalltalk.Boolean) ? (! $receiver ? (function(){return smalltalk.send(self, "_setComment_", [chunk]);})() : nil) : smalltalk.send($receiver, "_ifFalse_", [(function(){return smalltalk.send(self, "_setComment_", [chunk]);})]));
 
 ((($receiver = smalltalk.send(chunk, "_isEmpty", [])).klass === smalltalk.Boolean) ? (! $receiver ? (function(){return smalltalk.send(self, "_setComment_", [chunk]);})() : nil) : smalltalk.send($receiver, "_ifFalse_", [(function(){return smalltalk.send(self, "_setComment_", [chunk]);})]));
 
 return self;}
 
 return self;}
 
 }),
 
 }),
 
@@ -655,7 +655,7 @@ selector: 'initialize',
 
 fn: function (){
 
 fn: function (){
 
 var self=this;
 
 var self=this;
 
 smalltalk.send(self, "_initialize", [], smalltalk.Object);
 
 smalltalk.send(self, "_initialize", [], smalltalk.Object);
 
-(self['@chunkParser']=smalltalk.send((smalltalk.ChunkParser || ChunkParser), "_new", []));
 
+self['@chunkParser']=smalltalk.send((smalltalk.ChunkParser || ChunkParser), "_new", []);
 
 return self;}
 
 return self;}
 
 }),
 
 }),
 
 smalltalk.ClassCommentReader);
 
 smalltalk.ClassCommentReader);

+ 17 - 17
js/Kernel-Classes.js
View File 

@@ -88,7 +88,7 @@ category: 'accessing',
 
 fn: function (){
 
 fn: function (){
 
 var self=this;
 
 var self=this;
 
 var result=nil;
 
 var result=nil;
 
-(result=smalltalk.send(self, "_subclasses", []));
 
+result=smalltalk.send(self, "_subclasses", []);
 
 smalltalk.send(smalltalk.send(self, "_subclasses", []), "_do_", [(function(each){return smalltalk.send(result, "_addAll_", [smalltalk.send(each, "_allSubclasses", [])]);})]);
 
 smalltalk.send(smalltalk.send(self, "_subclasses", []), "_do_", [(function(each){return smalltalk.send(result, "_addAll_", [smalltalk.send(each, "_allSubclasses", [])]);})]);
 
 return result;
 
 return result;
 
 return self;},
 
 return self;},
 
@@ -138,7 +138,7 @@ selector: unescape('methodDictionary'),
 
 category: 'accessing',
 
 category: 'accessing',
 
 fn: function (){
 
 fn: function (){
 
 var self=this;
 
 var self=this;
 
-var dict = smalltalk.Dictionary._new();
 
+var dict = smalltalk.HashedCollection._new();
 
 	var methods = self.fn.prototype.methods;
 
 	var methods = self.fn.prototype.methods;
 
 	for(var i in methods) {
 
 	for(var i in methods) {
 
 		if(methods[i].selector) {
 
 		if(methods[i].selector) {
 
@@ -148,7 +148,7 @@ var dict = smalltalk.Dictionary._new();
 
 	return dict;
 
 	return dict;
 
 return self;},
 
 return self;},
 
 args: [],
 
 args: [],
 
-source: unescape('methodDictionary%0A%09%3Cvar%20dict%20%3D%20smalltalk.Dictionary._new%28%29%3B%0A%09var%20methods%20%3D%20self.fn.prototype.methods%3B%0A%09for%28var%20i%20in%20methods%29%20%7B%0A%09%09if%28methods%5Bi%5D.selector%29%20%7B%0A%09%09%09dict._at_put_%28methods%5Bi%5D.selector%2C%20methods%5Bi%5D%29%3B%0A%09%09%7D%0A%09%7D%3B%0A%09return%20dict%3E'),
 
+source: unescape('methodDictionary%0A%09%3Cvar%20dict%20%3D%20smalltalk.HashedCollection._new%28%29%3B%0A%09var%20methods%20%3D%20self.fn.prototype.methods%3B%0A%09for%28var%20i%20in%20methods%29%20%7B%0A%09%09if%28methods%5Bi%5D.selector%29%20%7B%0A%09%09%09dict._at_put_%28methods%5Bi%5D.selector%2C%20methods%5Bi%5D%29%3B%0A%09%09%7D%0A%09%7D%3B%0A%09return%20dict%3E'),
 
 messageSends: [],
 
 messageSends: [],
 
 referencedClasses: []
 
 referencedClasses: []
 
 }),
 
 }),
 
@@ -292,7 +292,7 @@ category: 'accessing',
 
 fn: function (){
 
 fn: function (){
 
 var self=this;
 
 var self=this;
 
 var protocols=nil;
 
 var protocols=nil;
 
-(protocols=smalltalk.send((smalltalk.Array || Array), "_new", []));
 
+protocols=smalltalk.send((smalltalk.Array || Array), "_new", []);
 
 smalltalk.send(smalltalk.send(self, "_methodDictionary", []), "_do_", [(function(each){return ((($receiver = smalltalk.send(protocols, "_includes_", [smalltalk.send(each, "_category", [])])).klass === smalltalk.Boolean) ? (! $receiver ? (function(){return smalltalk.send(protocols, "_add_", [smalltalk.send(each, "_category", [])]);})() : nil) : smalltalk.send($receiver, "_ifFalse_", [(function(){return smalltalk.send(protocols, "_add_", [smalltalk.send(each, "_category", [])]);})]));})]);
 
 smalltalk.send(smalltalk.send(self, "_methodDictionary", []), "_do_", [(function(each){return ((($receiver = smalltalk.send(protocols, "_includes_", [smalltalk.send(each, "_category", [])])).klass === smalltalk.Boolean) ? (! $receiver ? (function(){return smalltalk.send(protocols, "_add_", [smalltalk.send(each, "_category", [])]);})() : nil) : smalltalk.send($receiver, "_ifFalse_", [(function(){return smalltalk.send(protocols, "_add_", [smalltalk.send(each, "_category", [])]);})]));})]);
 
 return smalltalk.send(protocols, "_sort", []);
 
 return smalltalk.send(protocols, "_sort", []);
 
 return self;},
 
 return self;},
 
@@ -311,7 +311,7 @@ category: 'accessing',
 
 fn: function (aBlock){
 
 fn: function (aBlock){
 
 var self=this;
 
 var self=this;
 
 var methodsByCategory=nil;
 
 var methodsByCategory=nil;
 
-(methodsByCategory=smalltalk.send((smalltalk.Dictionary || Dictionary), "_new", []));
 
+methodsByCategory=smalltalk.send((smalltalk.Dictionary || Dictionary), "_new", []);
 
 smalltalk.send(smalltalk.send(smalltalk.send(self, "_methodDictionary", []), "_values", []), "_do_", [(function(m){return smalltalk.send(smalltalk.send(methodsByCategory, "_at_ifAbsentPut_", [smalltalk.send(m, "_category", []), (function(){return smalltalk.send((smalltalk.Array || Array), "_new", []);})]), "_add_", [m]);})]);
 
 smalltalk.send(smalltalk.send(smalltalk.send(self, "_methodDictionary", []), "_values", []), "_do_", [(function(m){return smalltalk.send(smalltalk.send(methodsByCategory, "_at_ifAbsentPut_", [smalltalk.send(m, "_category", []), (function(){return smalltalk.send((smalltalk.Array || Array), "_new", []);})]), "_add_", [m]);})]);
 
 smalltalk.send(smalltalk.send(self, "_protocols", []), "_do_", [(function(category){return smalltalk.send(aBlock, "_value_value_", [category, smalltalk.send(methodsByCategory, "_at_", [category])]);})]);
 
 smalltalk.send(smalltalk.send(self, "_protocols", []), "_do_", [(function(category){return smalltalk.send(aBlock, "_value_value_", [category, smalltalk.send(methodsByCategory, "_at_", [category])]);})]);
 
 return self;},
 
 return self;},
 
@@ -330,7 +330,7 @@ category: 'accessing',
 
 fn: function (){
 
 fn: function (){
 
 var self=this;
 
 var self=this;
 
 var result=nil;
 
 var result=nil;
 
-(result=smalltalk.send(smalltalk.send(self, "_instanceVariableNames", []), "_copy", []));
 
+result=smalltalk.send(smalltalk.send(self, "_instanceVariableNames", []), "_copy", []);
 
 (($receiver = smalltalk.send(self, "_superclass", [])) != nil && $receiver != undefined) ? (function(){return smalltalk.send(result, "_addAll_", [smalltalk.send(smalltalk.send(self, "_superclass", []), "_allInstanceVariableNames", [])]);})() : nil;
 
 (($receiver = smalltalk.send(self, "_superclass", [])) != nil && $receiver != undefined) ? (function(){return smalltalk.send(result, "_addAll_", [smalltalk.send(smalltalk.send(self, "_superclass", []), "_allInstanceVariableNames", [])]);})() : nil;
 
 return result;
 
 return result;
 
 return self;},
 
 return self;},
 
@@ -413,7 +413,7 @@ category: 'compiling',
 
 fn: function (aString, anotherString){
 
 fn: function (aString, anotherString){
 
 var self=this;
 
 var self=this;
 
 var method=nil;
 
 var method=nil;
 
-(method=smalltalk.send(smalltalk.send((smalltalk.Compiler || Compiler), "_new", []), "_load_forClass_", [aString, self]));
 
+method=smalltalk.send(smalltalk.send((smalltalk.Compiler || Compiler), "_new", []), "_load_forClass_", [aString, self]);
 
 smalltalk.send(method, "_category_", [anotherString]);
 
 smalltalk.send(method, "_category_", [anotherString]);
 
 smalltalk.send(self, "_addCompiledMethod_", [method]);
 
 smalltalk.send(self, "_addCompiledMethod_", [method]);
 
 return self;},
 
 return self;},
 
@@ -753,7 +753,7 @@ category: 'class creation',
 
 fn: function (aClass, aString, aString2, aString3){
 
 fn: function (aClass, aString, aString2, aString3){
 
 var self=this;
 
 var self=this;
 
 var newClass=nil;
 
 var newClass=nil;
 
-(newClass=smalltalk.send(self, "_addSubclassOf_named_instanceVariableNames_package_", [aClass, aString, smalltalk.send(self, "_instanceVariableNamesFor_", [aString2]), (($receiver = aString3) == nil || $receiver == undefined) ? (function(){return "unclassified";})() : $receiver]));
 
+newClass=smalltalk.send(self, "_addSubclassOf_named_instanceVariableNames_package_", [aClass, aString, smalltalk.send(self, "_instanceVariableNamesFor_", [aString2]), (($receiver = aString3) == nil || $receiver == undefined) ? (function(){return "unclassified";})() : $receiver]);
 
 smalltalk.send(self, "_setupClass_", [newClass]);
 
 smalltalk.send(self, "_setupClass_", [newClass]);
 
 return newClass;
 
 return newClass;
 
 return self;},
 
 return self;},
 
@@ -789,7 +789,7 @@ category: 'private',
 
 fn: function (aClass, aString){
 
 fn: function (aClass, aString){
 
 var self=this;
 
 var self=this;
 
 var newClass=nil;
 
 var newClass=nil;
 
-(newClass=smalltalk.send(self, "_addSubclassOf_named_instanceVariableNames_package_", [smalltalk.send(aClass, "_superclass", []), aString, smalltalk.send(aClass, "_instanceVariableNames", []), smalltalk.send(smalltalk.send(aClass, "_package", []), "_name", [])]));
 
+newClass=smalltalk.send(self, "_addSubclassOf_named_instanceVariableNames_package_", [smalltalk.send(aClass, "_superclass", []), aString, smalltalk.send(aClass, "_instanceVariableNames", []), smalltalk.send(smalltalk.send(aClass, "_package", []), "_name", [])]);
 
 smalltalk.send(self, "_setupClass_", [newClass]);
 
 smalltalk.send(self, "_setupClass_", [newClass]);
 
 smalltalk.send(smalltalk.send(smalltalk.send(aClass, "_methodDictionary", []), "_values", []), "_do_", [(function(each){smalltalk.send(newClass, "_addCompiledMethod_", [smalltalk.send(smalltalk.send((smalltalk.Compiler || Compiler), "_new", []), "_load_forClass_", [smalltalk.send(each, "_source", []), newClass])]);return smalltalk.send(smalltalk.send(smalltalk.send(newClass, "_methodDictionary", []), "_at_", [smalltalk.send(each, "_selector", [])]), "_category_", [smalltalk.send(each, "_category", [])]);})]);
 
 smalltalk.send(smalltalk.send(smalltalk.send(aClass, "_methodDictionary", []), "_values", []), "_do_", [(function(each){smalltalk.send(newClass, "_addCompiledMethod_", [smalltalk.send(smalltalk.send((smalltalk.Compiler || Compiler), "_new", []), "_load_forClass_", [smalltalk.send(each, "_source", []), newClass])]);return smalltalk.send(smalltalk.send(smalltalk.send(newClass, "_methodDictionary", []), "_at_", [smalltalk.send(each, "_selector", [])]), "_category_", [smalltalk.send(each, "_category", [])]);})]);
 
 smalltalk.send(smalltalk.send(smalltalk.send(smalltalk.send(aClass, "_class", []), "_methodDictionary", []), "_values", []), "_do_", [(function(each){smalltalk.send(smalltalk.send(newClass, "_class", []), "_addCompiledMethod_", [smalltalk.send(smalltalk.send((smalltalk.Compiler || Compiler), "_new", []), "_load_forClass_", [smalltalk.send(each, "_source", []), smalltalk.send(newClass, "_class", [])])]);return smalltalk.send(smalltalk.send(smalltalk.send(smalltalk.send(newClass, "_class", []), "_methodDictionary", []), "_at_", [smalltalk.send(each, "_selector", [])]), "_category_", [smalltalk.send(each, "_category", [])]);})]);
 
 smalltalk.send(smalltalk.send(smalltalk.send(smalltalk.send(aClass, "_class", []), "_methodDictionary", []), "_values", []), "_do_", [(function(each){smalltalk.send(smalltalk.send(newClass, "_class", []), "_addCompiledMethod_", [smalltalk.send(smalltalk.send((smalltalk.Compiler || Compiler), "_new", []), "_load_forClass_", [smalltalk.send(each, "_source", []), smalltalk.send(newClass, "_class", [])])]);return smalltalk.send(smalltalk.send(smalltalk.send(smalltalk.send(newClass, "_class", []), "_methodDictionary", []), "_at_", [smalltalk.send(each, "_selector", [])]), "_category_", [smalltalk.send(each, "_category", [])]);})]);
 
@@ -814,7 +814,7 @@ category: 'initialization',
 
 fn: function (){
 
 fn: function (){
 
 var self=this;
 
 var self=this;
 
 smalltalk.send(self, "_initialize", [], smalltalk.Object);
 
 smalltalk.send(self, "_initialize", [], smalltalk.Object);
 
-(self['@chunkParser']=smalltalk.send((smalltalk.ChunkParser || ChunkParser), "_new", []));
 
+self['@chunkParser']=smalltalk.send((smalltalk.ChunkParser || ChunkParser), "_new", []);
 
 return self;},
 
 return self;},
 
 args: [],
 
 args: [],
 
 source: unescape('initialize%0A%09super%20initialize.%0A%09chunkParser%20%3A%3D%20ChunkParser%20new.'),
 
 source: unescape('initialize%0A%09super%20initialize.%0A%09chunkParser%20%3A%3D%20ChunkParser%20new.'),
 
@@ -830,8 +830,8 @@ selector: unescape('class%3Acategory%3A'),
 
 category: 'accessing',
 
 category: 'accessing',
 
 fn: function (aClass, aString){
 
 fn: function (aClass, aString){
 
 var self=this;
 
 var self=this;
 
-(self['@class']=aClass);
 
-(self['@category']=aString);
 
+self['@class']=aClass;
 
+self['@category']=aString;
 
 return self;},
 
 return self;},
 
 args: ["aClass", "aString"],
 
 args: ["aClass", "aString"],
 
 source: unescape('class%3A%20aClass%20category%3A%20aString%0A%09class%20%3A%3D%20aClass.%0A%09category%20%3A%3D%20aString'),
 
 source: unescape('class%3A%20aClass%20category%3A%20aString%0A%09class%20%3A%3D%20aClass.%0A%09category%20%3A%3D%20aString'),
 
@@ -848,7 +848,7 @@ category: 'fileIn',
 
 fn: function (aChunkParser){
 
 fn: function (aChunkParser){
 
 var self=this;
 
 var self=this;
 
 var chunk=nil;
 
 var chunk=nil;
 
-(function(){while(!(function(){(chunk=smalltalk.send(aChunkParser, "_nextChunk", []));return smalltalk.send(chunk, "_isEmpty", []);})()) {(function(){return smalltalk.send(self, "_compileMethod_", [chunk]);})()}})();
 
+(function(){while(!(function(){chunk=smalltalk.send(aChunkParser, "_nextChunk", []);return smalltalk.send(chunk, "_isEmpty", []);})()) {(function(){return smalltalk.send(self, "_compileMethod_", [chunk]);})()}})();
 
 return self;},
 
 return self;},
 
 args: ["aChunkParser"],
 
 args: ["aChunkParser"],
 
 source: unescape('scanFrom%3A%20aChunkParser%0A%09%7C%20chunk%20%7C%0A%09%5Bchunk%20%3A%3D%20aChunkParser%20nextChunk.%0A%09chunk%20isEmpty%5D%20whileFalse%3A%20%5B%0A%09%20%20%20%20self%20compileMethod%3A%20chunk%5D'),
 
 source: unescape('scanFrom%3A%20aChunkParser%0A%09%7C%20chunk%20%7C%0A%09%5Bchunk%20%3A%3D%20aChunkParser%20nextChunk.%0A%09chunk%20isEmpty%5D%20whileFalse%3A%20%5B%0A%09%20%20%20%20self%20compileMethod%3A%20chunk%5D'),
 
@@ -865,7 +865,7 @@ category: 'private',
 
 fn: function (aString){
 
 fn: function (aString){
 
 var self=this;
 
 var self=this;
 
 var method=nil;
 
 var method=nil;
 
-(method=smalltalk.send(smalltalk.send((smalltalk.Compiler || Compiler), "_new", []), "_load_forClass_", [aString, self['@class']]));
 
+method=smalltalk.send(smalltalk.send((smalltalk.Compiler || Compiler), "_new", []), "_load_forClass_", [aString, self['@class']]);
 
 smalltalk.send(method, "_category_", [self['@category']]);
 
 smalltalk.send(method, "_category_", [self['@category']]);
 
 smalltalk.send(self['@class'], "_addCompiledMethod_", [method]);
 
 smalltalk.send(self['@class'], "_addCompiledMethod_", [method]);
 
 return self;},
 
 return self;},
 
@@ -886,7 +886,7 @@ selector: unescape('class%3A'),
 
 category: 'accessing',
 
 category: 'accessing',
 
 fn: function (aClass){
 
 fn: function (aClass){
 
 var self=this;
 
 var self=this;
 
-(self['@class']=aClass);
 
+self['@class']=aClass;
 
 return self;},
 
 return self;},
 
 args: ["aClass"],
 
 args: ["aClass"],
 
 source: unescape('class%3A%20aClass%0A%09class%20%3A%3D%20aClass'),
 
 source: unescape('class%3A%20aClass%0A%09class%20%3A%3D%20aClass'),
 
@@ -903,7 +903,7 @@ category: 'fileIn',
 
 fn: function (aChunkParser){
 
 fn: function (aChunkParser){
 
 var self=this;
 
 var self=this;
 
 var chunk=nil;
 
 var chunk=nil;
 
-(chunk=smalltalk.send(aChunkParser, "_nextChunk", []));
 
+chunk=smalltalk.send(aChunkParser, "_nextChunk", []);
 
 ((($receiver = smalltalk.send(chunk, "_isEmpty", [])).klass === smalltalk.Boolean) ? (! $receiver ? (function(){return smalltalk.send(self, "_setComment_", [chunk]);})() : nil) : smalltalk.send($receiver, "_ifFalse_", [(function(){return smalltalk.send(self, "_setComment_", [chunk]);})]));
 
 ((($receiver = smalltalk.send(chunk, "_isEmpty", [])).klass === smalltalk.Boolean) ? (! $receiver ? (function(){return smalltalk.send(self, "_setComment_", [chunk]);})() : nil) : smalltalk.send($receiver, "_ifFalse_", [(function(){return smalltalk.send(self, "_setComment_", [chunk]);})]));
 
 return self;},
 
 return self;},
 
 args: ["aChunkParser"],
 
 args: ["aChunkParser"],
 
@@ -921,7 +921,7 @@ category: 'initialization',
 
 fn: function (){
 
 fn: function (){
 
 var self=this;
 
 var self=this;
 
 smalltalk.send(self, "_initialize", [], smalltalk.Object);
 
 smalltalk.send(self, "_initialize", [], smalltalk.Object);
 
-(self['@chunkParser']=smalltalk.send((smalltalk.ChunkParser || ChunkParser), "_new", []));
 
+self['@chunkParser']=smalltalk.send((smalltalk.ChunkParser || ChunkParser), "_new", []);
 
 return self;},
 
 return self;},
 
 args: [],
 
 args: [],
 
 source: unescape('initialize%0A%09super%20initialize.%0A%09chunkParser%20%3A%3D%20ChunkParser%20new.'),
 
 source: unescape('initialize%0A%09super%20initialize.%0A%09chunkParser%20%3A%3D%20ChunkParser%20new.'),

+ 1 - 1
st/Kernel-Classes.st
View File 

@@ -34,7 +34,7 @@ prototype
 
 !
 
 !
 
 
 
 methodDictionary
 
 methodDictionary
 
-	<var dict = smalltalk.Dictionary._new();
 
+	<var dict = smalltalk.HashedCollection._new();
 
 	var methods = self.fn.prototype.methods;
 
 	var methods = self.fn.prototype.methods;
 
 	for(var i in methods) {
 
 	for(var i in methods) {
 
 		if(methods[i].selector) {
 
 		if(methods[i].selector) {