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

Unified Diff: runtime/vm/parser.cc

Issue 12317150: Less confusing names for mixing application classes (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 7 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/parser.cc
===================================================================
--- runtime/vm/parser.cc (revision 19097)
+++ runtime/vm/parser.cc (working copy)
@@ -3852,7 +3852,7 @@
// TODO(hausner): Remove this restriction.
if (super_type.arguments() != AbstractTypeArguments::null()) {
ErrorMsg(super_type.token_pos(),
- "super class of mixin may not have type arguments");
+ "super class in mixin application may not have type arguments");
}
AbstractType& mixin_type = AbstractType::Handle();
@@ -3875,10 +3875,10 @@
// The name of the mixin application class is a combination of
// the superclass and mixin class.
String& mixin_app_name = String::Handle();
- mixin_app_name = mixin_super_type.Name();
+ mixin_app_name = mixin_super_type.ClassName();
mixin_app_name = String::Concat(mixin_app_name, Symbols::Ampersand());
mixin_app_name = String::Concat(mixin_app_name,
- String::Handle(mixin_type.Name()));
+ String::Handle(mixin_type.ClassName()));
mixin_app_name = Symbols::New(mixin_app_name);
mixin_application = Class::New(mixin_app_name, script_, mixin_pos);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698