Merge jv
authorMerge Script
Sun, 14 Feb 2016 07:00:00 +0100
branchjv
changeset 3710 e529aebad054
parent 3707 4593eb11f9f5 (current diff)
parent 3709 e9d10d99ef0d (diff)
child 3713 90cdfdac0941
Merge
ByteCodeCompiler.st
--- a/ByteCodeCompiler.st	Thu Feb 04 15:54:53 2016 +0000
+++ b/ByteCodeCompiler.st	Sun Feb 14 07:00:00 2016 +0100
@@ -2046,7 +2046,7 @@
         nr <= 16rFFFF ifTrue:[
             codeStream 
                 nextPut:#lineno16;
-                nextPutShort:nr MSB:true.
+                nextPutInt16:nr MSB:true.
         ]
     ].
 !
--- a/Explainer.st	Thu Feb 04 15:54:53 2016 +0000
+++ b/Explainer.st	Sun Feb 14 07:00:00 2016 +0100
@@ -1582,27 +1582,28 @@
 
     "/ only show the value, if it is really short...
     (aValue isBoolean
-	or:[aValue isNil
-	or:[aValue isString
-	or:[aValue isNumber
-	or:[aValue isPoint
-    ]]]]) ifTrue:[
-	^ aValue storeString.
+        or:[aValue isNil
+        or:[aValue isString
+        or:[aValue isNumber
+        or:[aValue isPoint
+        or:[aValue isCharacter
+    ]]]]]) ifTrue:[
+        ^ aValue storeString.
     ].
 
     (aValue isColor) ifTrue:[
-	^ 'Color: ',('   ' emphasizeAllWith:(#backgroundColor->aValue)).
+        ^ 'Color: ',('   ' emphasizeAllWith:(#backgroundColor->aValue)).
     ].
 
     ((aValue isKindOf:GUID)
      or:[aValue isUUID]) ifTrue:[
-	valString := aValue printString.
+        valString := aValue printString.
     ].
 
     (valString isEmptyOrNil
      or:[ valString size > 50
      or:[ valString includes:Character cr ]]) ifTrue:[
-	valString := aValue classNameWithArticle.
+        valString := aValue classNameWithArticle.
     ].
 
     ^ valString