Merge jv
authorMerge Script
Sun, 06 Mar 2016 07:05:01 +0100
branchjv
changeset 5604 557f2eac0204
parent 5602 1796d84c3bf1 (current diff)
parent 5603 04f026f65189 (diff)
child 5606 f14c4dd11731
Merge
TextCollector.st
--- a/TextCollector.st	Thu Mar 03 06:57:29 2016 +0100
+++ b/TextCollector.st	Sun Mar 06 07:05:01 2016 +0100
@@ -858,21 +858,32 @@
     "Modified: 11.1.1997 / 14:43:26 / cg"
 !
 
+printf:formatSpec
+    "convenient C-style formatted printing"
+
+    ^ entryStream printf:formatSpec
+
+    "
+     1 to: 10 do:[:i |
+        Transcript printf:'Hello World\n'
+     ].
+    "
+!
+
 printf:formatSpec with:arg1
-    "convenient C-style formatted printing"
+    "convenient C-style formatted printing with 1 argument"
 
     ^ entryStream printf:formatSpec with:arg1
 
     "
      1 to: 10 do:[:i |
-        Transcript 
-            printf:'[%d] Hello World\n' with:i
+        Transcript printf:'[%d] Hello World\n' with:i
      ].
     "
 !
 
 printf:formatSpec with:arg1 with:arg2
-    "convenient C-style formatted printing"
+    "convenient C-style formatted printing with 2 arguments"
 
     ^ entryStream printf:formatSpec with:arg1 with:arg2
 
@@ -885,7 +896,7 @@
 !
 
 printf:formatSpec with:arg1 with:arg2 with:arg3
-    "convenient C-style formatted printing"
+    "convenient C-style formatted printing with 3 arguments"
 
     ^ entryStream printf:formatSpec with:arg1 with:arg2 with:arg3
 
@@ -924,7 +935,7 @@
 !
 
 printf:formatSpec withAll:args
-    "convenient C-style formatted printing"
+    "convenient C-style formatted printing with an arbitrary number of arguments"
 
     ^ entryStream printf:formatSpec withAll:args