OLD | NEW |
---|---|
1 // Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file |
2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
4 | 4 |
5 class ClassElementParser extends PartialParser { | 5 class ClassElementParser extends PartialParser { |
6 ClassElementParser(Listener listener) : super(listener); | 6 ClassElementParser(Listener listener) : super(listener); |
7 | 7 |
8 Token parseClassBody(Token token) => fullParseClassBody(token); | 8 Token parseClassBody(Token token) => fullParseClassBody(token); |
9 } | 9 } |
10 | 10 |
11 class PartialClassElement extends ClassElement { | 11 class PartialClassElement extends ClassElement { |
12 final Token beginToken; | 12 final Token beginToken; |
13 final Token endToken; | 13 final Token endToken; |
14 Node cachedNode; | 14 Node cachedNode; |
15 | 15 |
16 PartialClassElement(SourceString name, | 16 PartialClassElement(SourceString name, |
17 Token this.beginToken, | 17 Token this.beginToken, |
18 Token this.endToken, | 18 Token this.endToken, |
19 Element enclosing, | 19 Element enclosing, |
20 int id) | 20 int id) |
21 : super(name, enclosing, id); | 21 : super(name, enclosing, id); |
22 | 22 |
23 ClassNode parseNode(DiagnosticListener diagnosticListener) { | 23 ClassNode parseNode(DiagnosticListener diagnosticListener) { |
24 if (cachedNode != null) return cachedNode; | 24 if (cachedNode != null) return cachedNode; |
25 | |
25 MemberListener listener = new MemberListener(diagnosticListener, this); | 26 MemberListener listener = new MemberListener(diagnosticListener, this); |
26 Parser parser = new ClassElementParser(listener); | 27 Parser parser = new ClassElementParser(listener); |
27 Token token = parser.parseTopLevelDeclaration(beginToken); | 28 Token token = parser.parseTopLevelDeclaration(beginToken); |
28 assert(token === endToken.next); | 29 assert(token === endToken.next); |
29 cachedNode = listener.popNode(); | 30 cachedNode = listener.popNode(); |
30 assert(listener.nodes.isEmpty()); | 31 assert(listener.nodes.isEmpty()); |
31 return cachedNode; | 32 return cachedNode; |
32 } | 33 } |
33 | 34 |
34 Token position() => beginToken; | 35 Token position() => beginToken; |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
102 } | 103 } |
103 } | 104 } |
104 | 105 |
105 void endMethod(Token getOrSet, Token beginToken, Token endToken) { | 106 void endMethod(Token getOrSet, Token beginToken, Token endToken) { |
106 super.endMethod(getOrSet, beginToken, endToken); | 107 super.endMethod(getOrSet, beginToken, endToken); |
107 FunctionExpression method = popNode(); | 108 FunctionExpression method = popNode(); |
108 pushNode(null); | 109 pushNode(null); |
109 bool isConstructor = isConstructorName(method.name); | 110 bool isConstructor = isConstructorName(method.name); |
110 SourceString name = getMethodNameHack(method.name); | 111 SourceString name = getMethodNameHack(method.name); |
111 ElementKind kind = ElementKind.FUNCTION; | 112 ElementKind kind = ElementKind.FUNCTION; |
113 Modifiers modifiers = method.modifiers; | |
114 if (modifiers.isFinal()) { | |
115 recoverableError('illegal modifier', node: modifiers); | |
ahe
2012/08/24 08:32:18
I would rather catch this in the resolver.
| |
116 } | |
112 if (isConstructor) { | 117 if (isConstructor) { |
113 if (getOrSet !== null) { | 118 if (getOrSet !== null) { |
114 recoverableError('illegal modifier', token: getOrSet); | 119 recoverableError('illegal modifier', token: getOrSet); |
115 } | 120 } |
121 if (modifiers.isStatic() || | |
122 modifiers.isAbstract()) { | |
123 recoverableError('illegal modifier', node: modifiers); | |
ahe
2012/08/24 08:32:18
Ditto.
| |
124 } | |
116 kind = ElementKind.GENERATIVE_CONSTRUCTOR; | 125 kind = ElementKind.GENERATIVE_CONSTRUCTOR; |
117 } else if (getOrSet !== null) { | 126 } else if (getOrSet !== null) { |
118 kind = (getOrSet.stringValue === 'get') | 127 kind = (getOrSet.stringValue === 'get') |
119 ? ElementKind.GETTER : ElementKind.SETTER; | 128 ? ElementKind.GETTER : ElementKind.SETTER; |
120 } | 129 } |
121 Element memberElement = | 130 Element memberElement = |
122 new PartialFunctionElement(name, beginToken, getOrSet, endToken, | 131 new PartialFunctionElement(name, beginToken, getOrSet, endToken, |
123 kind, method.modifiers, enclosingElement); | 132 kind, method.modifiers, enclosingElement); |
124 addMember(memberElement); | 133 addMember(memberElement); |
125 } | 134 } |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
159 } | 168 } |
160 | 169 |
161 void endInitializers(int count, Token beginToken, Token endToken) { | 170 void endInitializers(int count, Token beginToken, Token endToken) { |
162 pushNode(null); | 171 pushNode(null); |
163 } | 172 } |
164 | 173 |
165 void addMember(Element memberElement) { | 174 void addMember(Element memberElement) { |
166 enclosingElement.addMember(memberElement, listener); | 175 enclosingElement.addMember(memberElement, listener); |
167 } | 176 } |
168 } | 177 } |
OLD | NEW |