Sfoglia il codice sorgente

Merge branch 'master' into debugger

Nicolas Petton 11 anni fa
parent
commit
7c93ac08d7
5 ha cambiato i file con 13 aggiunte e 8 eliminazioni
  1. 5 0
      bin/amberc
  2. BIN
      favicon.ico
  3. 2 2
      js/Kernel-Collections.deploy.js
  4. 4 4
      js/Kernel-Collections.js
  5. 2 2
      st/Kernel-Collections.st

+ 5 - 0
bin/amberc

@@ -162,6 +162,11 @@ function print_usage() {
 	console.log('     Additionally export code for deploy - stripped from source etc.');
 	console.log('     Uses suffix ".deploy.js" in addition to any explicit suffic set by -s.');
 	console.log('');
+	console.log('  -D');
+	console.log('     Specifies the output directory for all generated .js files.');
+	console.log('     The hierarchy of the input files is not maintaned.');
+	console.log('     If this option is omitted all generated .js files are placed next to their input files');
+	console.log('');
 	console.log('  -s suffix');
 	console.log('     Add <suffix> to compiled .js files. File.st is then compiled into');
 	console.log('     File.<suffix>.js.');

BIN
favicon.ico


+ 2 - 2
js/Kernel-Collections.deploy.js

@@ -2159,7 +2159,7 @@ var self=this;
 return smalltalk.withContext(function($ctx1) { 
 
 		for(var i=0;i<self.length;i++) {
-			if(self[i] == anObject) {
+			if(_st(self[i]).__eq(anObject)) {
 				self.splice(i,1);
 				return self;
 			}
@@ -3430,7 +3430,7 @@ return smalltalk.withContext(function($ctx1) {
 
 		var found;
 		for(var i=0; i < self['@elements'].length; i++) {
-			if(_st(anObject).__eq_eq(self['@elements'][i])) {
+			if(_st(anObject).__eq(self['@elements'][i])) {
 				found = true;
 				break;
 			}

+ 4 - 4
js/Kernel-Collections.js

@@ -2877,7 +2877,7 @@ var self=this;
 return smalltalk.withContext(function($ctx1) { 
 
 		for(var i=0;i<self.length;i++) {
-			if(self[i] == anObject) {
+			if(_st(self[i]).__eq(anObject)) {
 				self.splice(i,1);
 				return self;
 			}
@@ -2886,7 +2886,7 @@ return smalltalk.withContext(function($ctx1) {
 	;
 return self}, function($ctx1) {$ctx1.fill(self,"remove:ifAbsent:",{anObject:anObject,aBlock:aBlock},smalltalk.Array)})},
 args: ["anObject", "aBlock"],
-source: "remove: anObject ifAbsent: aBlock\x0a\x09<\x0a\x09\x09for(var i=0;i<self.length;i++) {\x0a\x09\x09\x09if(self[i] == anObject) {\x0a\x09\x09\x09\x09self.splice(i,1);\x0a\x09\x09\x09\x09return self;\x0a\x09\x09\x09}\x0a\x09\x09};\x0a\x09\x09aBlock._value();\x0a\x09>",
+source: "remove: anObject ifAbsent: aBlock\x0a\x09<\x0a\x09\x09for(var i=0;i<self.length;i++) {\x0a\x09\x09\x09if(_st(self[i]).__eq(anObject)) {\x0a\x09\x09\x09\x09self.splice(i,1);\x0a\x09\x09\x09\x09return self;\x0a\x09\x09\x09}\x0a\x09\x09};\x0a\x09\x09aBlock._value();\x0a\x09>",
 messageSends: [],
 referencedClasses: []
 }),
@@ -4611,7 +4611,7 @@ return smalltalk.withContext(function($ctx1) {
 
 		var found;
 		for(var i=0; i < self['@elements'].length; i++) {
-			if(_st(anObject).__eq_eq(self['@elements'][i])) {
+			if(_st(anObject).__eq(self['@elements'][i])) {
 				found = true;
 				break;
 			}
@@ -4620,7 +4620,7 @@ return smalltalk.withContext(function($ctx1) {
 	;
 return self}, function($ctx1) {$ctx1.fill(self,"add:",{anObject:anObject},smalltalk.Set)})},
 args: ["anObject"],
-source: "add: anObject\x0a\x09<\x0a\x09\x09var found;\x0a\x09\x09for(var i=0; i < self['@elements'].length; i++) {\x0a\x09\x09\x09if(_st(anObject).__eq_eq(self['@elements'][i])) {\x0a\x09\x09\x09\x09found = true;\x0a\x09\x09\x09\x09break;\x0a\x09\x09\x09}\x0a\x09\x09}\x0a\x09\x09if(!found) {self['@elements'].push(anObject)}\x0a\x09>",
+source: "add: anObject\x0a\x09<\x0a\x09\x09var found;\x0a\x09\x09for(var i=0; i < self['@elements'].length; i++) {\x0a\x09\x09\x09if(_st(anObject).__eq(self['@elements'][i])) {\x0a\x09\x09\x09\x09found = true;\x0a\x09\x09\x09\x09break;\x0a\x09\x09\x09}\x0a\x09\x09}\x0a\x09\x09if(!found) {self['@elements'].push(anObject)}\x0a\x09>",
 messageSends: [],
 referencedClasses: []
 }),

+ 2 - 2
st/Kernel-Collections.st

@@ -966,7 +966,7 @@ addFirst: anObject
 remove: anObject ifAbsent: aBlock
 	<
 		for(var i=0;i<self.length;i++) {
-			if(self[i] == anObject) {
+			if(_st(self[i]).__eq(anObject)) {
 				self.splice(i,1);
 				return self;
 			}
@@ -1524,7 +1524,7 @@ add: anObject
 	<
 		var found;
 		for(var i=0; i < self['@elements'].length; i++) {
-			if(_st(anObject).__eq_eq(self['@elements'][i])) {
+			if(_st(anObject).__eq(self['@elements'][i])) {
 				found = true;
 				break;
 			}