resin 0.2.2 → 0.2.3

data/amber/st/Kernel-Classes.st

@@ -29,12 +29,25 @@ allSubclasses
 	^result
 !
 
+allSuperclasses
+	
+    self superclass ifNil: [ ^ #() ].
+    
+	^ (OrderedCollection with: self superclass) 
+    	addAll: self superclass allSuperclasses;
+        yourself
+!
+
 comment
     ^(self basicAt: 'comment') ifNil: ['']
 !
 
 comment: aString
-    self basicAt: 'comment' put: aString
+    self basicAt: 'comment' put: aString.
+    SystemAnnouncer current
+    	announce: (ClassCommentChanged new
+        	theClass: self;
+            yourself)
 !
 
 commentStamp
@@ -47,12 +60,16 @@ commentStamp: aStamp prior: prior
         ^self commentStamp
 !
 
+definition
+	^ ''
+!
+
 instanceVariableNames
 	<return self.iVarNames>
 !
 
-methodAt: aString
-	<return smalltalk.methods(self)[aString]>
+methodAt: aSymbol
+	<return smalltalk.methods(self)[aSymbol._asString()]>
 !
 
 methodDictionary
@@ -66,6 +83,10 @@ methodDictionary
 	return dict>
 !
 
+methods
+	^ self methodDictionary values
+!
+
 methodsFor: aString
 	^ClassCategoryReader new
 	    class: self category: aString;
@@ -77,6 +98,10 @@ methodsFor: aString stamp: aStamp
 	^self methodsFor: aString
 !
 
+methodsInProtocol: aString
+	^ self methodDictionary values select: [ :each | each protocol = aString ]
+!
+
 name
 	<return self.className || nil>
 !
@@ -107,6 +132,10 @@ prototype
 	<return self.fn.prototype>
 !
 
+selectors
+	^ self methodDictionary keys
+!
+
 subclasses
 	<return smalltalk.subclasses(self)>
 !
@@ -115,6 +144,14 @@ superclass
 	<return self.superclass || nil>
 !
 
+theMetaClass
+	^ self class
+!
+
+theNonMetaClass
+	^ self
+!
+
 withAllSubclasses
 	^(Array with: self) addAll: self allSubclasses; yourself
 ! !
@@ -122,7 +159,13 @@ withAllSubclasses
 !Behavior methodsFor: 'compiling'!
 
 addCompiledMethod: aMethod
-	<smalltalk.addMethod(aMethod.selector._asSelector(), aMethod, self)>
+	<smalltalk.addMethod(aMethod.selector._asSelector(), aMethod, self)>.
+    
+    SystemAnnouncer current
+   		announce: (MethodAdded new
+        	theClass: self;
+            method: aMethod;
+            yourself)
 !
 
 compile: aString
@@ -131,14 +174,21 @@ compile: aString
 
 compile: aString category: anotherString
 	Compiler new
-		install: aString forClass: self category: anotherString;
-		setupClass: self
+		install: aString 
+        forClass: self 
+        category: anotherString
 !
 
 removeCompiledMethod: aMethod
 	<delete self.fn.prototype[aMethod.selector._asSelector()];
 	delete self.fn.prototype.methods[aMethod.selector];
-	smalltalk.init(self);>
+	smalltalk.init(self);>.
+    
+    SystemAnnouncer current
+   		announce: (MethodRemoved new
+        	theClass: self;
+            method: aMethod;
+            yourself)
 ! !
 
 !Behavior methodsFor: 'instance creation'!
@@ -177,6 +227,24 @@ category
 	^self package ifNil: ['Unclassified'] ifNotNil: [self package name]
 !
 
+definition
+	^ String streamContents: [ :stream |
+		stream 
+	    	nextPutAll: self superclass asString;
+	    	nextPutAll: ' subclass: #';
+	    	nextPutAll: self name;
+	    	nextPutAll: String lf, String tab;
+	    	nextPutAll: 'instanceVariableNames: '''.
+		self instanceVariableNames 
+          	do: [ :each | stream nextPutAll: each ] 
+	    	separatedBy: [ stream nextPutAll: ' ' ].
+		stream
+	    	nextPutAll: '''', String lf, String tab;
+	    	nextPutAll: 'package: ''';
+	    	nextPutAll: self category;
+	    	nextPutAll: '''' ]
+!
+
 package
 	<return self.pkg>
 !
@@ -186,11 +254,7 @@ package: aPackage
 !
 
 rename: aString
-	<
-		smalltalk[aString] = self;
-		delete smalltalk[self.className];
-		self.className = aString;
-	>
+	ClassBuilder new renameClass: self to: aString
 ! !
 
 !Class methodsFor: 'class creation'!
@@ -216,6 +280,12 @@ subclass: aString instanceVariableNames: aString2 package: aString3
 	    superclass: self subclass: aString asString instanceVariableNames: aString2 package: aString3
 ! !
 
+!Class methodsFor: 'converting'!
+
+asJavascript
+	^ 'smalltalk.', self name
+! !
+
 !Class methodsFor: 'printing'!
 
 printString
@@ -239,6 +309,18 @@ Metaclass instances have a single instance, which they hold onto, which is the c
 
 !Metaclass methodsFor: 'accessing'!
 
+definition
+	^ String streamContents: [ :stream |
+		stream 
+	   	 	nextPutAll: self asString;
+	    	nextPutAll: ' class ';
+	    	nextPutAll: 'instanceVariableNames: '''.
+		self instanceVariableNames
+	    	do: [ :each | stream nextPutAll: each ]
+	    	separatedBy: [ stream nextPutAll: ' ' ].
+		stream nextPutAll: '''' ]
+!
+
 instanceClass
 	<return self.instanceClass>
 !
@@ -246,6 +328,20 @@ instanceClass
 instanceVariableNames: aCollection
 	ClassBuilder new
 	    class: self instanceVariableNames: aCollection
+!
+
+theMetaClass
+	^ self
+!
+
+theNonMetaClass
+	^ self instanceClass
+! !
+
+!Metaclass methodsFor: 'converting'!
+
+asJavascript
+	^ 'smalltalk.', self instanceClass name, '.klass'
 ! !
 
 !Metaclass methodsFor: 'printing'!
@@ -273,19 +369,45 @@ Rather than using ClassBuilder directly to compile a class, use `Class >> subcla
 class: aClass instanceVariableNames: aString
 	aClass isMetaclass ifFalse: [self error: aClass name, ' is not a metaclass'].
 	aClass basicAt: 'iVarNames' put: (self instanceVariableNamesFor: aString).
+    
+    SystemAnnouncer current
+    	announce: (ClassDefinitionChanged new
+        	theClass: aClass;
+            yourself).
+    
 	self setupClass: aClass
 !
 
+renameClass: aClass to: aString
+	<
+		smalltalk[aString] = aClass;
+		delete smalltalk[aClass.className];
+		aClass.className = aString;
+	>.
+    
+    SystemAnnouncer current
+    	announce: (ClassRenamed new
+        	theClass: aClass;
+            yourself)
+!
+
 superclass: aClass subclass: aString
 	^self superclass: aClass subclass: aString instanceVariableNames: '' package: nil
 !
 
 superclass: aClass subclass: aString instanceVariableNames: aString2 package: aString3
 	| newClass |
-	newClass := self addSubclassOf: aClass
-				named: aString instanceVariableNames: (self instanceVariableNamesFor: aString2)
-				package: (aString3 ifNil: ['unclassified']).
+	
+    newClass := self addSubclassOf: aClass
+		named: aString instanceVariableNames: (self instanceVariableNamesFor: aString2)
+		package: (aString3 ifNil: ['unclassified']).
 	self setupClass: newClass.
+    
+    SystemAnnouncer current 
+    	announce: (ClassAdded new
+        	theClass: newClass;
+            yourself).
+    
 	^newClass
 ! !
 

data/amber/st/Kernel-Collections.st

@@ -27,16 +27,22 @@ value: aValue
 	^self class = anAssociation class and: [
 	    self key = anAssociation key and: [
 		self value = anAssociation value]]
+! !
+
+!Association methodsFor: 'printing'!
+
+printString
+	"print the contents of the Association into a string and return the string"
+	^String streamContents: [:aStream |
+		self storeOn: aStream]
 !
 
 storeOn: aStream
-	"Store in the format (key->value)"
+	"Store in the format: key->value"
 
-	"aStream nextPutAll: '('."
 	key storeOn: aStream.
 	aStream nextPutAll: '->'.
 	value storeOn: aStream.
-	"aStream nextPutAll: ')'"
 ! !
 
 !Association class methodsFor: 'instance creation'!
@@ -54,6 +60,15 @@ Object subclass: #Collection
 
 !Collection methodsFor: 'accessing'!
 
+occurrencesOf: anObject 
+	"Answer how many of the receiver's elements are equal to anObject."
+
+	| tally |
+	tally := 0.
+	self do: [:each | anObject = each ifTrue: [tally := tally + 1]].
+	^tally
+!
+
 readStream
 	^self stream
 !
@@ -138,11 +153,11 @@ copyWithoutAll: aCollection
 !Collection methodsFor: 'enumerating'!
 
 collect: aBlock
-	| newCollection |
-	newCollection := self class new.
-	self do: [:each |
-	    newCollection add: (aBlock value: each)].
-	^newCollection
+	| stream |
+	stream := self class new writeStream.
+	self do: [ :each |
+		stream nextPut: (aBlock value: each) ].
+	^stream contents
 !
 
 detect: aBlock
@@ -180,6 +195,22 @@ inject: anObject into: aBlock
 	^result
 !
 
+intersection: aCollection
+	"Answer the set theoretic intersection of two collections."
+
+	| set outputSet |
+	
+	set := self asSet.
+	outputSet := Set new.
+	
+	aCollection do: [ :each |
+		((set includes: each) and: [(outputSet includes: each) not])
+			ifTrue: [ 
+				outputSet add: each]].
+		
+	^ self class withAll: outputSet asArray
+!
+
 reject: aBlock
 	^self select: [:each | (aBlock value: each) = false]
 !
@@ -199,6 +230,18 @@ errorNotFound
 	self error: 'Object is not in the collection'
 ! !
 
+!Collection methodsFor: 'printing'!
+
+printString
+	"print the contents of the Collection into a string and return it"
+	^String streamContents: [:aStream |
+		aStream
+			nextPutAll: super printString, ' ('.
+		self do: [:each | aStream nextPutAll: each printString]
+			separatedBy: [aStream nextPutAll: ' '].
+		aStream nextPutAll: ')']
+! !
+
 !Collection methodsFor: 'testing'!
 
 ifEmpty: aBlock
@@ -304,13 +347,21 @@ at: aKey ifAbsentPut: aBlock
 !
 
 at: aKey ifPresent: aBlock
-	^(self basicAt: aKey) ifNotNil: [aBlock value: (self at: aKey)]
+	"Lookup the given key in the receiver. 
+	If it is present, answer the value of evaluating the given block with the value associated with the key. 
+	Otherwise, answer nil."
+	^(self includesKey: aKey)
+		ifTrue: [ aBlock value: (self at: aKey) ]
+		ifFalse: [ nil ]
 !
 
 at: aKey ifPresent: aBlock ifAbsent: anotherBlock
-	^(self basicAt: aKey)
-	    ifNil: anotherBlock
-	    ifNotNil: [aBlock value: (self at: aKey)]
+	"Lookup the given key in the receiver. 
+	If it is present, answer the value of evaluating the oneArgBlock with the value associated with the key, 
+	otherwise answer the value of absentBlock."
+	^(self includesKey: aKey)
+		ifTrue: [ aBlock value: (self at: aKey) ]
+		ifFalse: anotherBlock
 !
 
 at: aKey put: aValue
@@ -453,18 +504,13 @@ select: aBlock
 !HashedCollection methodsFor: 'printing'!
 
 printString
-	^String streamContents: [:aStream|  
-		aStream 
-			nextPutAll: super printString;
-			nextPutAll: '('.
-				self associations 
-					do: [:anAssociation|  
-						aStream 
-							nextPutAll: anAssociation key printString;
-								nextPutAll: ' -> ';
-								nextPutAll: anAssociation value printString]
-							separatedBy: [aStream nextPutAll: ' , '].
-						aStream nextPutAll: ')']
+	"print the contents of the HashedCollection into a string and return the string"
+	^String streamContents: [:aStream |
+		aStream nextPutAll: 'a ', self class name, '('.
+		self associations
+			do: [:each | each storeOn: aStream]
+			separatedBy: [ aStream nextPutAll: ' , '].
+		aStream nextPutAll: ')']
 !
 
 storeOn: aStream
@@ -524,10 +570,22 @@ at: aKey put: aValue
 	>
 !
 
+keyAtValue: anObject
+
+	^ (self associations 
+    	detect:[:k :v| v == anObject] 
+    	ifNone:[self error: 'Not found']) key
+!
+
 keys
 	^keys copy
 !
 
+valueAt: anObject
+
+	^ self associationsDo:2
+!
+
 values
 	^values copy
 ! !
@@ -624,9 +682,9 @@ indexOf: anObject
 
 indexOf: anObject ifAbsent: aBlock
 	<
-		for(var i=0;i<self.length;i++){
-			if(self[i].__eq(anObject)) {return i+1}
-		}
+		for(var i=0;i<self.length;i++) {
+			if(smalltalk.send(self[i], '__eq', [anObject])) {return i+1}
+		};
 		return aBlock();
 	>
 !
@@ -718,19 +776,6 @@ withIndexDo: aBlock
 	<for(var i=0;i<self.length;i++){aBlock(self[i], i+1);}>
 ! !
 
-!SequenceableCollection methodsFor: 'printing'!
-
-printString
-	| str |
-	str := '' writeStream.
-	str nextPutAll: super printString, ' ('.
-	self 
-		do: [:each | str nextPutAll: each printString]
-		separatedBy: [str nextPutAll: ' '].
-	str nextPutAll: ')'.
-	^str contents
-! !
-
 SequenceableCollection subclass: #Array
 	instanceVariableNames: ''
 	package: 'Kernel-Collections'!
@@ -758,15 +803,16 @@ add: anObject
 	<self.push(anObject); return anObject;>
 !
 
-remove: anObject
+remove: anObject ifAbsent: aBlock
 	<
 		for(var i=0;i<self.length;i++) {
 			if(self[i] == anObject) {
 				self.splice(i,1);
-				break;
+				return self;
 			}
 		}
-	>
+	>.
+	aBlock value
 !
 
 removeFrom: aNumber to: anotherNumber
@@ -837,10 +883,12 @@ with: anObject with: anObject2 with: anObject3
 !
 
 withAll: aCollection
-	| instance |
+	| instance index |
+	index := 1.
 	instance := self new: aCollection size.
-	aCollection withIndexDo: [:each :index  |
-		instance at: index put: each].
+	aCollection do: [:each  |
+		instance at: index put: each.
+		index := index + 1].
 	^instance
 ! !
 
@@ -921,7 +969,7 @@ asciiValue
 !
 
 at: anIndex ifAbsent: aBlock
-	<return self[anIndex - 1] || aBlock()>
+	<return String(self).charAt(anIndex - 1) || aBlock()>
 !
 
 escaped
@@ -1046,6 +1094,16 @@ shallowCopy
 	^self class fromString: self
 ! !
 
+!String methodsFor: 'enumerating'!
+
+do: aBlock
+	<for(var i=0;i<self.length;i++){aBlock(self.charAt(i));}>
+!
+
+withIndexDo: aBlock
+	<for(var i=0;i<self.length;i++){aBlock(self.charAt(i), i+1);}>
+! !
+
 !String methodsFor: 'printing'!
 
 printNl
@@ -1210,6 +1268,10 @@ tab
 
 !String class methodsFor: 'instance creation'!
 
+fromCharCode: anInteger
+	<return String.fromCharCode(anInteger)>
+!
+
 fromString: aString
 	    <return new self.fn(aString)>
 !
@@ -1299,6 +1361,34 @@ shallowCopy
 	^self
 ! !
 
+!Symbol methodsFor: 'enumerating'!
+
+collect: aBlock
+	^ (self asString collect: aBlock) asSymbol
+!
+
+detect: aBlock
+	^ self asString detect: aBlock
+!
+
+do: aBlock
+	self asString do: aBlock
+!
+
+select: aBlock
+	^ (self asString select: aBlock) asSymbol
+!
+
+withIndexDo: aBlock
+	self asString withIndexDo: aBlock
+! !
+
+!Symbol methodsFor: 'evaluating'!
+
+value: anObject 
+	^anObject perform: self
+! !
+
 !Symbol methodsFor: 'printing'!
 
 isSymbol