Quellcode durchsuchen

Few changes in Package

Nicolas Petton vor 12 Jahren
Ursprung
Commit
360e9cc761
3 geänderte Dateien mit 45 neuen und 62 gelöschten Zeilen
  1. 14 19
      js/Kernel.deploy.js
  2. 24 29
      js/Kernel.js
  3. 7 14
      st/Kernel.st

+ 14 - 19
js/Kernel.deploy.js

@@ -607,17 +607,6 @@ return self;}
 }),
 smalltalk.Smalltalk);
 
-smalltalk.addMethod(
-'_readJSON_',
-smalltalk.method({
-selector: 'readJSON:',
-fn: function (anObject){
-var self=this;
-return self.readJSObject(anObject);
-return self;}
-}),
-smalltalk.Smalltalk);
-
 smalltalk.addMethod(
 '_at_',
 smalltalk.method({
@@ -802,6 +791,17 @@ return self;}
 }),
 smalltalk.Smalltalk);
 
+smalltalk.addMethod(
+'_readJSObject_',
+smalltalk.method({
+selector: 'readJSObject:',
+fn: function (anObject){
+var self=this;
+return self.readJSObject(anObject);
+return self;}
+}),
+smalltalk.Smalltalk);
+
 
 smalltalk.Smalltalk.klass.iVarNames = ['current'];
 smalltalk.addMethod(
@@ -823,7 +823,7 @@ smalltalk.method({
 selector: 'name',
 fn: function (){
 var self=this;
-return self.pkgName || nil;
+return self.pkgName;
 return self;}
 }),
 smalltalk.Package);
@@ -889,12 +889,7 @@ smalltalk.method({
 selector: 'properties',
 fn: function (){
 var self=this;
-var result=nil;
-result=smalltalk.send((smalltalk.Dictionary || Dictionary), "_new", []);
-for (var i in self.properties) {
-		result._at_put_(i, self.properties[i]);
-	}
-	return result;;
+return smalltalk.send(smalltalk.send((smalltalk.Smalltalk || Smalltalk), "_current", []), "_readJSObject_", [smalltalk.send(self, "_basicAt_", ["properties"])]);
 return self;}
 }),
 smalltalk.Package);
@@ -930,7 +925,7 @@ smalltalk.method({
 selector: 'jsProperties',
 fn: function (){
 var self=this;
-return self.properties || nil;
+return self.properties;
 return self;}
 }),
 smalltalk.Package);

+ 24 - 29
js/Kernel.js

@@ -872,22 +872,6 @@ referencedClasses: []
 }),
 smalltalk.Smalltalk);
 
-smalltalk.addMethod(
-unescape('_readJSON_'),
-smalltalk.method({
-selector: unescape('readJSON%3A'),
-category: 'accessing',
-fn: function (anObject){
-var self=this;
-return self.readJSObject(anObject);
-return self;},
-args: ["anObject"],
-source: unescape('readJSON%3A%20anObject%0A%09%3Creturn%20self.readJSObject%28anObject%29%3E'),
-messageSends: [],
-referencedClasses: []
-}),
-smalltalk.Smalltalk);
-
 smalltalk.addMethod(
 unescape('_at_'),
 smalltalk.method({
@@ -1142,6 +1126,22 @@ referencedClasses: []
 }),
 smalltalk.Smalltalk);
 
+smalltalk.addMethod(
+unescape('_readJSObject_'),
+smalltalk.method({
+selector: unescape('readJSObject%3A'),
+category: 'accessing',
+fn: function (anObject){
+var self=this;
+return self.readJSObject(anObject);
+return self;},
+args: ["anObject"],
+source: unescape('readJSObject%3A%20anObject%0A%09%3Creturn%20self.readJSObject%28anObject%29%3E'),
+messageSends: [],
+referencedClasses: []
+}),
+smalltalk.Smalltalk);
+
 
 smalltalk.Smalltalk.klass.iVarNames = ['current'];
 smalltalk.addMethod(
@@ -1170,10 +1170,10 @@ selector: unescape('name'),
 category: 'accessing',
 fn: function (){
 var self=this;
-return self.pkgName || nil;
+return self.pkgName;
 return self;},
 args: [],
-source: unescape('name%0A%09%3Creturn%20self.pkgName%20%7C%7C%20nil%3E'),
+source: unescape('name%0A%09%3Creturn%20self.pkgName%3E'),
 messageSends: [],
 referencedClasses: []
 }),
@@ -1266,17 +1266,12 @@ selector: unescape('properties'),
 category: 'accessing',
 fn: function (){
 var self=this;
-var result=nil;
-result=smalltalk.send((smalltalk.Dictionary || Dictionary), "_new", []);
-for (var i in self.properties) {
-		result._at_put_(i, self.properties[i]);
-	}
-	return result;;
+return smalltalk.send(smalltalk.send((smalltalk.Smalltalk || Smalltalk), "_current", []), "_readJSObject_", [smalltalk.send(self, "_basicAt_", ["properties"])]);
 return self;},
 args: [],
-source: unescape('properties%0A%09%22It%20is%20stored%20as%20a%20javascript%20object.%22%0A%0A%09%7C%20result%20%7C%0A%09result%20%3A%3D%20Dictionary%20new.%0A%09%3Cfor%20%28var%20i%20in%20self.properties%29%20%7B%0A%09%09result._at_put_%28i%2C%20self.properties%5Bi%5D%29%3B%0A%09%7D%0A%09return%20result%3B%3E'),
-messageSends: ["new"],
-referencedClasses: ["Dictionary"]
+source: unescape('properties%0A%09%5ESmalltalk%20current%20readJSObject%3A%20%28self%20basicAt%3A%20%27properties%27%29'),
+messageSends: ["readJSObject:", "current", "basicAt:"],
+referencedClasses: ["Smalltalk"]
 }),
 smalltalk.Package);
 
@@ -1322,10 +1317,10 @@ selector: unescape('jsProperties'),
 category: 'private',
 fn: function (){
 var self=this;
-return self.properties || nil;
+return self.properties;
 return self;},
 args: [],
-source: unescape('jsProperties%0A%09%3Creturn%20self.properties%20%7C%7C%20nil%3E'),
+source: unescape('jsProperties%0A%09%3Creturn%20self.properties%3E'),
 messageSends: [],
 referencedClasses: []
 }),

+ 7 - 14
st/Kernel.st

@@ -277,10 +277,6 @@ classes
 	<return self.classes()>
 !
 
-readJSON: anObject
-	<return self.readJSObject(anObject)>
-!
-
 at: aString
 	<return self[aString]>
 !
@@ -313,6 +309,10 @@ parseError: anException parsing: aString
 reservedWords
 	"JavaScript reserved words"
 	<return self.reservedWords>
+!
+
+readJSObject: anObject
+	<return self.readJSObject(anObject)>
 ! !
 
 !Smalltalk methodsFor: 'classes'!
@@ -419,7 +419,7 @@ String where the method category "*IDE" defines #inspectOn: which thus is a meth
 !Package methodsFor: 'accessing'!
 
 name
-	<return self.pkgName || nil>
+	<return self.pkgName>
 !
 
 name: aString
@@ -435,14 +435,7 @@ dependencies: anArray
 !
 
 properties
-	"It is stored as a javascript object."
-
-	| result |
-	result := Dictionary new.
-	<for (var i in self.properties) {
-		result._at_put_(i, self.properties[i]);
-	}
-	return result;>
+	^Smalltalk current readJSObject: (self basicAt: 'properties')
 !
 
 properties: aDict
@@ -476,7 +469,7 @@ propertiesAsJSON
 !
 
 jsProperties
-	<return self.properties || nil>
+	<return self.properties>
 !
 
 jsProperties: aJSObject