Changeset 6350 for lang/smalltalk

Timestamp:

02/08/08 00:25:19 (10 months ago)

Author:

murky-satyr

Message:

lang/smalltalk/misc/gost.st: SequenceableCollection?>>#zip

Files:

• lang/smalltalk/misc/gost.st (modified) (4 diffs)

lang/smalltalk/misc/gost.st

@@ -82 +82 @@
 |> s
   self P: s!
+@ o
+  (o respondsTo: #collect:) and: [ ^o collect: [:i| self at: i ] ].
+  ^self at: o!
 
 !Symbol methodsFor: 'golf'!
@@ -123 +126 @@
 
 !SequenceableCollection methodsFor: 'golf'!
-/ p
-  ^(p isKindOf: SequenceableCollection) ifTrue: [
-    | s r |
-    s := self readStream. r := OrderedCollection new.
-    [ r add: (s upToAll: p). s atEnd ] whileFalse.
-    r.
-  ] ifFalse: [ super / p ]!
+/ o
+  | s r |
+  s := ReadStream on: self. 
+  r := OrderedCollection new.
+  (o isKindOf: SequenceableCollection) and: [
+    [ r add: (s upToAll: o). s atEnd ] whileFalse ].
+  (o isKindOf: Integer) and: [
+    [ r add: (s nextAvailable: o). s atEnd ] whileFalse ].
+  ^r!
 * o
   ^(o isKindOf: Integer)
@@ -148 +153 @@
 displayOn: s
   | j |
-  (j := Golf.Dic at: $\) isNil
-    ifTrue:  [ self do: [:x| x displayOn: s ] ]
-    ifFalse: [ self do: [:x| x displayOn: s ] separatedBy: [ j displayOn: s ] ]!
-  
+  (j := Golf.Dic at: $\)
+    ifNil:    [ self do: [:x| x displayOn: s ] ]
+    ifNotNil: [ self do: [:x| x displayOn: s ] separatedBy: [ j displayOn: s ] ]!
+zip
+  "Transpose rows with columns (derived from GolfScript)."
+  | cols |
+  cols := 1 to: self size.
+  ^(1 to: self first size) collect:
+    [:i| cols collect: [:j| (self at: j) at: i ] ]!
+
 !False methodsFor: 'golf'!
 displayOn: s!
@@ -199 +210 @@
   "Makes a [D]ictionary from an array of associations."
   ^self asArray inject: Dictionary new into: [ :d :a | d add: a. d ]!
-@ o
-  ^(o respondsTo: #collect:)
-    ifTrue:  [ o collect: [:i| self at: i ] ]
-    ifFalse: [ self at: o ]!
 + o
   (o isKindOf: BlockClosure) and: [ ^self fold: o ].
   o isSymbol and: [ ^self fold: [:a :b| a perform: o with: b ] ]!
-/ n
-  | r s |
-  r := OrderedCollection new: (self size / n) ceiling.
-  s := ReadStream on: self.
-  [ r add: (s nextAvailable: n). s atEnd ] whileFalse.
-  ^r!
 \ b
   ^self collect: b!