| Index: runtime/vm/kernel.h
|
| diff --git a/runtime/vm/kernel.h b/runtime/vm/kernel.h
|
| index 1ebd8f0ad5cc1e08e9cce072a5bf167d785d9444..8913cab1616b6b35aa27cf7fff59e7f2857ac361 100644
|
| --- a/runtime/vm/kernel.h
|
| +++ b/runtime/vm/kernel.h
|
| @@ -22,12 +22,10 @@
|
| M(InterfaceType) \
|
| M(FunctionType) \
|
| M(TypeParameterType) \
|
| - M(VectorType) \
|
| - M(TypedefType)
|
| + M(VectorType)
|
|
|
| #define KERNEL_TREE_NODES_DO(M) \
|
| M(Library) \
|
| - M(Typedef) \
|
| M(Class) \
|
| M(NormalClass) \
|
| M(MixinClass) \
|
| @@ -377,7 +375,6 @@ KERNEL_VISITORS_DO(DO)
|
| DEFINE_IS_OPERATION(TreeNode) \
|
| KERNEL_TREE_NODES_DO(DEFINE_IS_OPERATION)
|
|
|
| -class Typedef;
|
| class Class;
|
| class Constructor;
|
| class Field;
|
| @@ -491,7 +488,6 @@ class Library : public LinkedNode {
|
| String* import_uri() { return import_uri_; }
|
| intptr_t source_uri_index() { return source_uri_index_; }
|
| String* name() { return name_; }
|
| - List<Typedef>& typedefs() { return typedefs_; }
|
| List<Class>& classes() { return classes_; }
|
| List<Field>& fields() { return fields_; }
|
| List<Procedure>& procedures() { return procedures_; }
|
| @@ -508,7 +504,6 @@ class Library : public LinkedNode {
|
| Ref<String> name_;
|
| Ref<String> import_uri_;
|
| intptr_t source_uri_index_;
|
| - List<Typedef> typedefs_;
|
| List<Class> classes_;
|
| List<Field> fields_;
|
| List<Procedure> procedures_;
|
| @@ -519,40 +514,6 @@ class Library : public LinkedNode {
|
| };
|
|
|
|
|
| -class Typedef : public LinkedNode {
|
| - public:
|
| - Typedef* ReadFrom(Reader* reader);
|
| -
|
| - virtual ~Typedef();
|
| -
|
| - DEFINE_CASTING_OPERATIONS(Typedef);
|
| -
|
| - virtual void AcceptTreeVisitor(TreeVisitor* visitor);
|
| - virtual void VisitChildren(Visitor* visitor);
|
| -
|
| - Library* parent() { return parent_; }
|
| - String* name() { return name_; }
|
| - intptr_t source_uri_index() { return source_uri_index_; }
|
| - TokenPosition position() { return position_; }
|
| - TypeParameterList& type_parameters() { return type_parameters_; }
|
| - DartType* type() { return type_; }
|
| -
|
| - protected:
|
| - Typedef() : position_(TokenPosition::kNoSource) {}
|
| -
|
| - private:
|
| - template <typename T>
|
| - friend class List;
|
| -
|
| - Ref<Library> parent_;
|
| - Ref<String> name_;
|
| - intptr_t source_uri_index_;
|
| - TokenPosition position_;
|
| - TypeParameterList type_parameters_;
|
| - Child<DartType> type_;
|
| -};
|
| -
|
| -
|
| class Class : public LinkedNode {
|
| public:
|
| Class* ReadFrom(Reader* reader);
|
| @@ -2794,32 +2755,6 @@ class InterfaceType : public DartType {
|
| };
|
|
|
|
|
| -class TypedefType : public DartType {
|
| - public:
|
| - static TypedefType* ReadFrom(Reader* reader);
|
| -
|
| - explicit TypedefType(CanonicalName* class_reference)
|
| - : typedef_reference_(class_reference) {}
|
| - virtual ~TypedefType();
|
| -
|
| - DEFINE_CASTING_OPERATIONS(TypedefType);
|
| -
|
| - virtual void AcceptDartTypeVisitor(DartTypeVisitor* visitor);
|
| - virtual void VisitChildren(Visitor* visitor);
|
| -
|
| - CanonicalName* typedef_reference() { return typedef_reference_; }
|
| - List<DartType>& type_arguments() { return type_arguments_; }
|
| -
|
| - private:
|
| - TypedefType() {}
|
| -
|
| - Ref<CanonicalName> typedef_reference_; // Typedef.
|
| - List<DartType> type_arguments_;
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(TypedefType);
|
| -};
|
| -
|
| -
|
| class FunctionType : public DartType {
|
| public:
|
| static FunctionType* ReadFrom(Reader* reader);
|
| @@ -2964,8 +2899,6 @@ class Reference : public AllStatic {
|
|
|
| static CanonicalName* ReadClassFrom(Reader* reader, bool allow_null = false);
|
|
|
| - static CanonicalName* ReadTypedefFrom(Reader* reader);
|
| -
|
| static String* ReadStringFrom(Reader* reader);
|
| };
|
|
|
| @@ -3215,9 +3148,6 @@ class DartTypeVisitor {
|
| VisitDefaultDartType(node);
|
| }
|
| virtual void VisitVectorType(VectorType* node) { VisitDefaultDartType(node); }
|
| - virtual void VisitTypedefType(TypedefType* node) {
|
| - VisitDefaultDartType(node);
|
| - }
|
| };
|
|
|
|
|
| @@ -3257,7 +3187,6 @@ class TreeVisitor : public ExpressionVisitor,
|
| virtual void VisitCatch(Catch* node) { VisitDefaultTreeNode(node); }
|
| virtual void VisitMapEntry(MapEntry* node) { VisitDefaultTreeNode(node); }
|
| virtual void VisitProgram(Program* node) { VisitDefaultTreeNode(node); }
|
| - virtual void VisitTypedef(Typedef* node) { VisitDefaultTreeNode(node); }
|
| };
|
|
|
|
|
|
|