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

Unified Diff: runtime/vm/raw_object.h

Issue 8776020: Ongoing renaming of type classes: (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: '' Created 9 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/vm/parser.cc ('k') | runtime/vm/raw_object.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/raw_object.h
===================================================================
--- runtime/vm/raw_object.h (revision 1992)
+++ runtime/vm/raw_object.h (working copy)
@@ -18,11 +18,11 @@
V(Class) \
V(UnresolvedClass) \
V(AbstractType) \
- V(Type) \
+ V(Type) \
V(TypeParameter) \
V(InstantiatedType) \
- V(TypeArguments) \
- V(TypeArray) \
+ V(AbstractTypeArguments) \
+ V(TypeArguments) \
V(InstantiatedTypeArguments) \
V(Function) \
V(Field) \
@@ -227,7 +227,7 @@
RawScript* script_;
RawLibrary* library_;
RawArray* type_parameters_; // Array of String.
- RawTypeArray* type_parameter_extends_; // DynamicType if no extends clause.
+ RawTypeArguments* type_parameter_extends_; // DynamicType if no extends.
RawType* super_type_;
RawObject* factory_class_; // UnresolvedClass (until finalization) or Class.
RawFunction* signature_function_; // Associated function for signature class.
@@ -292,7 +292,7 @@
return reinterpret_cast<RawObject**>(&ptr()->type_class_);
}
RawObject* type_class_; // Either resolved class or unresolved class.
- RawTypeArguments* arguments_;
+ RawAbstractTypeArguments* arguments_;
RawObject** to() { return reinterpret_cast<RawObject**>(&ptr()->arguments_); }
int8_t type_state_;
};
@@ -317,21 +317,21 @@
return reinterpret_cast<RawObject**>(&ptr()->uninstantiated_type_);
}
RawAbstractType* uninstantiated_type_;
- RawTypeArguments* instantiator_type_arguments_;
+ RawAbstractTypeArguments* instantiator_type_arguments_;
RawObject** to() {
return reinterpret_cast<RawObject**>(&ptr()->instantiator_type_arguments_);
}
};
-class RawTypeArguments : public RawObject {
- RAW_HEAP_OBJECT_IMPLEMENTATION(TypeArguments);
+class RawAbstractTypeArguments : public RawObject {
+ RAW_HEAP_OBJECT_IMPLEMENTATION(AbstractTypeArguments);
};
-class RawTypeArray : public RawTypeArguments {
+class RawTypeArguments : public RawAbstractTypeArguments {
private:
- RAW_HEAP_OBJECT_IMPLEMENTATION(TypeArray);
+ RAW_HEAP_OBJECT_IMPLEMENTATION(TypeArguments);
RawObject** from() {
return reinterpret_cast<RawObject**>(&ptr()->length_);
@@ -346,7 +346,7 @@
};
-class RawInstantiatedTypeArguments : public RawTypeArguments {
+class RawInstantiatedTypeArguments : public RawAbstractTypeArguments {
private:
RAW_HEAP_OBJECT_IMPLEMENTATION(InstantiatedTypeArguments);
@@ -354,8 +354,8 @@
return reinterpret_cast<RawObject**>(
&ptr()->uninstantiated_type_arguments_);
}
- RawTypeArguments* uninstantiated_type_arguments_;
- RawTypeArguments* instantiator_type_arguments_;
+ RawAbstractTypeArguments* uninstantiated_type_arguments_;
+ RawAbstractTypeArguments* instantiator_type_arguments_;
RawObject** to() {
return reinterpret_cast<RawObject**>(&ptr()->instantiator_type_arguments_);
}
@@ -773,7 +773,7 @@
RawObject** from() {
return reinterpret_cast<RawObject**>(&ptr()->type_arguments_);
}
- RawTypeArguments* type_arguments_;
+ RawAbstractTypeArguments* type_arguments_;
RawSmi* length_;
// Variable length data follows here.
RawObject** data() {
@@ -809,7 +809,7 @@
RawObject** from() {
return reinterpret_cast<RawObject**>(&ptr()->type_arguments_);
}
- RawTypeArguments* type_arguments_;
+ RawAbstractTypeArguments* type_arguments_;
RawFunction* function_;
RawContext* context_;
// TODO(iposva): Remove this temporary hack.
« no previous file with comments | « runtime/vm/parser.cc ('k') | runtime/vm/raw_object.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698