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

Side by Side Diff: runtime/vm/bootstrap.cc

Issue 12321082: - Properly load the core libraries as libraries and not as 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
2 // for details. All rights reserved. Use of this source code is governed by a 2 // for details. All rights reserved. Use of this source code is governed by a
3 // BSD-style license that can be found in the LICENSE file. 3 // BSD-style license that can be found in the LICENSE file.
4 4
5 #include "vm/bootstrap.h" 5 #include "vm/bootstrap.h"
6 6
7 #include "include/dart_api.h" 7 #include "include/dart_api.h"
8 8
9 #include "vm/bootstrap_natives.h" 9 #include "vm/bootstrap_natives.h"
10 #include "vm/compiler.h" 10 #include "vm/compiler.h"
11 #include "vm/dart_api_impl.h" 11 #include "vm/dart_api_impl.h"
12 #include "vm/object.h" 12 #include "vm/object.h"
13 #include "vm/object_store.h" 13 #include "vm/object_store.h"
14 14
15 namespace dart { 15 namespace dart {
16 16
17 DEFINE_FLAG(bool, print_bootstrap, false, "Print the bootstrap source."); 17 DEFINE_FLAG(bool, print_bootstrap, false, "Print the bootstrap source.");
18 18
19 19
20 RawScript* Bootstrap::LoadScript(const char* url, 20 RawScript* Bootstrap::LoadScript(const char* url,
21 const char* source, 21 const char* source,
22 bool patch) { 22 bool patch) {
23 return Script::New(String::Handle(String::New(url, Heap::kOld)), 23 return Script::New(String::Handle(String::New(url, Heap::kOld)),
24 String::Handle(String::New(source, Heap::kOld)), 24 String::Handle(String::New(source, Heap::kOld)),
25 patch ? RawScript::kPatchTag : RawScript::kSourceTag); 25 patch ? RawScript::kPatchTag : RawScript::kLibraryTag);
26 } 26 }
27 27
28 28
29 RawScript* Bootstrap::LoadASyncScript(bool patch) { 29 RawScript* Bootstrap::LoadAsyncScript(bool patch) {
30 const char* url = patch ? "dart:async-patch" : "dart:async"; 30 const char* url = patch ? "dart:async-patch" : "dart:async";
31 const char* source = patch ? async_patch_ : async_source_; 31 const char* source = patch ? async_patch_ : async_source_;
32 return LoadScript(url, source, patch); 32 return LoadScript(url, source, patch);
33 } 33 }
34 34
35 35
36 RawScript* Bootstrap::LoadCoreScript(bool patch) { 36 RawScript* Bootstrap::LoadCoreScript(bool patch) {
37 // TODO(iposva): Use proper library name. 37 // TODO(iposva): Use proper library name.
38 const char* url = patch ? "dart:core-patch" : "bootstrap"; 38 const char* url = patch ? "dart:core-patch" : "bootstrap";
39 const char* source = patch ? corelib_patch_ : corelib_source_; 39 const char* source = patch ? corelib_patch_ : corelib_source_;
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 const Error& error = Error::Handle(Compiler::Compile(library, script)); 122 const Error& error = Error::Handle(Compiler::Compile(library, script));
123 if (error.IsNull()) { 123 if (error.IsNull()) {
124 library.SetLoaded(); 124 library.SetLoaded();
125 } else { 125 } else {
126 library.SetLoadError(); 126 library.SetLoadError();
127 } 127 }
128 return error.raw(); 128 return error.raw();
129 } 129 }
130 130
131 } // namespace dart 131 } // namespace dart
OLDNEW
« no previous file with comments | « runtime/vm/bootstrap.h ('k') | runtime/vm/bootstrap_natives.cc » ('j') | runtime/vm/object.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698