Merge jv
authorHG Automerge
Mon, 16 Jan 2017 19:56:32 +0000
branchjv
changeset 21286 4be14939730c
parent 21285 7770135c2b54 (current diff)
parent 21255 81aa6fa65292 (diff)
child 21287 38f177ccece5
Merge
CharacterArray.st
ExternalStream.st
UserMessage.st
--- a/CharacterArray.st	Fri Jan 13 23:33:10 2017 +0000
+++ b/CharacterArray.st	Mon Jan 16 19:56:32 2017 +0000
@@ -359,7 +359,6 @@
     "Created: 3.8.1997 / 18:16:40 / cg"
 ! !
 
-
 !CharacterArray class methodsFor:'cleanup'!
 
 lowSpaceCleanup
@@ -1049,7 +1048,6 @@
     ^ Unicode32String
 ! !
 
-
 !CharacterArray methodsFor:'Compatibility-ANSI'!
 
 addLineDelimiters
@@ -1737,6 +1735,8 @@
     "return a copy of the receiver, where a '%i' escape
      is replaced by the coresponding string from the argument array.
      'i' may be between 1 and 9 (i.e. a maximum of 9 placeholders is allowed).
+     To get an integer-indexed placeHolder followed by another digit,
+     or an index > 9, you must use %(digit).
      This has been added for VisualAge compatibility."
 
     ^ self expandPlaceholdersWith:anArrayOfStrings
@@ -4994,8 +4994,6 @@
 ! !
 
 
-
-
 !CharacterArray methodsFor:'matching - glob expressions'!
 
 compoundMatch:aString
@@ -6473,7 +6471,6 @@
     "Modified: 17.4.1997 / 12:50:23 / cg"
 ! !
 
-
 !CharacterArray methodsFor:'special string converting'!
 
 asUnixFilenameString
@@ -7521,7 +7518,6 @@
     "
 ! !
 
-
 !CharacterArray methodsFor:'substring searching'!
 
 findRangeOfString:subString
@@ -8335,7 +8331,6 @@
     ^ aVisitor visitString:self with:aParameter
 ! !
 
-
 !CharacterArray class methodsFor:'documentation'!
 
 version
--- a/ExternalStream.st	Fri Jan 13 23:33:10 2017 +0000
+++ b/ExternalStream.st	Mon Jan 16 19:56:32 2017 +0000
@@ -2167,6 +2167,9 @@
          || (__INST(handleType) == @symbol(socketHandle))) {
             RETURN (_handle);
         }
+        if (__INST(handleType) == @symbol(pipeFilePointer)) {
+            RETURN (__MKINT(fileno(__FILEVal(_handle))));
+        }
         if ((__INST(handleType) == nil)
          || (__INST(handleType) == @symbol(filePointer))
          || (__INST(handleType) == @symbol(socketFilePointer))
--- a/UserMessage.st	Fri Jan 13 23:33:10 2017 +0000
+++ b/UserMessage.st	Mon Jan 16 19:56:32 2017 +0000
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "{ Package: 'stx:libbasic' }"
 
 "{ NameSpace: Smalltalk }"
@@ -165,6 +163,8 @@
     "return a copy of the receiver, where a '%i' escape
      is replaced by the coresponding string from the argument array.
      'i' may be between 1 and 9 (i.e. a maximum of 9 placeholders is allowed).
+     To get an integer-indexed placeHolder followed by another digit,
+     or an index > 9, you must use %(digit).
      This has been added for VisualAge compatibility."
 
     ^ self expandPlaceholdersWith:anArrayOfStrings