author | Jan Vrany <jan.vrany@fit.cvut.cz> |
Wed, 29 Jan 2014 10:42:31 +0000 | |
changeset 161 | 5ff416530ac4 |
parent 96 | 12fe1a59dfd1 |
child 163 | a65f90af5e75 |
permissions | -rw-r--r-- |
64
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1 |
"{ Package: 'jv:smallsense' }" |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
2 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
3 |
"{ NameSpace: SmallSense }" |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
4 |
|
67
020b7461b15e
Package structure reorganization.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
64
diff
changeset
|
5 |
SyntaxHighlighter subclass:#SmalltalkParser |
161
5ff416530ac4
Fx in Smalltalk code completion - do not complete inside comments.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
96
diff
changeset
|
6 |
instanceVariableNames:'errorRecovery error commentPositions commentIndex' |
64
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
7 |
classVariableNames:'' |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
8 |
poolDictionaries:'' |
67
020b7461b15e
Package structure reorganization.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
64
diff
changeset
|
9 |
category:'SmallSense-Smalltalk' |
64
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
10 |
! |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
11 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
12 |
|
161
5ff416530ac4
Fx in Smalltalk code completion - do not complete inside comments.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
96
diff
changeset
|
13 |
!SmalltalkParser methodsFor:'accessing'! |
5ff416530ac4
Fx in Smalltalk code completion - do not complete inside comments.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
96
diff
changeset
|
14 |
|
5ff416530ac4
Fx in Smalltalk code completion - do not complete inside comments.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
96
diff
changeset
|
15 |
commentPositions |
5ff416530ac4
Fx in Smalltalk code completion - do not complete inside comments.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
96
diff
changeset
|
16 |
^ commentPositions |
5ff416530ac4
Fx in Smalltalk code completion - do not complete inside comments.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
96
diff
changeset
|
17 |
! ! |
5ff416530ac4
Fx in Smalltalk code completion - do not complete inside comments.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
96
diff
changeset
|
18 |
|
67
020b7461b15e
Package structure reorganization.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
64
diff
changeset
|
19 |
!SmalltalkParser methodsFor:'error handling'! |
64
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
20 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
21 |
parseError:message position:startPos to:endPos |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
22 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
23 |
error := ParseErrorNode new |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
24 |
errorString: message; |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
25 |
errorToken: (token notNil ifTrue:[token asString] ifFalse:[nil]); |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
26 |
startPosition: startPos endPosition: endPos. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
27 |
^error |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
28 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
29 |
"Created: / 27-11-2011 / 09:35:19 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
30 |
"Modified: / 15-08-2013 / 12:21:40 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
31 |
! |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
32 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
33 |
syntaxError:message position:startPos to:endPos |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
34 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
35 |
^self parseError:message position:startPos to:endPos |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
36 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
37 |
"Created: / 27-11-2011 / 09:45:03 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
38 |
! ! |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
39 |
|
96
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
40 |
!SmalltalkParser methodsFor:'initialization'! |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
41 |
|
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
42 |
initialize |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
43 |
super initialize. |
161
5ff416530ac4
Fx in Smalltalk code completion - do not complete inside comments.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
96
diff
changeset
|
44 |
errorRecovery := true. |
5ff416530ac4
Fx in Smalltalk code completion - do not complete inside comments.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
96
diff
changeset
|
45 |
commentPositions := Array new: 16. |
5ff416530ac4
Fx in Smalltalk code completion - do not complete inside comments.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
96
diff
changeset
|
46 |
commentIndex := -1. |
5ff416530ac4
Fx in Smalltalk code completion - do not complete inside comments.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
96
diff
changeset
|
47 |
saveComments := true. |
96
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
48 |
|
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
49 |
"Created: / 19-09-2013 / 11:25:01 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
161
5ff416530ac4
Fx in Smalltalk code completion - do not complete inside comments.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
96
diff
changeset
|
50 |
"Modified: / 29-01-2014 / 10:38:00 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
96
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
51 |
! ! |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
52 |
|
67
020b7461b15e
Package structure reorganization.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
64
diff
changeset
|
53 |
!SmalltalkParser methodsFor:'parsing'! |
64
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
54 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
55 |
blockStatementList |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
56 |
"parse a blocks statementlist; return a node-tree, nil or #Error" |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
57 |
|
68
681357e18fe5
Improvement in Smalltalk parser error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
58 |
|thisStatement prevStatement firstStatement eMsg blockStart lastErrorPosition | |
64
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
59 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
60 |
blockStart := tokenPosition. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
61 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
62 |
(tokenType == $] ) ifTrue:[^ nil]. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
63 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
64 |
thisStatement := self statement. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
65 |
(thisStatement == #Error) ifTrue:[^ #Error]. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
66 |
firstStatement := thisStatement. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
67 |
[tokenType == $] ] whileFalse:[ |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
68 |
(tokenType == $.) ifFalse:[ |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
69 |
(tokenType == #EOF) ifTrue:[ |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
70 |
| errnode | |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
71 |
errnode := self syntaxError:'missing '']'' in block' position:blockStart to:(source position + 1). |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
72 |
errnode children: (Array with: firstStatement). |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
73 |
^errnode |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
74 |
]. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
75 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
76 |
(tokenType == $) ) ifTrue:[ |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
77 |
eMsg := 'missing '']'' or bad '')'' in block' |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
78 |
] ifFalse:[ |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
79 |
eMsg := 'missing ''.'' between statements (i.e. ''' , tokenType printString , '''-token unexpected)' |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
80 |
]. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
81 |
|
68
681357e18fe5
Improvement in Smalltalk parser error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
82 |
lastErrorPosition == tokenPosition ifTrue:[ |
681357e18fe5
Improvement in Smalltalk parser error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
83 |
"/ Failed to recover, still on the same token, give up. |
681357e18fe5
Improvement in Smalltalk parser error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
84 |
^ error |
681357e18fe5
Improvement in Smalltalk parser error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
85 |
]. |
681357e18fe5
Improvement in Smalltalk parser error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
86 |
lastErrorPosition := tokenPosition. |
681357e18fe5
Improvement in Smalltalk parser error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
87 |
|
681357e18fe5
Improvement in Smalltalk parser error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
88 |
"/ Report error... |
64
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
89 |
self syntaxError:eMsg position:thisStatement startPosition to:tokenPosition. |
68
681357e18fe5
Improvement in Smalltalk parser error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
90 |
"/ ...an try to recover... |
681357e18fe5
Improvement in Smalltalk parser error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
91 |
|
681357e18fe5
Improvement in Smalltalk parser error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
92 |
" Situation 1: ================== |
681357e18fe5
Improvement in Smalltalk parser error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
93 |
number isEven ifTrue:[ |
681357e18fe5
Improvement in Smalltalk parser error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
94 |
inst |
681357e18fe5
Improvement in Smalltalk parser error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
95 |
number := number + 1. |
681357e18fe5
Improvement in Smalltalk parser error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
96 |
] |
681357e18fe5
Improvement in Smalltalk parser error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
97 |
In this case, the `number` token is already consumed, leaving |
681357e18fe5
Improvement in Smalltalk parser error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
98 |
UnaryNode with selector #number as an expression of last statement. |
681357e18fe5
Improvement in Smalltalk parser error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
99 |
The current token is #:=. Try to recover by setting stream position |
681357e18fe5
Improvement in Smalltalk parser error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
100 |
just past of `inst` token" |
681357e18fe5
Improvement in Smalltalk parser error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
101 |
(token == #':=' |
681357e18fe5
Improvement in Smalltalk parser error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
102 |
and:[thisStatement expression isMessage |
681357e18fe5
Improvement in Smalltalk parser error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
103 |
and:[thisStatement expression numArgs == 0 |
681357e18fe5
Improvement in Smalltalk parser error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
104 |
and:[thisStatement expression receiver endPosition notNil]]]) ifTrue:[ |
681357e18fe5
Improvement in Smalltalk parser error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
105 |
source position: thisStatement expression receiver endPosition. |
681357e18fe5
Improvement in Smalltalk parser error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
106 |
thisStatement expression: thisStatement expression receiver. |
681357e18fe5
Improvement in Smalltalk parser error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
107 |
self nextToken. |
681357e18fe5
Improvement in Smalltalk parser error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
108 |
] |
64
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
109 |
] ifTrue:[ |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
110 |
self nextToken. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
111 |
]. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
112 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
113 |
prevStatement := thisStatement. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
114 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
115 |
tokenType == $] ifTrue:[ |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
116 |
" |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
117 |
*** I had a warning here (since it was not defined |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
118 |
*** in the blue-book; but PD-code contains a lot of |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
119 |
*** code with periods at the end so that the warnings |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
120 |
*** became annoying |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
121 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
122 |
self warning:'period after last statement in block'. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
123 |
" |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
124 |
self markBracketAt:tokenPosition. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
125 |
^ self statementListRewriteHookFor:firstStatement |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
126 |
]. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
127 |
thisStatement := self statement. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
128 |
(thisStatement == #Error) ifTrue:[^ #Error]. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
129 |
prevStatement nextStatement:thisStatement |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
130 |
]. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
131 |
self markBracketAt:tokenPosition. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
132 |
^ self statementListRewriteHookFor:firstStatement |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
133 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
134 |
"Created: / 15-08-2013 / 12:16:15 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
68
681357e18fe5
Improvement in Smalltalk parser error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
67
diff
changeset
|
135 |
"Modified: / 26-08-2013 / 11:33:21 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
64
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
136 |
! |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
137 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
138 |
parseExpressionWithSelf:anObject notifying:someOne ignoreErrors:ignoreErrors ignoreWarnings:ignoreWarnings inNameSpace:aNameSpaceOrNil |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
139 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
140 |
|tree token| |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
141 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
142 |
aNameSpaceOrNil notNil ifTrue:[ |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
143 |
self currentNameSpace:aNameSpaceOrNil |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
144 |
]. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
145 |
self setSelf:anObject. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
146 |
self notifying:someOne. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
147 |
self ignoreErrors:ignoreErrors. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
148 |
self ignoreWarnings:ignoreWarnings. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
149 |
token := self nextToken. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
150 |
(token == $^) ifTrue:[ |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
151 |
self nextToken. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
152 |
]. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
153 |
(token == #EOF) ifTrue:[ |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
154 |
^ nil |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
155 |
]. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
156 |
"/tree := self expression. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
157 |
tree := self statementList. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
158 |
(self errorFlag or:[tree == #Error]) ifTrue:[^ #Error]. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
159 |
^ tree |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
160 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
161 |
"Created: / 14-12-1999 / 15:11:37 / cg" |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
162 |
"Created: / 09-07-2011 / 22:23:25 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
96
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
163 |
! |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
164 |
|
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
165 |
statement |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
166 |
"parse a statement; return a node-tree or #Error. |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
167 |
|
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
168 |
statement ::= '^' expression |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
169 |
| PRIMITIVECODE |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
170 |
| expression |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
171 |
" |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
172 |
|
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
173 |
|expr node lnr code pos| |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
174 |
|
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
175 |
pos := tokenPosition. |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
176 |
|
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
177 |
(tokenType == $^) ifTrue:[ |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
178 |
^ self returnStatement |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
179 |
]. |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
180 |
|
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
181 |
(tokenType == #Primitive) ifTrue:[ |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
182 |
code := tokenValue. |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
183 |
node := PrimitiveNode code:code. |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
184 |
node startPosition: tokenPosition endPosition: source position + 1. |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
185 |
self nextToken. |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
186 |
node isOptional ifFalse:[ |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
187 |
hasNonOptionalPrimitiveCode := true |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
188 |
]. |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
189 |
hasPrimitiveCode := true. |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
190 |
^ node |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
191 |
]. |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
192 |
|
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
193 |
(tokenType == #EOF) ifTrue:[ |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
194 |
currentBlock notNil ifTrue:[ |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
195 |
self syntaxError:'missing '']'' at end of block'. |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
196 |
errorRecovery ifTrue:[ |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
197 |
tokenType := $]. |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
198 |
^ error. |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
199 |
]. |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
200 |
] ifFalse:[ |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
201 |
self syntaxError:'period after last statement'. |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
202 |
errorRecovery ifTrue:[ |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
203 |
tokenType := $.. |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
204 |
^ error. |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
205 |
]. |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
206 |
]. |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
207 |
^ #Error |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
208 |
]. |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
209 |
|
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
210 |
(tokenType == $.) ifTrue:[ |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
211 |
(parserFlags allowEmptyStatements |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
212 |
or:[parserFlags allowSqueakExtensions == true]) ifTrue:[ |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
213 |
"/ allow empty statement |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
214 |
self warnAboutEmptyStatement. |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
215 |
node := StatementNode expression:nil. |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
216 |
node startPosition:pos. |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
217 |
^ node |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
218 |
]. |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
219 |
]. |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
220 |
|
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
221 |
lnr := tokenLineNr. |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
222 |
|
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
223 |
expr := self expression. |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
224 |
(expr == #Error) ifTrue:[^ #Error]. |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
225 |
|
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
226 |
"/ classToCompileFor notNil ifTrue:[ |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
227 |
"/ currentBlock isNil ifTrue:[ |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
228 |
"/ expr isPrimary ifTrue:[ |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
229 |
"/ self warning:'useless computation - missing ^ ?' |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
230 |
"/ ] |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
231 |
"/ ] |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
232 |
"/ ]. |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
233 |
|
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
234 |
node := StatementNode expression:expr. |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
235 |
parserFlags fullLineNumberInfo ifTrue:[node lineNumber:lnr]. |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
236 |
node startPosition:pos. |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
237 |
^ node |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
238 |
|
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
239 |
"Created: / 19-09-2013 / 11:32:07 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
64
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
240 |
! ! |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
241 |
|
67
020b7461b15e
Package structure reorganization.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
64
diff
changeset
|
242 |
!SmalltalkParser methodsFor:'parsing-expressions'! |
64
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
243 |
|
85
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
244 |
keywordExpression |
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
245 |
"parse a keyword-expression; return a node-tree, nil or #Error. |
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
246 |
|
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
247 |
keywordExpression ::= binaryexpression |
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
248 |
| { KEYWORD-PART binaryExpression } |
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
249 |
" |
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
250 |
|
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
251 |
|receiver expr| |
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
252 |
|
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
253 |
receiver := self binaryExpression. |
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
254 |
(receiver == #Error) ifTrue:[^ #Error]. |
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
255 |
(tokenType == #EOF) ifTrue:[^ receiver]. |
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
256 |
tokenType == $] ifTrue:[^ receiver]. |
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
257 |
tokenType == $) ifTrue:[^ receiver]. |
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
258 |
expr := self keywordExpressionFor:receiver. |
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
259 |
|
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
260 |
"/ expr could be an assignment as well, here |
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
261 |
(ignoreWarnings or:[ignoreErrors]) ifFalse:[ |
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
262 |
"/ for a better error message, in case of a missing period in the previous message, |
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
263 |
"/ <expr> <missing period> foo := ... |
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
264 |
"/ would be parsed as unary message foo; detect this here, instead of high up in the calling hierarchy, |
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
265 |
"/ where it is difficult to provide a reasonable error message |
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
266 |
tokenType == #':=' ifTrue:[ |
96
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
267 |
| positionOfPeriod exprLast exprLastParent | |
85
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
268 |
|
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
269 |
"/ Find the very last unary send node, Consider: |
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
270 |
"/ x := 2 |
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
271 |
"/ y := false |
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
272 |
"/ |
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
273 |
"/ x := 2 between: 0 and: 10 |
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
274 |
"/ y := false |
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
275 |
"/ |
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
276 |
"/ x := 2 between: 0 and: self max |
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
277 |
"/ y := false |
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
278 |
|
96
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
279 |
exprLastParent := nil. |
85
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
280 |
exprLast := expr. |
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
281 |
[ exprLast isMessage and: [ exprLast isUnaryMessage not ] ] whileTrue:[ |
96
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
282 |
exprLastParent := exprLast. |
85
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
283 |
exprLast := exprLast args last. |
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
284 |
]. |
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
285 |
(exprLast isMessage and: [ exprLast isUnaryMessage ] ) ifTrue:[ |
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
286 |
positionOfPeriod := exprLast receiver positionToInsertPeriodForStatementSeparation |
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
287 |
]. |
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
288 |
positionOfPeriod notNil ifTrue:[ |
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
289 |
"/Try to recover |
96
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
290 |
"/ Strip the last unary message whose selector is actually a variable name..." |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
291 |
exprLastParent notNil ifTrue:[ |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
292 |
exprLastParent args at: exprLastParent args size put: exprLast receiver. |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
293 |
] ifFalse:[ |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
294 |
"/ no nesting, the expr itself is errorneouts... |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
295 |
expr := expr receiver. |
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
296 |
]. |
85
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
297 |
expr := ParseErrorNode new |
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
298 |
startPosition:expr startPosition endPosition: positionOfPeriod - 1; |
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
299 |
errorString: ('":=" unexpected. Probably missing "." in previous expression.'); |
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
300 |
children: (Array with: expr); |
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
301 |
yourself. |
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
302 |
source position: positionOfPeriod. |
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
303 |
tokenType := $. |
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
304 |
] |
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
305 |
]. |
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
306 |
]. |
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
307 |
|
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
308 |
^ expr |
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
309 |
|
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
310 |
"Created: / 16-09-2013 / 17:23:09 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
96
12fe1a59dfd1
Some more work on error recovery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
85
diff
changeset
|
311 |
"Modified: / 19-09-2013 / 11:47:12 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
85
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
312 |
! |
d6a3fdbd87db
SmalltalkParser recovery improved...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
68
diff
changeset
|
313 |
|
64
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
314 |
primary |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
315 |
| nodeOrError | |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
316 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
317 |
nodeOrError := super primary. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
318 |
^ (nodeOrError == #Error and:[error notNil]) ifTrue:[ |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
319 |
error |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
320 |
] ifFalse:[ |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
321 |
nodeOrError |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
322 |
] |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
323 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
324 |
"Created: / 19-08-2013 / 14:07:12 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
325 |
! |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
326 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
327 |
primary_expression |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
328 |
"parse a parentized expression primary; return a node-tree, or raise an Error." |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
329 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
330 |
|pos val eMsg| |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
331 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
332 |
pos := tokenPosition. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
333 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
334 |
self nextToken. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
335 |
val := self expression. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
336 |
(val == #Error) ifTrue:[^ #Error]. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
337 |
(tokenType == $) ) ifFalse:[ |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
338 |
| errnode | |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
339 |
tokenType isCharacter ifTrue:[ |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
340 |
eMsg := 'missing '')'' (i.e. ''' , tokenType asString , ''' unexpected)'. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
341 |
] ifFalse:[ |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
342 |
eMsg := 'missing '')'''. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
343 |
]. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
344 |
errnode := self syntaxError:eMsg withCRs position:pos to:tokenPosition. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
345 |
errnode children: (Array with: val). |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
346 |
^ errnode |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
347 |
]. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
348 |
self markParenthesisAt:tokenPosition. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
349 |
parenthesisLevel := parenthesisLevel - 1. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
350 |
self nextToken. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
351 |
(self noAssignmentAllowed:'Invalid assignment to an expression' at:pos) ifFalse:[ |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
352 |
^ #Error |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
353 |
]. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
354 |
val parenthesized:true. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
355 |
^ val |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
356 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
357 |
"Created: / 15-08-2013 / 15:23:59 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
358 |
! ! |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
359 |
|
67
020b7461b15e
Package structure reorganization.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
64
diff
changeset
|
360 |
!SmalltalkParser methodsFor:'parsing-tweaks'! |
64
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
361 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
362 |
_blockStatementList |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
363 |
"parse a blocks statementlist; return a node-tree, nil or #Error" |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
364 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
365 |
|thisStatement prevStatement firstStatement eMsg blockStart| |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
366 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
367 |
blockStart := tokenPosition. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
368 |
(tokenType == $]) ifTrue:[ |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
369 |
^ nil |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
370 |
]. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
371 |
thisStatement := self statement. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
372 |
(thisStatement == #Error) ifTrue:[ |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
373 |
^ #Error |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
374 |
]. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
375 |
firstStatement := thisStatement. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
376 |
[ |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
377 |
tokenType == $] or:[ tokenType == #EOF ] |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
378 |
] whileFalse:[ |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
379 |
(tokenType == $.) ifFalse:[ |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
380 |
(tokenType == #EOF) ifTrue:[ |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
381 |
" self syntaxError:'missing '']'' in block' position:blockStart to:(source position1Based). |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
382 |
^ #Error." |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
383 |
]. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
384 |
(tokenType == $)) ifTrue:[ |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
385 |
eMsg := 'missing '']'' or bad '')'' in block' |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
386 |
] ifFalse:[ |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
387 |
eMsg := 'missing ''.'' between statements (i.e. ''' |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
388 |
, tokenType printString , '''-token unexpected)' |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
389 |
]. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
390 |
"self syntaxError:eMsg position:blockStart to:tokenPosition. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
391 |
^ #Error" |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
392 |
]. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
393 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
394 |
prevStatement := thisStatement. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
395 |
(eMsg isNil ) ifTrue:[ |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
396 |
self nextToken. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
397 |
]. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
398 |
tokenType == $] ifTrue:[ |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
399 |
" |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
400 |
*** I had a warning here (since it was not defined |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
401 |
*** in the blue-book; but PD-code contains a lot of |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
402 |
*** code with periods at the end so that the warnings |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
403 |
*** became annoying |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
404 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
405 |
self warning:'period after last statement in block'." |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
406 |
self markBracketAt:tokenPosition. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
407 |
^ firstStatement |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
408 |
]. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
409 |
thisStatement := self statement. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
410 |
(thisStatement == #Error) ifTrue:[ |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
411 |
^ #Error |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
412 |
]. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
413 |
prevStatement nextStatement:thisStatement. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
414 |
(eMsg notNil) ifTrue:[ |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
415 |
self nextToken. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
416 |
]. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
417 |
eMsg := nil. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
418 |
]. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
419 |
self markBracketAt:tokenPosition. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
420 |
^ self statementListRewriteHookFor:firstStatement |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
421 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
422 |
"Created: / 05-08-2013 / 14:56:12 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
423 |
! |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
424 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
425 |
_primary |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
426 |
"parse a primary-expression; return a node-tree, nil or #Error. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
427 |
This also cares for namespace-access-pathes." |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
428 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
429 |
| node | |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
430 |
node := super primary. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
431 |
"/If an error occured, return the error node" |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
432 |
node == #Error ifTrue:[ |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
433 |
self assert: error notNil description: 'Parse error occured but no error node.'. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
434 |
node := error. error := nil. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
435 |
]. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
436 |
^node |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
437 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
438 |
"Created: / 05-08-2013 / 14:56:20 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
439 |
! |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
440 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
441 |
_statementList |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
442 |
"parse a statementlist; return a node-tree, nil or #Error. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
443 |
Statements must be separated by periods. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
444 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
445 |
statementList ::= <statement> |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
446 |
| <statementList> . <statement>" |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
447 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
448 |
|thisStatement prevStatement firstStatement periodPos prevExpr| |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
449 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
450 |
thisStatement := self statement. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
451 |
(thisStatement == #Error) ifTrue:[ |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
452 |
self breakPoint: #jv. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
453 |
^ #Error |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
454 |
]. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
455 |
firstStatement := thisStatement. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
456 |
[ tokenType == #EOF ] whileFalse:[ |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
457 |
prevExpr := thisStatement expression. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
458 |
(prevExpr notNil |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
459 |
and:[ prevExpr isMessage and:[ thisStatement isReturnNode not ] ]) |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
460 |
ifTrue:[ |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
461 |
(#( #'=' #'==' ) includes:prevExpr selector) ifTrue:[ |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
462 |
self |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
463 |
warning:'useless computation - mistyped assignment (i.e. did you mean '':='') ?' |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
464 |
position:prevExpr selectorPosition |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
465 |
]. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
466 |
]. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
467 |
periodPos := tokenPosition. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
468 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
469 |
(tokenType == $. or:[ firstStatement = thisStatement and:[firstStatement expression isErrorNode] ]) ifTrue:[ |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
470 |
self nextToken. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
471 |
]. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
472 |
tokenType == $. ifTrue:[ |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
473 |
self emptyStatement. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
474 |
]. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
475 |
(tokenType == $]) ifTrue:[ |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
476 |
currentBlock isNil ifTrue:[ |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
477 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
478 |
] ifFalse:[ |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
479 |
^ self statementListRewriteHookFor:firstStatement |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
480 |
]. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
481 |
]. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
482 |
(tokenType == #EOF) ifTrue:[ |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
483 |
currentBlock notNil ifTrue:[ |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
484 |
"self parseError:''']'' expected (block nesting error)'." |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
485 |
] ifFalse:[ |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
486 |
^ self statementListRewriteHookFor:firstStatement |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
487 |
]. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
488 |
]. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
489 |
prevStatement := thisStatement. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
490 |
prevStatement isReturnNode ifTrue:[ |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
491 |
self warning:'statements after return' position:tokenPosition |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
492 |
]. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
493 |
thisStatement := self statement. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
494 |
(thisStatement == #Error) ifTrue:[ |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
495 |
self breakPoint: #jv. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
496 |
^ #Error |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
497 |
]. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
498 |
(thisStatement expression isNil or:[thisStatement expression isErrorNode]) ifTrue:[ |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
499 |
self nextToken. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
500 |
]. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
501 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
502 |
prevStatement nextStatement:thisStatement |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
503 |
]. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
504 |
^ self statementListRewriteHookFor:firstStatement |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
505 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
506 |
"Created: / 05-08-2013 / 14:56:05 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
507 |
! ! |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
508 |
|
67
020b7461b15e
Package structure reorganization.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
64
diff
changeset
|
509 |
!SmalltalkParser methodsFor:'private'! |
64
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
510 |
|
161
5ff416530ac4
Fx in Smalltalk code completion - do not complete inside comments.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
96
diff
changeset
|
511 |
beginComment |
5ff416530ac4
Fx in Smalltalk code completion - do not complete inside comments.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
96
diff
changeset
|
512 |
commentIndex := commentIndex + 2. |
5ff416530ac4
Fx in Smalltalk code completion - do not complete inside comments.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
96
diff
changeset
|
513 |
(commentPositions size) < (commentIndex + 1) ifTrue:[ |
5ff416530ac4
Fx in Smalltalk code completion - do not complete inside comments.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
96
diff
changeset
|
514 |
| newPositions | |
5ff416530ac4
Fx in Smalltalk code completion - do not complete inside comments.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
96
diff
changeset
|
515 |
|
5ff416530ac4
Fx in Smalltalk code completion - do not complete inside comments.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
96
diff
changeset
|
516 |
newPositions := Array new: commentPositions size + 16. |
5ff416530ac4
Fx in Smalltalk code completion - do not complete inside comments.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
96
diff
changeset
|
517 |
newPositions replaceFrom: 1 with: commentPositions. |
5ff416530ac4
Fx in Smalltalk code completion - do not complete inside comments.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
96
diff
changeset
|
518 |
commentPositions := newPositions. |
5ff416530ac4
Fx in Smalltalk code completion - do not complete inside comments.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
96
diff
changeset
|
519 |
]. |
5ff416530ac4
Fx in Smalltalk code completion - do not complete inside comments.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
96
diff
changeset
|
520 |
commentPositions at: commentIndex put: source position. |
5ff416530ac4
Fx in Smalltalk code completion - do not complete inside comments.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
96
diff
changeset
|
521 |
|
5ff416530ac4
Fx in Smalltalk code completion - do not complete inside comments.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
96
diff
changeset
|
522 |
"Created: / 29-01-2014 / 10:13:25 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
5ff416530ac4
Fx in Smalltalk code completion - do not complete inside comments.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
96
diff
changeset
|
523 |
! |
5ff416530ac4
Fx in Smalltalk code completion - do not complete inside comments.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
96
diff
changeset
|
524 |
|
5ff416530ac4
Fx in Smalltalk code completion - do not complete inside comments.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
96
diff
changeset
|
525 |
endComment: comment |
5ff416530ac4
Fx in Smalltalk code completion - do not complete inside comments.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
96
diff
changeset
|
526 |
commentPositions at: commentIndex + 1 put: comment size. |
5ff416530ac4
Fx in Smalltalk code completion - do not complete inside comments.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
96
diff
changeset
|
527 |
|
5ff416530ac4
Fx in Smalltalk code completion - do not complete inside comments.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
96
diff
changeset
|
528 |
"Created: / 29-01-2014 / 10:14:54 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
5ff416530ac4
Fx in Smalltalk code completion - do not complete inside comments.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
96
diff
changeset
|
529 |
! |
5ff416530ac4
Fx in Smalltalk code completion - do not complete inside comments.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
96
diff
changeset
|
530 |
|
5ff416530ac4
Fx in Smalltalk code completion - do not complete inside comments.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
96
diff
changeset
|
531 |
endComment: comment type: type |
5ff416530ac4
Fx in Smalltalk code completion - do not complete inside comments.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
96
diff
changeset
|
532 |
^ self endComment: comment |
5ff416530ac4
Fx in Smalltalk code completion - do not complete inside comments.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
96
diff
changeset
|
533 |
|
5ff416530ac4
Fx in Smalltalk code completion - do not complete inside comments.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
96
diff
changeset
|
534 |
"Created: / 29-01-2014 / 10:14:09 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
5ff416530ac4
Fx in Smalltalk code completion - do not complete inside comments.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
96
diff
changeset
|
535 |
! |
5ff416530ac4
Fx in Smalltalk code completion - do not complete inside comments.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
96
diff
changeset
|
536 |
|
64
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
537 |
findNameSpaceWith:varName |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
538 |
| ns | |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
539 |
|
161
5ff416530ac4
Fx in Smalltalk code completion - do not complete inside comments.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
96
diff
changeset
|
540 |
"The super #findNameSpaceWith: checks whether the the global named 'varName' exists, |
64
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
541 |
if not, returns the current namespace which is then prepended to 'varName'. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
542 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
543 |
Here we have to deal with uncomplete global names, so trick the caller by returning |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
544 |
nil if the partially typed global name starts with current namespace prefix." |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
545 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
546 |
classToCompileFor notNil ifTrue:[ |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
547 |
ns := classToCompileFor topNameSpace. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
548 |
(varName = ns name) ifTrue:[ |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
549 |
^ nil |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
550 |
] |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
551 |
]. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
552 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
553 |
^ super findNameSpaceWith:varName |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
554 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
555 |
"Created: / 28-07-2013 / 13:49:09 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
161
5ff416530ac4
Fx in Smalltalk code completion - do not complete inside comments.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
96
diff
changeset
|
556 |
"Modified (format): / 29-01-2014 / 10:04:44 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
64
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
557 |
! ! |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
558 |
|
67
020b7461b15e
Package structure reorganization.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
64
diff
changeset
|
559 |
!SmalltalkParser methodsFor:'syntax coloring'! |
64
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
560 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
561 |
markBracketAt:pos |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
562 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
563 |
sourceText isNil ifTrue:[^self]. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
564 |
^super markBracketAt:pos |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
565 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
566 |
"Created: / 03-04-2011 / 22:39:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
567 |
! |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
568 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
569 |
markFrom:pos1 to:pos2 withEmphasis:fontEmp color:clrIn |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
570 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
571 |
sourceText isNil ifTrue:[^self]. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
572 |
super markFrom:pos1 to:pos2 withEmphasis:fontEmp color:clrIn |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
573 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
574 |
"Created: / 03-04-2011 / 22:24:36 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
575 |
! |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
576 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
577 |
markFrom:pos1 to:pos2 withEmphasis:fontEmp color:fgClr1 ifNil:fgClr2 backgroundColor:bgClr |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
578 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
579 |
sourceText isNil ifTrue:[^self]. |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
580 |
super markFrom:pos1 to:pos2 withEmphasis:fontEmp color:fgClr1 ifNil:fgClr2 backgroundColor:bgClr |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
581 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
582 |
"Created: / 14-02-2012 / 11:08:24 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
583 |
! ! |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
584 |
|
67
020b7461b15e
Package structure reorganization.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
64
diff
changeset
|
585 |
!SmalltalkParser class methodsFor:'documentation'! |
64
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
586 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
587 |
version_HG |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
588 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
589 |
^ '$Changeset: <not expanded> $' |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
590 |
! |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
591 |
|
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
592 |
version_SVN |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
593 |
^ '$Id: SmallSenseParser.st 7922 2012-03-09 07:57:34Z vranyj1 $' |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
594 |
! ! |
2257d7223898
All classes moved to namespace SmallSense.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
595 |