[Pharo-project] Issue 3671 in pharo: Shout: mark ByteArray literals as ByteArrays instead of Arrays

pharo at googlecode.com pharo at googlecode.com
Sun Feb 6 21:48:23 CET 2011


Status: FixedWaitingToBePharoed
Owner: stephane... at gmail.com
Labels: Type-Squeak Milestone-1.3

New issue 3671 by stephane... at gmail.com: Shout: mark ByteArray literals as  
ByteArrays instead of Arrays
http://code.google.com/p/pharo/issues/detail?id=3671

Name: ShoutCore-ul.28
Author: ul
Time: 28 January 2011, 1:17:21.77 am
UUID: 29ed9d42-0ccc-fc49-a38d-57214f045916
Ancestors: ShoutCore-ul.27

- mark ByteArray literals as ByteArrays instead of Arrays
=============== Diff against ShoutCore-ul.27 ===============

Item was changed:
  ----- Method: SHParserST80>>parseByteArray (in category 'parse') -----
  parseByteArray
        [currentTokenFirst == $]] whileFalse: [
                currentTokenFirst isDigit
                        ifTrue: [
                                "do not parse the number, can be time  
consuming"
                                self scanPast: #number]
                        ifFalse: [
                                self failWhen: currentTokenFirst == $. .
                                self error]].
+       self scanPast: #byteArrayEnd!
-       self scanPast: #arrayEnd!

Item was changed:
  ----- Method: SHParserST80>>parseSymbol (in category 'parse') -----
  parseSymbol
        | c |
        currentToken = '#'
                ifTrue: [
                        "if token is just the #, then scan whitespace and  
comments
                        and then process the next character.
                        Squeak allows space between the # and the start of  
the symbol
                        e.g. # (),  #  a, #  'sym' "
                        self rangeType: #symbol.
                        self scanWhitespace].
        c := self currentChar.
        self failWhen: (c isNil or: [c isSeparator]).
        c == $(
                ifTrue: [
                        self nextChar.
                        self scanPast: #arrayStart start:  
currentTokenSourcePosition end: currentTokenSourcePosition + 1.
                        ^self parseArray].
        c == $' ifTrue: [^self parseSymbolString].
        c == $[ ifTrue: [
                        self nextChar.
+                       self scanPast: #byteArrayStart start:  
currentTokenSourcePosition end: currentTokenSourcePosition + 1.
-                       self scanPast: #arrayStart start:  
currentTokenSourcePosition end: currentTokenSourcePosition + 1.
                        ^self parseByteArray].
        ((self isSelectorCharacter: c) or: [c == $-])
                ifTrue: [^self parseSymbolSelector].
        (c isLetter or: [
                c == $: or: [
                c == $_ and: [self allowUnderscoreSelectors] ] ])
                        ifTrue: [^self parseSymbolIdentifier].
        ^self parseCharSymbol!

Item was changed:
  ----- Method: SHTextStylerST80 class>>defaultStyleTable (in  
category 'style table') -----
  defaultStyleTable
        "color can be a valid argument to Color class>>colorFrom: , or nil to
        use the editor text color.
        Multiple emphases can be specified using an array e.g. #(bold  
italic).
        If emphasis is not specified, #normal will be used.
        if pixel height is not specified , then the editor font size will be  
used.
        "

  ^#(
        "(symbol        color           [emphasisSymbolOrArray           
[textStyleName [pixelHeight]]])"
         
(default                                                                 
black           )
         
(invalid                                                                 
red                     )
         
(excessCode                                                              
red                     )
         
(comment                                                                 
(green muchDarker)              italic)
        (unfinishedComment                                      (red  
muchDarker)        italic)
         
(#'$'                                                                    
(red muchDarker)        )
         
(character                                                               
(red muchDarker)        )
         
(integer                                                                         
(red muchDarker)        )
        (number                                                         (red  
muchDarker)        )
         
(#-                                                                              
(red muchDarker)        )
         
(symbol                                                                  
(blue muchDarker)                       bold)
        (stringSymbol                                                    
(blue muchDarker)                       bold)
        (literalArray                                                    
(blue muchDarker)                       bold)
         
(string                                                                  
(magenta muchDarker)    normal)
        (unfinishedString                                                
red                     normal          )
         
(assignment                                                              
nil                     bold                    )
        (ansiAssignment                                                  
nil                     bold)
         
(literal                                                                         
nil                     italic)
         
(keyword                                                                 
(blue muchDarker)                       )
         
(binary                                                                  
(blue muchDarker)                       )
         
(unary                                                                   
(blue muchDarker)                       )
        (incompleteKeyword                                               
(gray muchDarker)                       underlined)
        (incompleteBinary                                                
(gray muchDarker)                       underlined)
        (incompleteUnary                                                 
(gray muchDarker)                       underlined)
        (undefinedKeyword                                                
red                     )
        (undefinedBinary                                                 
red                     )
        (undefinedUnary                                          
red                     )
        (patternKeyword                                                  
nil                     bold)
        (patternBinary                                                   
nil                     bold)
        (patternUnary                                                    
nil                     bold)
         
(#self                                                                   
(red muchDarker)        bold)
         
(#super                                                                  
(red muchDarker)        bold)
         
(#true                                                                   
(red muchDarker)        bold)
         
(#false                                                                          
(red muchDarker)        bold)
         
(#nil                                                                    
(red muchDarker)        bold)
        (#thisContext                                                   (red  
muchDarker)        bold)
         
(#return                                                                 
(red muchDarker)        bold)
        (patternArg                                                      
(blue muchDarker)                       italic)
         
(methodArg                                                               
(blue muchDarker)                       italic)
        (blockPatternArg                                                 
(blue muchDarker)                       italic)
         
(blockArg                                                                
(blue muchDarker)                       italic)
         
(argument                                                                
(blue muchDarker)                       italic)
        (blockArgColon                                                   
black           )
         
(leftParenthesis                                                         
black           )
        (rightParenthesis                                                
black           )
        (leftParenthesis1                                                
(green muchDarker)              )
        (rightParenthesis1                                               
(green muchDarker)              )
        (leftParenthesis2                                                
(magenta muchDarker)            )
        (rightParenthesis2                                               
(magenta muchDarker)            )
        (leftParenthesis3                                               (red  
muchDarker)                )
        (rightParenthesis3                                              (red  
muchDarker)                )
        (leftParenthesis4                                                
(green darker)          )
        (rightParenthesis4                                               
(green darker)          )
        (leftParenthesis5                                                
(orange darker)         )
        (rightParenthesis5                                               
(orange darker)         )
        (leftParenthesis6                                                
(magenta darker)                )
        (rightParenthesis6                                               
(magenta darker)                )
        (leftParenthesis7                                                
blue            )
        (rightParenthesis7                                               
blue            )
         
(blockStart                                                              
black           )
         
(blockEnd                                                                
black           )
         
(blockStart1                                                             
(green muchDarker)                      )
         
(blockEnd1                                                               
(green muchDarker)                      )
         
(blockStart2                                                             
(magenta muchDarker)            )
         
(blockEnd2                                                               
(magenta muchDarker)            )
         
(blockStart3                                                             
(red muchDarker)                )
         
(blockEnd3                                                               
(red muchDarker)                )
         
(blockStart4                                                             
(green darker)          )
         
(blockEnd4                                                               
(green darker)          )
         
(blockStart5                                                             
(orange darker)         )
         
(blockEnd5                                                               
(orange darker)         )
         
(blockStart6                                                             
(magenta darker)                )
         
(blockEnd6                                                               
(magenta darker)                )
         
(blockStart7                                                             
blue            )
         
(blockEnd7                                                               
blue            )
         
(arrayStart                                                              
black           )
         
(arrayEnd                                                                
black           )
        (arrayStart1                                                     
black           )
         
(arrayEnd1                                                               
black           )
+        
(byteArrayStart                                                          
black           )
+        
(byteArrayEnd                                                            
black           )
+        
(byteArrayStart1                                                         
black           )
+        
(byteArrayEnd1                                                           
black           )
         
(leftBrace                                                               
black           )
         
(rightBrace                                                              
black           )

....







More information about the Pharo-project mailing list