Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(194)

Side by Side Diff: frog/leg/resolver.dart

Issue 9146036: Address review comments. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: '' Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « frog/leg/namer.dart ('k') | frog/leg/warnings.dart » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 interface TreeElements { 5 interface TreeElements {
6 Element operator[](Node node); 6 Element operator[](Node node);
7 } 7 }
8 8
9 class TreeElementMapping implements TreeElements { 9 class TreeElementMapping implements TreeElements {
10 Map<Node, Element> map; 10 Map<Node, Element> map;
(...skipping 620 matching lines...) Expand 10 before | Expand all | Expand 10 after
631 } 631 }
632 632
633 visitParenthesizedExpression(ParenthesizedExpression node) { 633 visitParenthesizedExpression(ParenthesizedExpression node) {
634 visit(node.expression); 634 visit(node.expression);
635 } 635 }
636 636
637 visitNewExpression(NewExpression node) { 637 visitNewExpression(NewExpression node) {
638 if (node.isConst()) cancel(node, 'const expressions are not implemented'); 638 if (node.isConst()) cancel(node, 'const expressions are not implemented');
639 if (node.send.selector.asTypeAnnotation() === null) { 639 if (node.send.selector.asTypeAnnotation() === null) {
640 cancel( 640 cancel(
641 node, 'named constructors with type parameters are not implemented'); 641 node, 'named constructors with type arguments are not implemented');
642 } 642 }
643 643
644 visit(node.send.argumentsNode); 644 visit(node.send.argumentsNode);
645 645
646 SourceString constructorName; 646 SourceString constructorName;
647 Node typeName = node.send.selector.asTypeAnnotation().typeName; 647 Node typeName = node.send.selector.asTypeAnnotation().typeName;
648 if (typeName.asSend() !== null) { 648 if (typeName.asSend() !== null) {
649 Identifier receiver = typeName.asSend().receiver.asIdentifier(); 649 Identifier receiver = typeName.asSend().receiver.asIdentifier();
650 Identifier selector = typeName.asSend().selector.asIdentifier(); 650 Identifier selector = typeName.asSend().selector.asIdentifier();
651 SourceString className = receiver.source; 651 SourceString className = receiver.source;
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
864 if (name !== null) { 864 if (name !== null) {
865 VariableElement element = new VariableElement( 865 VariableElement element = new VariableElement(
866 name, variables, kind, resolver.context.element, node: link.head); 866 name, variables, kind, resolver.context.element, node: link.head);
867 resolver.defineElement(link.head, element); 867 resolver.defineElement(link.head, element);
868 } 868 }
869 } 869 }
870 } 870 }
871 871
872 visit(Node node) => node.accept(this); 872 visit(Node node) => node.accept(this);
873 873
874 visitSend(Node node) { 874 visitSend(Send node) {
875 // The lhs is a property access. The parser never accepts this 875 // The lhs is a property access. The parser never accepts this
876 // code right now if it's not a field initializer. 876 // code right now if it's not a field initializer.
877 if (kind !== ElementKind.PARAMETER || node.receiver === null) { 877 if (kind !== ElementKind.PARAMETER || node.receiver === null) {
878 resolver.cancel('internal error'); 878 resolver.cancel(node, 'internal error');
879 } 879 }
880 880
881 if (resolver.element.kind !== ElementKind.GENERATIVE_CONSTRUCTOR) { 881 if (node.receiver.asIdentifier() === null ||
882 !node.receiver.asIdentifier().isThis()) {
883 resolver.error(node, MessageKind.INVALID_PARAMETER, []);
884 } else if (resolver.enclosingElement.kind !==
885 ElementKind.GENERATIVE_CONSTRUCTOR) {
882 resolver.error(node, MessageKind.FIELD_PARAMETER_NOT_ALLOWED, []); 886 resolver.error(node, MessageKind.FIELD_PARAMETER_NOT_ALLOWED, []);
883 } else if (node.receiver.asIdentifier() === null ||
884 !node.receiver.asIdentifier().isThis()) {
885 resolver.error(node, MessageKind.INVALID_FIELD_PARAMETER, []);
886 } else { 887 } else {
887 SourceString name = node.selector.asIdentifier().source; 888 SourceString name = node.selector.asIdentifier().source;
888 Element field = resolver.currentClass.lookupLocalMember(name); 889 Element field = resolver.currentClass.lookupLocalMember(name);
889 if (field.kind !== ElementKind.FIELD) { 890 if (field.kind !== ElementKind.FIELD) {
890 resolver.error(node, MessageKind.NOT_A_FIELD, [name]); 891 resolver.error(node, MessageKind.NOT_A_FIELD, [name]);
891 } else if (!field.isInstanceMember()) { 892 } else if (!field.isInstanceMember()) {
892 resolver.error(node, MessageKind.NOT_INSTANCE_FIELD, [name]); 893 resolver.error(node, MessageKind.NOT_INSTANCE_FIELD, [name]);
893 } else {
894 resolver.defineElement(node, field);
895 } 894 }
895 resolver.defineElement(node, field);
896 } 896 }
897 return null; 897 return null;
898 } 898 }
899 899
900 visitNode(Node node) { 900 visitNode(Node node) {
901 resolver.cancel(node, 'not implemented'); 901 resolver.cancel(node, 'not implemented');
902 } 902 }
903 } 903 }
904 904
905 // TODO(ahe): Frog cannot handle generic types. 905 // TODO(ahe): Frog cannot handle generic types.
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
999 class TopScope extends Scope { 999 class TopScope extends Scope {
1000 Universe universe; 1000 Universe universe;
1001 1001
1002 TopScope(Universe this.universe) : super(null, null); 1002 TopScope(Universe this.universe) : super(null, null);
1003 Element lookup(SourceString name) => universe.find(name); 1003 Element lookup(SourceString name) => universe.find(name);
1004 1004
1005 Element add(Element element) { 1005 Element add(Element element) {
1006 throw "Cannot add an element in the top scope"; 1006 throw "Cannot add an element in the top scope";
1007 } 1007 }
1008 } 1008 }
OLDNEW
« no previous file with comments | « frog/leg/namer.dart ('k') | frog/leg/warnings.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698