Merge jv
authorMerge Script
Wed, 28 Sep 2016 07:09:47 +0200
branchjv
changeset 3992 55ffd6a46a6e
parent 3990 ee6b0bd566bd (current diff)
parent 3991 0b7e28f80502 (diff)
child 3996 994d11e31adf
Merge
Parser.st
--- a/Parser.st	Mon Sep 26 06:45:41 2016 +0200
+++ b/Parser.st	Wed Sep 28 07:09:47 2016 +0200
@@ -5062,7 +5062,7 @@
      reading and simple sends, where the overhead of compilation is bigger
      than the interpretation overhead.
 
-     If chekForEndOfInput is set, generate an error if EOF hat not been reached
+     If checkForEndOfInput is set, generate an error if EOF has not been reached
      at the end of the expression."
 
     |tree mustBackup loggedString chgStream value s sReal spc
@@ -8532,29 +8532,29 @@
         ParserFlags allowSTXExtendedArrayLiterals:true
      Typed literal arrays are written in scheme-style as:
         #u8( element... )   - unsigned 8-bit bytes (i.e. a regular ByteArray)
-        #u16( element... )  - unsigned 16-bit shorts (i.e. a WordArray)  
-        #u32( element... )  - unsigned 32-bit ints (i.e. an IntegerArray) 
-        #u64( element... )  - unsigned 64-bit ints (i.e. a LongIntegerArray) 
-        #s8( element... )   - signed bytes (i.e. a SignedByteArray) 
-        #u16( element... )  - signed 16-bit shorts (i.e. a SignedWordArray)  
-        #u32( element... )  - signed 32-bit ints (i.e. a SignedIntegerArray) 
-        #u64( element... )  - signed 64-bit ints (i.e. a SignedLongIntegerArray) 
-        #f16( element... )  - tiny 16-bit floats (i.e. a HalfFloatArray)  
-        #f32( element... )  - short 32-bit floats (i.e. a FloatArray)  
-        #f64( element... )  - 64-bit doubles (i.e. a DoubleArray)   
-
-        #f( element... )    - same as f32(...)  
-        #d( element... )    - same as f64(...)  
-    "
-    
+        #u16( element... )  - unsigned 16-bit shorts (i.e. a WordArray)
+        #u32( element... )  - unsigned 32-bit ints (i.e. an IntegerArray)
+        #u64( element... )  - unsigned 64-bit ints (i.e. a LongIntegerArray)
+        #s8( element... )   - signed bytes (i.e. a SignedByteArray)
+        #u16( element... )  - signed 16-bit shorts (i.e. a SignedWordArray)
+        #u32( element... )  - signed 32-bit ints (i.e. a SignedIntegerArray)
+        #u64( element... )  - signed 64-bit ints (i.e. a SignedLongIntegerArray)
+        #f16( element... )  - tiny 16-bit floats (i.e. a HalfFloatArray)
+        #f32( element... )  - short 32-bit floats (i.e. a FloatArray)
+        #f64( element... )  - 64-bit doubles (i.e. a DoubleArray)
+
+        #f( element... )    - same as f32(...)
+        #d( element... )    - same as f64(...)
+    "
+
     "literal bytearrays started with ST-80 R4 - byteArray constants are written as #[ ... ]"
 
     |idx containerType container elStream newArray elem pos1 pos2|
 
     idx := #( #u1 #u8 #u16 #u32 #u64
-              #s8 #s16 #s32 #s64 
-              #f16 #f32 #f64 
-              #f #d #b 
+              #s8 #s16 #s32 #s64
+              #f16 #f32 #f64
+              #f #d #b
               #B) indexOf:typeSymbol.
     idx == 0 ifTrue:[
         self parseError:'unsupported array type:',typeSymbol.
@@ -8563,8 +8563,8 @@
                             BitArray ByteArray WordArray IntegerArray LongIntegerArray
                             SignedByteArray SignedWordArray SignedIntegerArray SignedLongIntegerArray
                             HalfFloatArray FloatArray DoubleArray
-                            FloatArray DoubleArray BitArray 
-                            BooleanArray      
+                            FloatArray DoubleArray BitArray
+                            BooleanArray
                      ) at:idx.
     pos1 := tokenPosition.
     container := (Smalltalk at:containerType) uninitializedNew:50.
@@ -8598,7 +8598,7 @@
             (typeSymbol == #u8 and:[elem < 0]) ifTrue:[
                 self parseError:'element is not appropriate for #',typeSymbol,'-array (',containerType,')' position:pos2 to:tokenPosition.
                 elem := container defaultElement.
-            ].    
+            ].
         ].
         elStream nextPut:elem.
         self nextToken.
@@ -11000,7 +11000,7 @@
                     self rememberSelectorUsed:selPerformed
                 ] ifFalse:[
                     (
-                        #( 
+                        #(
                            'pushEvent:'
                            'pushUserEvent:'
                            'enqueueMessage:'