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