Re: [Help-smalltalk] Diffences between x86 and i386 files

[Paolo Bonzini]

> unfortunately, I have found differences between some documentations
> files when
> they are generated agains the x86_64 and i386 architecure.
>
> Ith will be nice, if you have any hint to aboid this situation,
> because the caused a
> socall multilib issue.

Sure, this time I can easily help.  I attach a patch for 2.3.6 and one 
for devo, both committed to arch.

Paolo

2007-10-25  Paolo Bonzini  <address@hidden>

        * Publish.st: Compare strings case-sensitively to avoid differences
        due to hashing.


--- orig/doc/gst.texi
+++ mod/doc/gst.texi
@@ -1644,7 +1644,7 @@ The @code{DLD} class enhances the C call
 for unresolved functions in a series of program-specified libraries.  To
 add a library to the list, evaluate code like the following:
 @example
-     DLD addLibrary: '/usr/lib/libc'
+     DLD addLibrary: 'libc'
 @end example
 
 The extension (@file{.so}, @file{.sl}, @file{.a}, @file{.dll} depending


--- orig/packages/stinst/doc/Publish.st
+++ mod/packages/stinst/doc/Publish.st
@@ -28,6 +28,18 @@
 |
  ======================================================================"
 
+String extend [
+    caseSensitiveCompareTo: aCharacterArray [
+        | c1 c2 |
+        1 to: (self size min: aCharacterArray size)
+            do:
+                [:i |
+                c1 := (self at: i) value.
+                c2 := (aCharacterArray at: i) value.
+                c1 = c2 ifFalse: [^c1 - c2]].
+        ^self size - aCharacterArray size
+    ]
+]
 
 
 Object subclass: ClassPublisher [
@@ -694,7 +706,8 @@ ClassPublisher subclass: DocPublisher [
                [:assoc | 
                assoc value methodSourceString isNil 
                    ifFalse: [categoryMethods add: assoc key -> assoc value 
methodSourceString]].
-       categoryMethods := categoryMethods asSortedCollection.
+       categoryMethods := categoryMethods asSortedCollection: [ :a :b |
+           (a key caseSensitiveCompareTo: b key) <= 0 ].
        categories add: (category , kind) -> categoryMethods.
        self emitLink: category kind: kind
     ]



2007-10-25  Paolo Bonzini  <address@hidden>

        * Publish.st: Compare strings case-sensitively to avoid differences
        due to hashing.


--- orig/doc/gst.texi
+++ mod/doc/gst.texi
@@ -1501,7 +1501,7 @@ The @code{DLD} class enhances the C call
 for unresolved functions in a series of program-specified libraries.  To
 add a library to the list, evaluate code like the following:
 @example
-     DLD addLibrary: '/usr/lib/libc'
+     DLD addLibrary: 'libc'
 @end example
 
 The extension (@file{.so}, @file{.sl}, @file{.a}, @file{.dll} depending


--- orig/examples/Publish.st
+++ mod/examples/Publish.st
@@ -34,6 +34,17 @@ Namespace current: ClassPublisher!
 
 !String methodsFor: 'useful functionality'!
 
+caseSensitiveCompareTo: aCharacterArray
+    | c1 c2 |
+    1 to: (self size min: aCharacterArray size)
+        do:
+            [:i |
+            c1 := (self at: i) value.
+            c2 := (aCharacterArray at: i) value.
+            c1 = c2 ifFalse: [^c1 - c2]].
+    ^self size - aCharacterArray size
+!
+
 linesDo: aBlock
     "Send 'aBlock' a substring of the receiver for each newline delimited
      line in the receiver"
@@ -648,7 +659,8 @@ emitCategory: category
            categoryMethods add: assoc key -> assoc value methodSourceString
        ]
     ].
-    categoryMethods := categoryMethods asSortedCollection.
+    categoryMethods := categoryMethods asSortedCollection: [ :a :b |
+        (a key caseSensitiveCompareTo: b key) <= 0 ].
     categories add: (category, kind) -> categoryMethods.
 
     self emitLink: category kind: kind