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

Unified Diff: frog/value.dart

Issue 8585044: Fixes issues in string interpolation tests (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: remove debugging code 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
Index: frog/value.dart
diff --git a/frog/value.dart b/frog/value.dart
index 5bd7095492d443b7df11f4d27592c2afc73ad65d..7205f78b1ce72a8409f7a1c9807ccbf935e9d4e4 100644
--- a/frog/value.dart
+++ b/frog/value.dart
@@ -134,7 +134,8 @@ class Value {
var m = type.getMember('noSuchMethod');
return m != null && !m.declaringType.isObject;
} else {
- return type.resolveMember('noSuchMethod').members.length > 1;
+ var m = type.resolveMember('noSuchMethod');
jimhug 2011/11/18 17:05:29 Funny, I have this same change sitting in my curre
+ return m != null && m.members.length > 1;
}
}
@@ -684,19 +685,23 @@ class BareValue extends Value {
isType = outermost.isStatic;
}
+ // TODO(jimhug): Lazy initialization here is weird!
+ _ensureCode() {
+ if (code != null) return;
+ if (isType) {
+ code = type.jsname;
+ } else {
+ code = home._makeThisCode();
+ }
+ }
+
_tryResolveMember(MethodGenerator context, String name) {
assert(context == home);
// First look for members directly defined on my type.
var member = type.resolveMember(name);
if (member != null) {
- assert(code == null);
- // TODO(jimhug): Lazy initialization here is weird!
- if (isType) {
- code = type.jsname;
- } else {
- code = home._makeThisCode();
- }
+ _ensureCode();
return member;
}
@@ -706,6 +711,7 @@ class BareValue extends Value {
return member;
}
+ _ensureCode();
return null;
}
}
« frog/tokenizer.g.dart ('K') | « frog/tokenizer.g.dart ('k') | tests/co19/co19-frog.status » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698