| Index: runtime/vm/object.h
|
| ===================================================================
|
| --- runtime/vm/object.h (revision 774)
|
| +++ runtime/vm/object.h (working copy)
|
| @@ -118,7 +118,7 @@
|
| kSentinelObject,
|
| kClassClass,
|
| kNullClass,
|
| - kVarClass,
|
| + kDynamicClass,
|
| kVoidClass,
|
| kUnresolvedClassClass,
|
| kParameterizedTypeClass,
|
| @@ -210,7 +210,7 @@
|
|
|
| static RawClass* class_class() { return class_class_; }
|
| static RawClass* null_class() { return null_class_; }
|
| - static RawClass* var_class() { return var_class_; }
|
| + static RawClass* dynamic_class() { return dynamic_class_; }
|
| static RawClass* void_class() { return void_class_; }
|
| static RawClass* unresolved_class_class() { return unresolved_class_class_; }
|
| static RawClass* parameterized_type_class() {
|
| @@ -311,7 +311,7 @@
|
|
|
| static RawClass* class_class_; // Class of the Class vm object.
|
| static RawClass* null_class_; // Class of the null object.
|
| - static RawClass* var_class_; // Class of the 'var' type.
|
| + static RawClass* dynamic_class_; // Class of the 'Dynamic' type.
|
| static RawClass* void_class_; // Class of the 'void' type.
|
| static RawClass* unresolved_class_class_; // Class of UnresolvedClass.
|
| static RawClass* parameterized_type_class_; // Class of ParameterizedType.
|
| @@ -467,8 +467,8 @@
|
| // Check if this class represents the class of null.
|
| bool IsNullClass() const { return raw() == Object::null_class(); }
|
|
|
| - // Check if this class represents the 'var' class.
|
| - bool IsVarClass() const { return raw() == Object::var_class(); }
|
| + // Check if this class represents the 'Dynamic' class.
|
| + bool IsDynamicClass() const { return raw() == Object::dynamic_class(); }
|
|
|
| // Check if this class represents the 'void' class.
|
| bool IsVoidClass() const { return raw() == Object::void_class(); }
|
| @@ -699,9 +699,9 @@
|
| return HasResolvedTypeClass() && (type_class() == Object::null_class());
|
| }
|
|
|
| - // Check if this type represents the 'var' type.
|
| - bool IsVarType() const {
|
| - return HasResolvedTypeClass() && (type_class() == Object::var_class());
|
| + // Check if this type represents the 'Dynamic' type.
|
| + bool IsDynamicType() const {
|
| + return HasResolvedTypeClass() && (type_class() == Object::dynamic_class());
|
| }
|
|
|
| // Check if this type represents the 'void' type.
|
| @@ -752,8 +752,8 @@
|
| // The type of the literal 'null'.
|
| static RawType* NullType();
|
|
|
| - // The 'var' type.
|
| - static RawType* VarType();
|
| + // The 'Dynamic' type.
|
| + static RawType* DynamicType();
|
|
|
| // The 'void' type.
|
| static RawType* VoidType();
|
|
|