SyntaxHighlighter2.st
author Jan Vrany <jan.vrany@fit.cvut.cz>
Thu, 29 Aug 2013 21:55:45 +0100
branchjv
changeset 13469 544e7ced18a0
parent 13333 2e8aa3023772
child 15566 184cea584be5
permissions -rw-r--r--
Added *Redo* menu item to CodeViwq's context menu (eclipse style)
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
     1
"
10067
c7b27b7cc827 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 10022
diff changeset
     2
 COPYRIGHT (c) 2010 by Jan Vrany, SWING Research Group. CTU in Prague
13178
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
     3
	      All Rights Reserved
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
     4
10067
c7b27b7cc827 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 10022
diff changeset
     5
Permission is hereby granted, free of charge, to any person
c7b27b7cc827 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 10022
diff changeset
     6
obtaining a copy of this software and associated documentation
c7b27b7cc827 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 10022
diff changeset
     7
files (the 'Software'), to deal in the Software without
c7b27b7cc827 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 10022
diff changeset
     8
restriction, including without limitation the rights to use,
c7b27b7cc827 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 10022
diff changeset
     9
copy, modify, merge, publish, distribute, sublicense, and/or sell
c7b27b7cc827 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 10022
diff changeset
    10
copies of the Software, and to permit persons to whom the
c7b27b7cc827 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 10022
diff changeset
    11
Software is furnished to do so, subject to the following
c7b27b7cc827 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 10022
diff changeset
    12
conditions:
c7b27b7cc827 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 10022
diff changeset
    13
c7b27b7cc827 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 10022
diff changeset
    14
The above copyright notice and this permission notice shall be
c7b27b7cc827 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 10022
diff changeset
    15
included in all copies or substantial portions of the Software.
c7b27b7cc827 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 10022
diff changeset
    16
c7b27b7cc827 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 10022
diff changeset
    17
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
c7b27b7cc827 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 10022
diff changeset
    18
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
c7b27b7cc827 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 10022
diff changeset
    19
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
c7b27b7cc827 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 10022
diff changeset
    20
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
c7b27b7cc827 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 10022
diff changeset
    21
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
c7b27b7cc827 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 10022
diff changeset
    22
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
c7b27b7cc827 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 10022
diff changeset
    23
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
c7b27b7cc827 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 10022
diff changeset
    24
OTHER DEALINGS IN THE SOFTWARE.
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    25
"
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    26
"{ Package: 'stx:libtool' }"
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    27
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    28
SyntaxHighlighter subclass:#SyntaxHighlighter2
12194
4639848e5517 Improvements in syntax highlighting
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12170
diff changeset
    29
	instanceVariableNames:'elements lastVariableElements lastSelectorElement
4639848e5517 Improvements in syntax highlighting
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12170
diff changeset
    30
		ignoreBadIdentifier'
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    31
	classVariableNames:''
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    32
	poolDictionaries:''
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    33
	category:'Interface-CodeView-Syntax'
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    34
!
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    35
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    36
!SyntaxHighlighter2 class methodsFor:'documentation'!
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    37
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    38
copyright
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    39
"
10067
c7b27b7cc827 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 10022
diff changeset
    40
 COPYRIGHT (c) 2010 by Jan Vrany, SWING Research Group. CTU in Prague
13178
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
    41
	      All Rights Reserved
10067
c7b27b7cc827 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 10022
diff changeset
    42
c7b27b7cc827 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 10022
diff changeset
    43
Permission is hereby granted, free of charge, to any person
c7b27b7cc827 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 10022
diff changeset
    44
obtaining a copy of this software and associated documentation
c7b27b7cc827 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 10022
diff changeset
    45
files (the 'Software'), to deal in the Software without
c7b27b7cc827 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 10022
diff changeset
    46
restriction, including without limitation the rights to use,
c7b27b7cc827 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 10022
diff changeset
    47
copy, modify, merge, publish, distribute, sublicense, and/or sell
c7b27b7cc827 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 10022
diff changeset
    48
copies of the Software, and to permit persons to whom the
c7b27b7cc827 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 10022
diff changeset
    49
Software is furnished to do so, subject to the following
c7b27b7cc827 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 10022
diff changeset
    50
conditions:
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    51
10067
c7b27b7cc827 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 10022
diff changeset
    52
The above copyright notice and this permission notice shall be
c7b27b7cc827 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 10022
diff changeset
    53
included in all copies or substantial portions of the Software.
c7b27b7cc827 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 10022
diff changeset
    54
c7b27b7cc827 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 10022
diff changeset
    55
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
c7b27b7cc827 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 10022
diff changeset
    56
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
c7b27b7cc827 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 10022
diff changeset
    57
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
c7b27b7cc827 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 10022
diff changeset
    58
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
c7b27b7cc827 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 10022
diff changeset
    59
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
c7b27b7cc827 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 10022
diff changeset
    60
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
c7b27b7cc827 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 10022
diff changeset
    61
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
c7b27b7cc827 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 10022
diff changeset
    62
OTHER DEALINGS IN THE SOFTWARE.
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    63
"
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    64
! !
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    65
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    66
!SyntaxHighlighter2 class methodsFor:'highlighting'!
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    67
12636
520a881e7e0f class: SyntaxHighlighter2
Claus Gittinger <cg@exept.de>
parents: 11859
diff changeset
    68
format:aString parsingWith:aBlock in:aClass elementsInto:elements
520a881e7e0f class: SyntaxHighlighter2
Claus Gittinger <cg@exept.de>
parents: 11859
diff changeset
    69
    "common code for formatStatementList, formatExpression, ...
520a881e7e0f class: SyntaxHighlighter2
Claus Gittinger <cg@exept.de>
parents: 11859
diff changeset
    70
     format (recolor) whatever is parsed in aBlock (within the context of a given class).
520a881e7e0f class: SyntaxHighlighter2
Claus Gittinger <cg@exept.de>
parents: 11859
diff changeset
    71
     Return the text containing font changes and color information.
520a881e7e0f class: SyntaxHighlighter2
Claus Gittinger <cg@exept.de>
parents: 11859
diff changeset
    72
     As a side effect, put syntax elements into the passed in elements container
520a881e7e0f class: SyntaxHighlighter2
Claus Gittinger <cg@exept.de>
parents: 11859
diff changeset
    73
     (for element-highlighting in codeView2)"
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    74
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    75
    |parser tree text endPos|
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    76
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    77
    aString isNil ifTrue:[^ nil].
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    78
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    79
    parser := self for:(ReadStream on:aString string) in:aClass.
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    80
    parser elements: elements.
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    81
    parser ignoreErrors:true.
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    82
    parser ignoreWarnings:true.
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    83
    parser sourceText:(text := aString string asText).
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    84
    "/ use an array here - this can be changed much faster using #at:put:
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    85
    text emphasisCollection:(Array new:aString size).
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    86
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    87
    parser nextToken.
12636
520a881e7e0f class: SyntaxHighlighter2
Claus Gittinger <cg@exept.de>
parents: 11859
diff changeset
    88
    tree := aBlock value:parser.
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    89
    "/ now, convert the emphasis-array to a runArray
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    90
    text emphasisCollection:(text emphasis asRunArray).
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    91
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    92
    tree == #Error ifTrue:[
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    93
        "/ mhmh - which is better ...
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    94
        "/ alternative1: color rest after error in red
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    95
"/        text 
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    96
"/            emphasizeFrom:(parser sourceStream position) 
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    97
"/            to:text size 
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    98
"/            with:(#color->Color red).
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    99
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   100
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   101
        "/ alternative2: take original emphasis for rest
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   102
13313
de38ade7083d class: SyntaxHighlighter2
Stefan Vogel <sv@exept.de>
parents: 12987
diff changeset
   103
        endPos := parser sourceStream position + 1.
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   104
        endPos >= text size ifTrue:[
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   105
            ^ text
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   106
        ].
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   107
        ^ ((text copyTo:endPos) , (aString copyFrom:(endPos+1))).
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   108
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   109
        "/ alternative3: no emphasis for rest.
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   110
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   111
"/        ^ text "/ aString
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   112
    ].
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   113
    ^ text
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   114
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   115
    "
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   116
     self
12636
520a881e7e0f class: SyntaxHighlighter2
Claus Gittinger <cg@exept.de>
parents: 11859
diff changeset
   117
        formatStatementList:'(1 + 2) max:5. 1 + 2' 
520a881e7e0f class: SyntaxHighlighter2
Claus Gittinger <cg@exept.de>
parents: 11859
diff changeset
   118
        in:UndefinedObject
520a881e7e0f class: SyntaxHighlighter2
Claus Gittinger <cg@exept.de>
parents: 11859
diff changeset
   119
        elementsInto:(OrderedCollection new).
520a881e7e0f class: SyntaxHighlighter2
Claus Gittinger <cg@exept.de>
parents: 11859
diff changeset
   120
    "
520a881e7e0f class: SyntaxHighlighter2
Claus Gittinger <cg@exept.de>
parents: 11859
diff changeset
   121
!
520a881e7e0f class: SyntaxHighlighter2
Claus Gittinger <cg@exept.de>
parents: 11859
diff changeset
   122
520a881e7e0f class: SyntaxHighlighter2
Claus Gittinger <cg@exept.de>
parents: 11859
diff changeset
   123
formatClassDefinition:aString in:aClass elementsInto: elements
520a881e7e0f class: SyntaxHighlighter2
Claus Gittinger <cg@exept.de>
parents: 11859
diff changeset
   124
    "format (recolor) a class definition expression in a given class.
520a881e7e0f class: SyntaxHighlighter2
Claus Gittinger <cg@exept.de>
parents: 11859
diff changeset
   125
     Return the text containing font changes and color information."
520a881e7e0f class: SyntaxHighlighter2
Claus Gittinger <cg@exept.de>
parents: 11859
diff changeset
   126
520a881e7e0f class: SyntaxHighlighter2
Claus Gittinger <cg@exept.de>
parents: 11859
diff changeset
   127
    ^ self formatExpression:aString in:aClass elementsInto: elements
520a881e7e0f class: SyntaxHighlighter2
Claus Gittinger <cg@exept.de>
parents: 11859
diff changeset
   128
520a881e7e0f class: SyntaxHighlighter2
Claus Gittinger <cg@exept.de>
parents: 11859
diff changeset
   129
    "Created: / 10-04-2011 / 18:18:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
520a881e7e0f class: SyntaxHighlighter2
Claus Gittinger <cg@exept.de>
parents: 11859
diff changeset
   130
!
520a881e7e0f class: SyntaxHighlighter2
Claus Gittinger <cg@exept.de>
parents: 11859
diff changeset
   131
520a881e7e0f class: SyntaxHighlighter2
Claus Gittinger <cg@exept.de>
parents: 11859
diff changeset
   132
formatExpression:aString in:aClass elementsInto: elements
520a881e7e0f class: SyntaxHighlighter2
Claus Gittinger <cg@exept.de>
parents: 11859
diff changeset
   133
    "format (recolor) an expression in a given class.
520a881e7e0f class: SyntaxHighlighter2
Claus Gittinger <cg@exept.de>
parents: 11859
diff changeset
   134
     Return the text containing font changes and color information."
520a881e7e0f class: SyntaxHighlighter2
Claus Gittinger <cg@exept.de>
parents: 11859
diff changeset
   135
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   136
    |parser tree text endPos|
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   137
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   138
    aString isNil ifTrue:[^ nil].
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   139
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   140
    parser := self for:(ReadStream on:aString string) in:aClass.
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   141
    parser elements: elements.
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   142
    parser ignoreErrors:true.
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   143
    parser ignoreWarnings:true.
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   144
    parser sourceText:(text := aString string asText).
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   145
    "/ use an array here - this can be changed much faster using #at:put:
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   146
    text emphasisCollection:(Array new:aString size).
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   147
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   148
    parser nextToken.
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   149
    tree := parser "expression"statementList.
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   150
    "/ now, convert the emphasis-array to a runArray
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   151
    text emphasisCollection:(text emphasis asRunArray).
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   152
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   153
    tree == #Error ifTrue:[
13178
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   154
	"/ mhmh - which is better ...
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   155
	"/ alternative1: color rest after error in red
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   156
"/        text
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   157
"/            emphasizeFrom:(parser sourceStream position)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   158
"/            to:text size
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   159
"/            with:(#color->Color red).
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   160
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   161
13178
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   162
	"/ alternative2: take original emphasis for rest
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   163
13178
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   164
	endPos := parser sourceStream position1Based.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   165
	endPos >= text size ifTrue:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   166
	    ^ text
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   167
	].
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   168
	^ ((text copyTo:endPos) , (aString copyFrom:(endPos+1))).
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   169
13178
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   170
	"/ alternative3: no emphasis for rest.
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   171
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   172
"/        ^ text "/ aString
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   173
    ].
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   174
    ^ text
12636
520a881e7e0f class: SyntaxHighlighter2
Claus Gittinger <cg@exept.de>
parents: 11859
diff changeset
   175
520a881e7e0f class: SyntaxHighlighter2
Claus Gittinger <cg@exept.de>
parents: 11859
diff changeset
   176
    "
520a881e7e0f class: SyntaxHighlighter2
Claus Gittinger <cg@exept.de>
parents: 11859
diff changeset
   177
     self
13178
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   178
	formatExpression:'(1 + 2) max:5'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   179
	in:UndefinedObject
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   180
    "
12636
520a881e7e0f class: SyntaxHighlighter2
Claus Gittinger <cg@exept.de>
parents: 11859
diff changeset
   181
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   182
    "Created: / 25-07-2010 / 08:56:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   183
    "Modified: / 25-07-2010 / 10:57:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   184
!
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   185
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   186
formatMethod:aString in:aClass using:preferencesOrNil elementsInto: elements
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   187
    "format (recolor) a method in a given class.
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   188
     Return the text containing font changes and color information."
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   189
10152
561883853228 comment/format in: #formatMethod:in:using:elementsInto:
Claus Gittinger <cg@exept.de>
parents: 10150
diff changeset
   190
    "/ obsolete interface
10150
3792ee8840ea added: #formatMethod:source:in:using:elementsInto:
Claus Gittinger <cg@exept.de>
parents: 10067
diff changeset
   191
    ^ self
13178
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   192
	formatMethod:nil
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   193
	source:aString
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   194
	in:aClass
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   195
	using:preferencesOrNil elementsInto:elements
10150
3792ee8840ea added: #formatMethod:source:in:using:elementsInto:
Claus Gittinger <cg@exept.de>
parents: 10067
diff changeset
   196
3792ee8840ea added: #formatMethod:source:in:using:elementsInto:
Claus Gittinger <cg@exept.de>
parents: 10067
diff changeset
   197
    "Created: / 25-07-2010 / 08:56:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10152
561883853228 comment/format in: #formatMethod:in:using:elementsInto:
Claus Gittinger <cg@exept.de>
parents: 10150
diff changeset
   198
    "Modified (comment): / 05-07-2011 / 11:07:50 / cg"
10150
3792ee8840ea added: #formatMethod:source:in:using:elementsInto:
Claus Gittinger <cg@exept.de>
parents: 10067
diff changeset
   199
!
3792ee8840ea added: #formatMethod:source:in:using:elementsInto:
Claus Gittinger <cg@exept.de>
parents: 10067
diff changeset
   200
3792ee8840ea added: #formatMethod:source:in:using:elementsInto:
Claus Gittinger <cg@exept.de>
parents: 10067
diff changeset
   201
formatMethod:aMethodOrNil source:aString in:aClass using:preferencesOrNil elementsInto: elements
3792ee8840ea added: #formatMethod:source:in:using:elementsInto:
Claus Gittinger <cg@exept.de>
parents: 10067
diff changeset
   202
    "format (recolor) a method in a given class.
3792ee8840ea added: #formatMethod:source:in:using:elementsInto:
Claus Gittinger <cg@exept.de>
parents: 10067
diff changeset
   203
     Return the text containing font changes and color information."
3792ee8840ea added: #formatMethod:source:in:using:elementsInto:
Claus Gittinger <cg@exept.de>
parents: 10067
diff changeset
   204
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   205
    |highlighter tree text endPos eColor|
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   206
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   207
    aString isNil ifTrue:[^ nil].
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   208
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   209
    Error handle:[:ex |
12689
34ff3476d1b4 use #creator instead of #signal
Claus Gittinger <cg@exept.de>
parents: 12672
diff changeset
   210
        ex creator isHandled ifTrue:[
13333
2e8aa3023772 Merged 5c76049c86f1 and a7279fa00799 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13178 13313
diff changeset
   211
            ex reject.
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   212
        ].
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   213
        (self parseErrorSignal handles:ex) ifFalse:[
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   214
            "Parse error may happen when re-formatting incomplete code while editing"
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   215
            ('SyntaxHighlighter [info]: error during highlight: ' , ex description) infoPrintCR.
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   216
            "/ ex suspendedContext fullPrintAll.
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   217
        ].
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   218
        ^ aString
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   219
    ] do:[
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   220
        highlighter := self for:(ReadStream on:aString string) in:aClass.
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   221
        highlighter elements: elements.
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   222
        preferencesOrNil notNil ifTrue:[highlighter preferences:preferencesOrNil].
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   223
        "/ highlighter ignoreErrors:true.
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   224
        highlighter ignoreWarnings:true.
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   225
        highlighter sourceText:(text := aString string asText).
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   226
        "/ use an array here - this can be changed much faster using #at:put:
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   227
        text emphasisCollection:(Array new:aString size).
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   228
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   229
        tree := highlighter parseMethod.
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   230
        "/ now, convert the emphasis-array to a runArray
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   231
        text emphasisCollection:(text emphasis asRunArray).
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   232
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   233
        tree == #Error ifTrue:[
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   234
            eColor := UserPreferences current errorColor.
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   235
            eColor notNil ifTrue:[
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   236
                "/ mhmh - which is better ...
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   237
                "/ alternative1: color rest after error in red
13333
2e8aa3023772 Merged 5c76049c86f1 and a7279fa00799 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13178 13313
diff changeset
   238
                text
13313
de38ade7083d class: SyntaxHighlighter2
Stefan Vogel <sv@exept.de>
parents: 12987
diff changeset
   239
                    emphasizeFrom:(highlighter sourceStream position + 1) 
13333
2e8aa3023772 Merged 5c76049c86f1 and a7279fa00799 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13178 13313
diff changeset
   240
                    to:text size
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   241
                    with:(#color->eColor).
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   242
            ] ifFalse:[
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   243
                "/ alternative2: take original emphasis for rest
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   244
13313
de38ade7083d class: SyntaxHighlighter2
Stefan Vogel <sv@exept.de>
parents: 12987
diff changeset
   245
                endPos := highlighter sourceStream position + 1.
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   246
                endPos >= text size ifTrue:[
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   247
                    ^ Array with: text with: highlighter elements
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   248
                ].
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   249
                ^ ((text copyTo:endPos) , (aString copyFrom:(endPos+1)))
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   250
            ].
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   251
            "/ alternative3: no emphasis for rest.
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   252
        ].
13333
2e8aa3023772 Merged 5c76049c86f1 and a7279fa00799 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13178 13313
diff changeset
   253
        ^text
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   254
    ]
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   255
    "
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   256
     self
13333
2e8aa3023772 Merged 5c76049c86f1 and a7279fa00799 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13178 13313
diff changeset
   257
        formatMethod:'foo
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   258
    ^ self bar:''hello''.
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   259
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   260
    ' , (Character doubleQuote asString) , 'some comment' , (Character doubleQuote asString) , '
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   261
'
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   262
        in:UndefinedObject
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   263
    "
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   264
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   265
    "Modified: / 22-08-2006 / 13:32:04 / cg"
10150
3792ee8840ea added: #formatMethod:source:in:using:elementsInto:
Claus Gittinger <cg@exept.de>
parents: 10067
diff changeset
   266
    "Created: / 05-07-2011 / 10:39:21 / cg"
12806
d550d7de8e2d Fix in SyntaxHighlighter2>>#formatMethod:source:in:using:elementsInto:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12683
diff changeset
   267
    "Modified: / 28-05-2013 / 22:45:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
12636
520a881e7e0f class: SyntaxHighlighter2
Claus Gittinger <cg@exept.de>
parents: 11859
diff changeset
   268
!
520a881e7e0f class: SyntaxHighlighter2
Claus Gittinger <cg@exept.de>
parents: 11859
diff changeset
   269
13333
2e8aa3023772 Merged 5c76049c86f1 and a7279fa00799 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13178 13313
diff changeset
   270
 !
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   271
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   272
!SyntaxHighlighter2 methodsFor:'accessing'!
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   273
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   274
elements
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   275
    ^ elements
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   276
!
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   277
12168
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   278
elements:aParseTreeIndex
10633
48c904090606 class definition
Claus Gittinger <cg@exept.de>
parents: 10428
diff changeset
   279
    "the element collection, to collect variables, selectors etc. into"
48c904090606 class definition
Claus Gittinger <cg@exept.de>
parents: 10428
diff changeset
   280
12168
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   281
    elements := aParseTreeIndex.
10633
48c904090606 class definition
Claus Gittinger <cg@exept.de>
parents: 10428
diff changeset
   282
48c904090606 class definition
Claus Gittinger <cg@exept.de>
parents: 10428
diff changeset
   283
    "Modified (comment): / 21-08-2011 / 09:13:31 / cg"
12168
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   284
!
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   285
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   286
tree: aParseNode
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   287
    super tree: aParseNode.
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   288
    elements tree: aParseNode
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   289
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   290
    "Created: / 16-02-2012 / 09:56:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   291
! !
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   292
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   293
!SyntaxHighlighter2 methodsFor:'initialization'!
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   294
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   295
initialize
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   296
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   297
    super initialize.
12168
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   298
    elements := ParseTreeIndex new.
10633
48c904090606 class definition
Claus Gittinger <cg@exept.de>
parents: 10428
diff changeset
   299
    lastVariableElements := Dictionary new.
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   300
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   301
    "Created: / 14-02-2010 / 13:08:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10633
48c904090606 class definition
Claus Gittinger <cg@exept.de>
parents: 10428
diff changeset
   302
    "Modified: / 21-08-2011 / 09:37:35 / cg"
12168
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   303
    "Modified: / 16-02-2012 / 09:59:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   304
! !
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   305
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   306
!SyntaxHighlighter2 methodsFor:'parsing-expressions'!
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   307
12168
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   308
_binaryExpressionFor:receiverArg
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   309
    "parse a binary-expression; return a node-tree, nil or #Error"
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   310
11152
c9a386e4f1e0 refactored plausibility checks
Claus Gittinger <cg@exept.de>
parents: 10882
diff changeset
   311
    |receiver expr arg sel pos1 pos2 lno|
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   312
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   313
    receiver := receiverArg.
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   314
    (receiver == #Error) ifTrue:[^ #Error].
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   315
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   316
    "special kludge: since Scanner cannot know if -digit is a binary
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   317
     expression or a negative constant, handle cases here"
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   318
13178
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   319
    [(tokenType == #BinaryOperator)
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   320
     or:[(tokenType == $|)
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   321
     or:[(tokenType == $^ and:[parserFlags allowCaretAsBinop])
13178
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   322
	 or:[((tokenType == #Integer) or:[tokenType == #Float])
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   323
	     and:[tokenValue < 0]]]]
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   324
    ] whileTrue:[
13178
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   325
	"/ kludge alarm: in a function-call argList, #, is not a binarySelector
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   326
	inFunctionCallArgument == true ifTrue:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   327
	    ((tokenType == #BinaryOperator) and:[tokenName = ',']) ifTrue:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   328
		^ receiver
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   329
	    ].
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   330
	].
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   331
13178
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   332
	pos1 := tokenPosition.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   333
	lno := tokenLineNr.
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   334
13178
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   335
	"/ kludge alarm: bar, caret and minus are not scanned as binop
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   336
	(tokenType == $|) ifTrue:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   337
	    sel := '|'.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   338
	    sel := self selectorCheck:sel for:receiver position:tokenPosition to:tokenPosition.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   339
	    self nextToken.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   340
	] ifFalse:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   341
	    (tokenType == $^) ifTrue:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   342
		sel := '^'.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   343
		sel := self selectorCheck:sel for:receiver position:tokenPosition to:tokenPosition.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   344
		self nextToken.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   345
	    ] ifFalse:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   346
		(tokenType == #BinaryOperator) ifTrue:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   347
		    sel := tokenName.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   348
		    sel := self selectorCheck:sel for:receiver position:tokenPosition to:(tokenPosition + tokenName size - 1).
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   349
		    self nextToken
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   350
		] ifFalse:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   351
		    sel := '-'.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   352
		    token := tokenValue := tokenValue negated.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   353
		    tokenPosition := tokenPosition + 1. "/ to skip the sign
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   354
		]
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   355
	    ].
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   356
	].
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   357
13178
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   358
	pos2 := pos1 + sel size - 1.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   359
	self markSelector:sel from:pos1 to:pos2 receiverNode:receiver.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   360
	lastSelectorElement := nil.
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   361
13178
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   362
	arg := self unaryExpression.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   363
	(arg == #Error) ifTrue:[^ #Error].
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   364
13178
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   365
	expr := BinaryNode receiver:receiver selector:sel arg:arg fold:foldConstants.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   366
	expr isErrorNode ifTrue:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   367
	    self parseError:(expr errorString) position:pos1 to:tokenPosition.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   368
	    errorFlag := false. "ok, user wants it - so he'll get it"
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   369
	    expr := BinaryNode receiver:receiver selector:sel arg:arg fold:nil.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   370
	].
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   371
	expr lineNumber:lno.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   372
	expr selectorPosition:pos1.
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   373
13178
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   374
	self checkPlausibilityOf:expr from:pos1 to:pos2.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   375
	parseForCode ifFalse:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   376
	    self rememberSelectorUsed:sel receiver:receiver
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   377
	].
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   378
	receiver := expr.   "/ for next message
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   379
    ].
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   380
    ^ receiver
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   381
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   382
    "Modified: / 09-01-1998 / 19:05:18 / stefan"
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   383
    "Modified: / 14-02-2010 / 17:54:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
11152
c9a386e4f1e0 refactored plausibility checks
Claus Gittinger <cg@exept.de>
parents: 10882
diff changeset
   384
    "Modified: / 19-01-2012 / 10:46:49 / cg"
12168
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   385
    "Created: / 16-02-2012 / 21:54:28 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   386
!
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   387
12168
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   388
_keywordExpressionFor:receiverArg
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   389
    "parse a keyword-expression; return a node-tree, nil or #Error.
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   390
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   391
     keywordExpression ::= binaryexpression
13178
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   392
			   | { KEYWORD-PART binaryExpression }
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   393
    "
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   394
11152
c9a386e4f1e0 refactored plausibility checks
Claus Gittinger <cg@exept.de>
parents: 10882
diff changeset
   395
    |expr receiver sel arg args posR1 posR2 pos1 pos2 lno positions constVal|
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   396
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   397
    receiver := receiverArg.
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   398
    posR1 := tokenPosition.
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   399
    (tokenType == #Keyword) ifFalse:[^ receiver].
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   400
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   401
    pos1 := posR2 := tokenPosition.
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   402
    pos2 := tokenPosition + tokenName size - 1.
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   403
    positions := OrderedCollection with:(pos1 to:pos2).
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   404
    sel := tokenName.
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   405
    lno := tokenLineNr.
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   406
    self nextToken.
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   407
    arg := self binaryExpression.
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   408
    (arg == #Error) ifTrue:[^ #Error].
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   409
    args := Array with:arg.
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   410
    [tokenType == #Keyword] whileTrue:[
13178
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   411
	sel := sel , tokenName.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   412
	pos2 := tokenPosition + tokenName size - 1.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   413
	positions add:(tokenPosition to:pos2).
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   414
	self nextToken.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   415
	arg := self binaryExpression.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   416
	(arg == #Error) ifTrue:[^ #Error].
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   417
	args := args copyWith:arg.
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   418
    ].
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   419
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   420
    positions do:[:p |
13178
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   421
	self markSelector:sel from:p start to:p stop receiverNode:receiver.
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   422
    ].
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   423
    lastSelectorElement := nil.
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   424
    sel := self selectorCheck:sel for:receiver positions:positions.
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   425
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   426
    ignoreWarnings ifFalse:[
13178
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   427
	(Class definitionSelectors includes:sel) ifTrue:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   428
	    (receiver isVariable and:[receiver isUndeclared]) ifTrue:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   429
		"this is not an error - the undefined class may be loaded after this code!!"
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   430
		self warning:('as yet undefined superclass: ' , receiver name) position:pos1 to:pos2.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   431
	    ].
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   432
	].
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   433
    ].
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   434
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   435
    expr := MessageNode receiver:receiver selector:sel args:args fold:foldConstants.
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   436
    expr isErrorNode ifTrue:[
13178
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   437
	self parseError:(expr errorString) position:pos1 to:pos2.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   438
	errorFlag := false. "ok, user wants it - so he'll get it"
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   439
	expr := MessageNode receiver:receiver selector:sel args:args fold:nil.
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   440
    ].
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   441
    expr lineNumber:lno.
11152
c9a386e4f1e0 refactored plausibility checks
Claus Gittinger <cg@exept.de>
parents: 10882
diff changeset
   442
    self checkPlausibilityOf:expr from:pos1 to:pos2.
12683
e094e18bfd10 Fix in SyntaxHiglighter2 after bad merge
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12682
diff changeset
   443
    parseForCode ifFalse:[
13178
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   444
	self rememberSelectorUsed:sel receiver:receiver
12683
e094e18bfd10 Fix in SyntaxHiglighter2 after bad merge
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12682
diff changeset
   445
    ].
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   446
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   447
"/        (contextToEvaluateIn isNil and:[selfValue isNil]) ifTrue:[    "/ do not check this for doits
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   448
"/            receiver isSuper ifTrue:[
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   449
"/                sel ~= selector ifTrue:[
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   450
"/                    self warnCommonMistake:'possible bad super message (selector should be same as in current method) ?'
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   451
"/                                  position:posR1 to:posR2-1
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   452
"/                ].
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   453
"/            ].
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   454
"/        ].
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   455
"/
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   456
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   457
    (sel = #ifTrue: or:[sel = #ifFalse: or:[sel = #ifTrue:ifFalse: or:[sel = #ifFalse:ifTrue:]]]) ifTrue:[
13178
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   458
	(expr receiver withConstantValueDo:[:val | constVal := val]) ifTrue:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   459
	    |indexOfArgNotExecuted|
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   460
13178
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   461
	    "/ receiver evaluates to a constant
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   462
	    constVal == true ifTrue:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   463
		(sel startsWith: #ifFalse:) ifTrue:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   464
		    indexOfArgNotExecuted := 1.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   465
		] ifFalse:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   466
		    indexOfArgNotExecuted := 2.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   467
		]
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   468
	    ].
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   469
	    constVal == false ifTrue:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   470
		(sel startsWith: #ifTrue:) ifTrue:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   471
		    indexOfArgNotExecuted := 1.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   472
		] ifFalse:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   473
		    indexOfArgNotExecuted := 2.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   474
		]
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   475
	    ].
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   476
	    indexOfArgNotExecuted == 2 ifTrue:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   477
		args size == 1 ifTrue:[ indexOfArgNotExecuted := nil]
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   478
	    ].
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   479
13178
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   480
	    indexOfArgNotExecuted notNil ifTrue:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   481
		|argIsNotExecuted|
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   482
13178
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   483
		"/ self warning:'receiver is constant; arg',indexOfArgNotExecuted printString,' is never executed' position:pos1 to:tokenPosition.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   484
		argIsNotExecuted := expr args at:indexOfArgNotExecuted.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   485
		argIsNotExecuted isBlockNode ifTrue:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   486
		    self markCommentFrom:argIsNotExecuted startPosition to:argIsNotExecuted endPosition.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   487
		].
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   488
	    ].
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   489
	].
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   490
    ].
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   491
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   492
    (ignoreErrors or:[ignoreWarnings]) ifFalse:[
13178
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   493
	(sel = #and: or:[sel = #or:]) ifTrue:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   494
	    expr arg1 isBlock ifFalse:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   495
		(expr arg1 isVariable
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   496
		and:[ (expr arg1 name asLowercase includesString:'block')]) ifFalse:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   497
		    self warnCommonMistake:'(possible common mistake) missing block brackets ?'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   498
			      position:pos2+1 to:tokenPosition-1
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   499
		]
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   500
	    ].
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   501
	    ^ expr.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   502
	].
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   503
13178
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   504
	(sel = #whileTrue: or:[sel = #whileFalse:]) ifTrue:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   505
	    expr receiver isBlock ifFalse:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   506
		(expr receiver isVariable
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   507
		and:[ (expr receiver name asLowercase includesString:'block')]) ifFalse:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   508
		    self warnCommonMistake:'(possible common mistake) missing block brackets ?'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   509
			      position:pos1 to:pos2
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   510
		]
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   511
	    ].
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   512
	    ^ expr.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   513
	].
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   514
13178
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   515
	(sel = #ifTrue: or:[sel = #ifFalse:]) ifTrue:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   516
	    expr receiver isMessage ifTrue:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   517
		(expr receiver selector = #whileTrue or:[expr receiver selector = #whileFalse]) ifTrue:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   518
		    self warnCommonMistake:'strange receiver expression'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   519
			      position:pos1 to:pos2
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   520
		].
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   521
	    ].
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   522
	    ^ expr
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   523
	].
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   524
    ].
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   525
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   526
    ^ expr.
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   527
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   528
    "Modified: / 14-02-2010 / 17:58:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
11152
c9a386e4f1e0 refactored plausibility checks
Claus Gittinger <cg@exept.de>
parents: 10882
diff changeset
   529
    "Modified: / 19-01-2012 / 10:47:01 / cg"
12168
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   530
    "Created: / 16-02-2012 / 21:54:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   531
!
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   532
12168
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   533
_unaryExpressionFor:receiverArg
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   534
    "parse a unary-expression; return a node-tree, nil or #Error"
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   535
11152
c9a386e4f1e0 refactored plausibility checks
Claus Gittinger <cg@exept.de>
parents: 10882
diff changeset
   536
    |receiver expr sel pos pos2 lNr arguments|
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   537
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   538
    receiver := receiverArg.
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   539
    (receiver == #Error) ifTrue:[^ #Error].
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   540
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   541
    [ self isValidUnarySelector:tokenType ] whileTrue:[
13178
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   542
	pos := tokenPosition.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   543
	pos2 := pos + tokenName size - 1.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   544
	lNr := tokenLineNr.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   545
	sel := tokenName.
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   546
13178
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   547
	self markSelector:sel from:pos to:pos2 receiverNode:receiver.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   548
	lastSelectorElement := nil.
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   549
13178
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   550
	self nextToken.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   551
	tokenType == $( ifTrue:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   552
	    parserFlags allowSqueakExtensions == true ifTrue:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   553
		"/ croquet/squeak extension - c/java-style arguments
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   554
		arguments := self functionCallArgList.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   555
		"/ synthetic selector: foo[:[with:[with:[...]]]]
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   556
		arguments notEmpty ifTrue:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   557
		    sel := sel , ':'.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   558
		    arguments size - 1 timesRepeat:[ sel := sel , 'with:' ].
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   559
		].
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   560
		sel := self selectorCheck:sel for:receiver position:pos to:pos2.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   561
		expr := MessageNode receiver:receiver selector:sel args:arguments fold:foldConstants.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   562
		expr isErrorNode ifTrue:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   563
		    self parseError:(expr errorString) position:pos to:pos2.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   564
		    errorFlag := false. "ok, user wants it - so he'll get it"
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   565
		    expr := MessageNode receiver:receiver selector:sel args:arguments fold:nil.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   566
		].
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   567
		expr lineNumber:lNr.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   568
		self checkPlausibilityOf:expr from:pos to:pos2.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   569
		parseForCode ifFalse:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   570
		    self rememberSelectorUsed:sel receiver:receiver
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   571
		].
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   572
		^ expr.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   573
	    ].
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   574
	].
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   575
13178
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   576
	sel := self selectorCheck:sel for:receiver position:pos to:pos2.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   577
	expr := UnaryNode receiver:receiver selector:sel fold:foldConstants.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   578
	expr isErrorNode ifTrue:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   579
	    self warning:(expr errorString , '.\\If you proceed, that error will happen at runtime.') withCRs position:pos to:pos2.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   580
	    errorFlag := false. "ok, user wants it - so he'll get it"
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   581
	    expr := UnaryNode receiver:receiver selector:sel fold:nil.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   582
	].
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   583
	expr lineNumber:lNr.
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   584
13178
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   585
	self checkPlausibilityOf:expr from:pos to:pos2.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   586
	parseForCode ifFalse:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   587
	    self rememberSelectorUsed:sel receiver:receiver
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   588
	].
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   589
13178
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   590
	receiver := expr.   "/ for next message
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   591
    ].
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   592
    ^ receiver
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   593
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   594
    "Modified: / 14-02-2010 / 17:56:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
11152
c9a386e4f1e0 refactored plausibility checks
Claus Gittinger <cg@exept.de>
parents: 10882
diff changeset
   595
    "Modified: / 19-01-2012 / 10:47:37 / cg"
12168
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   596
    "Created: / 16-02-2012 / 21:54:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   597
!
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   598
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   599
binaryExpression
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   600
    | node savedLastSelectorElement |
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   601
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   602
    savedLastSelectorElement := lastSelectorElement.
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   603
    lastSelectorElement := nil.
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   604
    node := super binaryExpression.
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   605
    (lastSelectorElement notNil and:[node ~~ #Error and:[node isMessage]]) ifTrue:[
13178
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   606
	lastSelectorElement node parent: node.
12168
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   607
    ].
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   608
    lastSelectorElement := savedLastSelectorElement.
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   609
    ^node
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   610
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   611
    "Modified: / 19-01-2000 / 16:22:16 / cg"
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   612
    "Created: / 16-02-2012 / 21:56:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   613
!
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   614
13333
2e8aa3023772 Merged 5c76049c86f1 and a7279fa00799 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13178 13313
diff changeset
   615
2e8aa3023772 Merged 5c76049c86f1 and a7279fa00799 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13178 13313
diff changeset
   616
12168
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   617
expression
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   618
    | node savedLastSelectorElement |
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   619
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   620
    savedLastSelectorElement := lastSelectorElement.
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   621
    lastSelectorElement := nil.
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   622
    node := super expression.
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   623
    ((node ~~ #Error) and:[node isMessage]) ifTrue:[
13333
2e8aa3023772 Merged 5c76049c86f1 and a7279fa00799 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13178 13313
diff changeset
   624
        [ lastSelectorElement notNil ] whileTrue:[
2e8aa3023772 Merged 5c76049c86f1 and a7279fa00799 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13178 13313
diff changeset
   625
            lastSelectorElement node parent: node.
2e8aa3023772 Merged 5c76049c86f1 and a7279fa00799 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13178 13313
diff changeset
   626
            lastSelectorElement := lastSelectorElement prev.
2e8aa3023772 Merged 5c76049c86f1 and a7279fa00799 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13178 13313
diff changeset
   627
        ].
12168
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   628
    ].
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   629
    lastSelectorElement := savedLastSelectorElement.
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   630
    ^node
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   631
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   632
    "Modified: / 19-01-2000 / 16:22:16 / cg"
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   633
    "Modified: / 16-02-2012 / 23:39:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   634
!
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   635
13333
2e8aa3023772 Merged 5c76049c86f1 and a7279fa00799 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13178 13313
diff changeset
   636
2e8aa3023772 Merged 5c76049c86f1 and a7279fa00799 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13178 13313
diff changeset
   637
12168
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   638
unaryExpressionFor:receiverArg
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   639
    "parse a unary-expression; return a node-tree, nil or #Error"
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   640
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   641
    |receiver expr sel pos pos2 lNr arguments savedLastSelectorElement|
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   642
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   643
    savedLastSelectorElement := lastSelectorElement.
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   644
    receiver := receiverArg.
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   645
    (receiver == #Error) ifTrue:[^ #Error].
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   646
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   647
    [ self isValidUnarySelector:tokenType ] whileTrue:[
13178
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   648
	pos := tokenPosition.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   649
	pos2 := pos + tokenName size - 1.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   650
	lNr := tokenLineNr.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   651
	sel := tokenName.
12168
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   652
13178
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   653
	lastSelectorElement := nil.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   654
	self markSelector:sel from:pos to:pos2 receiverNode:receiver.
12168
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   655
13178
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   656
	self nextToken.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   657
	tokenType == $( ifTrue:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   658
	    parserFlags allowSqueakExtensions == true ifTrue:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   659
		"/ croquet/squeak extension - c/java-style arguments
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   660
		arguments := self functionCallArgList.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   661
		"/ synthetic selector: foo[:[with:[with:[...]]]]
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   662
		arguments notEmpty ifTrue:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   663
		    sel := sel , ':'.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   664
		    arguments size - 1 timesRepeat:[ sel := sel , 'with:' ].
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   665
		].
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   666
		sel := self selectorCheck:sel for:receiver position:pos to:pos2.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   667
		expr := MessageNode receiver:receiver selector:sel args:arguments fold:foldConstants.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   668
		expr isErrorNode ifTrue:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   669
		    self parseError:(expr errorString) position:pos to:pos2.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   670
		    errorFlag := false. "ok, user wants it - so he'll get it"
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   671
		    expr := MessageNode receiver:receiver selector:sel args:arguments fold:nil.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   672
		].
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   673
		lastSelectorElement node parent: expr.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   674
		expr lineNumber:lNr.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   675
		self checkPlausibilityOf:expr from:pos to:pos2.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   676
		parseForCode ifFalse:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   677
		    self rememberSelectorUsed:sel receiver:receiver
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   678
		].
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   679
		^ expr.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   680
	    ].
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   681
	].
12168
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   682
13178
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   683
	sel := self selectorCheck:sel for:receiver position:pos to:pos2.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   684
	expr := UnaryNode receiver:receiver selector:sel fold:foldConstants.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   685
	expr isErrorNode ifTrue:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   686
	    self warning:(expr errorString , '.\\If you proceed, that error will happen at runtime.') withCRs position:pos to:pos2.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   687
	    errorFlag := false. "ok, user wants it - so he'll get it"
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   688
	    expr := UnaryNode receiver:receiver selector:sel fold:nil.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   689
	].
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   690
	expr lineNumber:lNr.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   691
	lastSelectorElement node parent: expr.
12168
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   692
13178
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   693
	self checkPlausibilityOf:expr from:pos to:pos2.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   694
	parseForCode ifFalse:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   695
	    self rememberSelectorUsed:sel receiver:receiver
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   696
	].
12168
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   697
13178
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   698
	receiver := expr.   "/ for next message
12168
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   699
    ].
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   700
    lastSelectorElement := savedLastSelectorElement.
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   701
    ^ receiver
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   702
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   703
    "Modified: / 19-01-2012 / 10:47:37 / cg"
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   704
    "Created: / 16-02-2012 / 23:50:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   705
!
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   706
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   707
variable
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   708
    | node |
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   709
12194
4639848e5517 Improvements in syntax highlighting
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12170
diff changeset
   710
    ignoreBadIdentifier := classToCompileFor isNil.
12168
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   711
    node := super variable.
12194
4639848e5517 Improvements in syntax highlighting
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12170
diff changeset
   712
    ignoreBadIdentifier := false.
12168
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   713
    node isVariable ifTrue:[
13178
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   714
	| el prevEl |
12168
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   715
13178
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   716
	el := elements newElementFor: node.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   717
	prevEl := lastVariableElements at:node name ifAbsent:[nil].
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   718
	prevEl notNil ifTrue:[prevEl next:el].
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   719
	lastVariableElements at:node name put:el.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   720
	elements add: el.
12168
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   721
    ].
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   722
    ^node
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   723
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   724
    "Modified: / 19-01-2000 / 16:22:16 / cg"
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   725
    "Created: / 16-02-2012 / 22:21:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   726
! !
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   727
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   728
!SyntaxHighlighter2 methodsFor:'syntax detection'!
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   729
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   730
markArgumentIdentifierFrom:pos1 to:pos2
12168
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   731
    | node el prevEl |
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   732
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   733
    super markArgumentIdentifierFrom:pos1 to:pos2.
12168
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   734
    node := VariableNode methodArgumentNamed:(sourceText string copyFrom: pos1 to: pos2).
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   735
    node startPosition: pos1 endPosition: pos2.
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   736
    el := elements newElementFor: node.
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   737
    prevEl := lastVariableElements at:node name ifAbsent:[nil].
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   738
    prevEl notNil ifTrue:[prevEl next:el].
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   739
    lastVariableElements at:node name put:el.
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   740
    elements add: el.
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   741
12911
6a562c9a975e class: SyntaxHighlighter2
Claus Gittinger <cg@exept.de>
parents: 12689
diff changeset
   742
    "Created: / 24-07-2010 / 09:25:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
6a562c9a975e class: SyntaxHighlighter2
Claus Gittinger <cg@exept.de>
parents: 12689
diff changeset
   743
    "Modified: / 21-08-2011 / 09:27:26 / cg"
12168
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   744
    "Modified: / 16-02-2012 / 22:34:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   745
!
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   746
13333
2e8aa3023772 Merged 5c76049c86f1 and a7279fa00799 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13178 13313
diff changeset
   747
2e8aa3023772 Merged 5c76049c86f1 and a7279fa00799 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13178 13313
diff changeset
   748
12194
4639848e5517 Improvements in syntax highlighting
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12170
diff changeset
   749
markBadIdentifierFrom:pos1 to:pos2
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   750
12194
4639848e5517 Improvements in syntax highlighting
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12170
diff changeset
   751
    super markBadIdentifierFrom:pos1 to:pos2
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   752
12194
4639848e5517 Improvements in syntax highlighting
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12170
diff changeset
   753
    "Created: / 17-03-2012 / 19:02:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   754
!
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   755
13333
2e8aa3023772 Merged 5c76049c86f1 and a7279fa00799 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13178 13313
diff changeset
   756
2e8aa3023772 Merged 5c76049c86f1 and a7279fa00799 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13178 13313
diff changeset
   757
12987
306d6dc6ffbb class: SyntaxHighlighter2
Claus Gittinger <cg@exept.de>
parents: 12984
diff changeset
   758
markLocalIdentifierFrom:pos1 to:pos2
12168
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   759
    | node el prevEl |
12987
306d6dc6ffbb class: SyntaxHighlighter2
Claus Gittinger <cg@exept.de>
parents: 12984
diff changeset
   760
12168
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   761
    super markLocalIdentifierFrom:pos1 to:pos2.
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   762
    node := VariableNode methodLocalNamed:(sourceText string copyFrom: pos1 to: pos2).
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   763
    node startPosition: pos1 endPosition: pos2.
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   764
    el := elements newElementFor: node.
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   765
    prevEl := lastVariableElements at:node name ifAbsent:[nil].
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   766
    prevEl notNil ifTrue:[prevEl next:el].
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   767
    lastVariableElements at:node name put:el.
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   768
    elements add: el.
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   769
12911
6a562c9a975e class: SyntaxHighlighter2
Claus Gittinger <cg@exept.de>
parents: 12689
diff changeset
   770
    "Modified: / 21-08-2011 / 09:27:26 / cg"
12168
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   771
    "Created: / 16-02-2012 / 22:36:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   772
!
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   773
13333
2e8aa3023772 Merged 5c76049c86f1 and a7279fa00799 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13178 13313
diff changeset
   774
2e8aa3023772 Merged 5c76049c86f1 and a7279fa00799 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13178 13313
diff changeset
   775
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   776
markSelector:selectorString from:pos1 to:pos2 receiverNode:aReceiverNode
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   777
12672
91288323803d class: SyntaxHighlighter2
Stefan Vogel <sv@exept.de>
parents: 12636
diff changeset
   778
    | element selectorSymbol |
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   779
12233
f71206c1d1dd - SyntaxHighlighter2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12229
diff changeset
   780
    "Special hack for Java class references - I would like to have them
f71206c1d1dd - SyntaxHighlighter2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12229
diff changeset
   781
     marked specially (and not as an error when the class is not yet loaded -
f71206c1d1dd - SyntaxHighlighter2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12229
diff changeset
   782
     the code is correct as JavaClassAccessor loads it lazily"
f71206c1d1dd - SyntaxHighlighter2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12229
diff changeset
   783
    (aReceiverNode isJavaPackageReference) ifTrue:[
13178
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   784
	self
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   785
	    markFrom:pos1 to:pos2
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   786
	    withEmphasis:preferences globalClassIdentifierEmphasis
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   787
	    color: preferences globalClassIdentifierColor
12233
f71206c1d1dd - SyntaxHighlighter2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12229
diff changeset
   788
    ] ifFalse:[
13178
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   789
	super markSelector:selectorString from:pos1 to:pos2 receiverNode:aReceiverNode.
12233
f71206c1d1dd - SyntaxHighlighter2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12229
diff changeset
   790
    ].
13178
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   791
12672
91288323803d class: SyntaxHighlighter2
Stefan Vogel <sv@exept.de>
parents: 12636
diff changeset
   792
    "don't create symbols for partial typed selectors"
91288323803d class: SyntaxHighlighter2
Stefan Vogel <sv@exept.de>
parents: 12636
diff changeset
   793
    selectorSymbol := selectorString asSymbolIfInterned.
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   794
12683
e094e18bfd10 Fix in SyntaxHiglighter2 after bad merge
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12682
diff changeset
   795
    element := elements newElementFor: (SelectorNode value: selectorString from: pos1 to: pos2).
12168
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   796
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   797
    (lastSelectorElement notNil "and:[lastSelectorElement value = selectorString]") ifTrue:[
13178
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   798
	lastSelectorElement next: element.
12168
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   799
    ].
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   800
    elements add: element.
12168
95a3a7290554 Fixes, some support for SmallSense
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   801
    lastSelectorElement := "(self isValidUnarySelector:tokenType)"false
13178
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   802
				ifTrue:[nil]
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13176 12987
diff changeset
   803
				ifFalse:[element].
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   804
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   805
    "Created: / 14-02-2010 / 17:40:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   806
    "Modified: / 14-02-2010 / 19:24:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10633
48c904090606 class definition
Claus Gittinger <cg@exept.de>
parents: 10428
diff changeset
   807
    "Modified (format): / 21-08-2011 / 09:18:21 / cg"
12233
f71206c1d1dd - SyntaxHighlighter2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12229
diff changeset
   808
    "Modified: / 19-04-2012 / 09:53:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10633
48c904090606 class definition
Claus Gittinger <cg@exept.de>
parents: 10428
diff changeset
   809
!
48c904090606 class definition
Claus Gittinger <cg@exept.de>
parents: 10428
diff changeset
   810
48c904090606 class definition
Claus Gittinger <cg@exept.de>
parents: 10428
diff changeset
   811
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   812
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   813
markUnknownIdentifierFrom:pos1 to:pos2
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   814
12194
4639848e5517 Improvements in syntax highlighting
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12170
diff changeset
   815
    ignoreBadIdentifier == true ifTrue:[ ^ self ].
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   816
12194
4639848e5517 Improvements in syntax highlighting
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12170
diff changeset
   817
    super markUnknownIdentifierFrom:pos1 to:pos2
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   818
12194
4639848e5517 Improvements in syntax highlighting
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12170
diff changeset
   819
    "Created: / 31.3.1998 / 19:09:26 / cg"
4639848e5517 Improvements in syntax highlighting
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12170
diff changeset
   820
    "Modified: / 31.3.1998 / 19:10:30 / cg"
10633
48c904090606 class definition
Claus Gittinger <cg@exept.de>
parents: 10428
diff changeset
   821
!
48c904090606 class definition
Claus Gittinger <cg@exept.de>
parents: 10428
diff changeset
   822
12911
6a562c9a975e class: SyntaxHighlighter2
Claus Gittinger <cg@exept.de>
parents: 12689
diff changeset
   823
13333
2e8aa3023772 Merged 5c76049c86f1 and a7279fa00799 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13178 13313
diff changeset
   824
10633
48c904090606 class definition
Claus Gittinger <cg@exept.de>
parents: 10428
diff changeset
   825
11458
8fdf55d6d1c8 changed: #rememberVariableElementFor:type:from:to:
Claus Gittinger <cg@exept.de>
parents: 11152
diff changeset
   826
13333
2e8aa3023772 Merged 5c76049c86f1 and a7279fa00799 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13178 13313
diff changeset
   827
 !
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   828
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   829
!SyntaxHighlighter2 class methodsFor:'documentation'!
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   830
12984
65d53f09f5ac class: SyntaxHighlighter2
Claus Gittinger <cg@exept.de>
parents: 12979
diff changeset
   831
version
13313
de38ade7083d class: SyntaxHighlighter2
Stefan Vogel <sv@exept.de>
parents: 12987
diff changeset
   832
    ^ '$Header: /cvs/stx/stx/libtool/SyntaxHighlighter2.st,v 1.18 2013-08-10 11:10:24 stefan Exp $'
12984
65d53f09f5ac class: SyntaxHighlighter2
Claus Gittinger <cg@exept.de>
parents: 12979
diff changeset
   833
!
65d53f09f5ac class: SyntaxHighlighter2
Claus Gittinger <cg@exept.de>
parents: 12979
diff changeset
   834
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   835
version_CVS
13313
de38ade7083d class: SyntaxHighlighter2
Stefan Vogel <sv@exept.de>
parents: 12987
diff changeset
   836
    ^ '$Header: /cvs/stx/stx/libtool/SyntaxHighlighter2.st,v 1.18 2013-08-10 11:10:24 stefan Exp $'
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   837
!
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   838
12431
9f0c59c742d5 Added LintRuleSettingsApplication and LintRuleEditDialog to define user-defined rule sets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12406
diff changeset
   839
version_HG
9f0c59c742d5 Added LintRuleSettingsApplication and LintRuleEditDialog to define user-defined rule sets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12406
diff changeset
   840
9f0c59c742d5 Added LintRuleSettingsApplication and LintRuleEditDialog to define user-defined rule sets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12406
diff changeset
   841
    ^ '$Changeset: <not expanded> $'
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   842
!
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   843
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   844
version_SVN
13313
de38ade7083d class: SyntaxHighlighter2
Stefan Vogel <sv@exept.de>
parents: 12987
diff changeset
   845
    ^ '$Id: SyntaxHighlighter2.st,v 1.18 2013-08-10 11:10:24 stefan Exp $'
10022
a51c7fd32748 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   846
! !
12636
520a881e7e0f class: SyntaxHighlighter2
Claus Gittinger <cg@exept.de>
parents: 11859
diff changeset
   847