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

Unified Diff: runtime/vm/object.cc

Issue 12827007: Support initialized mixin fields across scripts (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 7 years, 9 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 | « runtime/vm/object.h ('k') | runtime/vm/parser.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/object.cc
===================================================================
--- runtime/vm/object.cc (revision 20386)
+++ runtime/vm/object.cc (working copy)
@@ -5349,7 +5349,7 @@
TokenStream::Iterator::Iterator(const TokenStream& tokens, intptr_t token_pos)
- : tokens_(tokens),
+ : tokens_(TokenStream::Handle(tokens.raw())),
data_(ExternalUint8Array::Handle(tokens.GetStream())),
stream_(data_.ByteAddr(0), data_.Length()),
token_objects_(Array::Handle(tokens.TokenObjects())),
@@ -5361,6 +5361,20 @@
}
+void TokenStream::Iterator::SetStream(const TokenStream& tokens,
+ intptr_t token_pos) {
+ tokens_ = tokens.raw();
+ data_ = tokens.GetStream();
+ stream_.SetStream(data_.ByteAddr(0), data_.Length());
+ token_objects_ = tokens.TokenObjects();
+ obj_ = Object::null();
+ cur_token_pos_ = token_pos;
+ cur_token_kind_ = Token::kILLEGAL;
+ cur_token_obj_index_ = -1;
+ SetCurrentPosition(token_pos);
+}
+
+
bool TokenStream::Iterator::IsValid() const {
return !tokens_.IsNull();
}
« no previous file with comments | « runtime/vm/object.h ('k') | runtime/vm/parser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698