Add dart_core.js (fixes #89)

[email protected] Review URL: https://codereview.chromium.org/986023003
dart-lang · Mar 11, 2015 · a6befe3 · a6befe3
1 parent 6d9564b
commit a6befe3
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 1 deletion.
diff --git a/pkg/dev_compiler/lib/src/dependency_graph.dart b/pkg/dev_compiler/lib/src/dependency_graph.dart
@@ -134,7 +134,7 @@ class HtmlSourceNode extends SourceNode {
 
   HtmlSourceNode(uri, source, graph) : super(uri, source) {
     var prefix = 'package:dev_compiler/runtime';
-    var files = ['harmony_feature_check.js', 'dart_runtime.js'];
+    var files = ['harmony_feature_check.js', 'dart_runtime.js', 'dart_core.js'];
     if (graph._options.serverMode) {
       files.addAll(const ['messages_widget.js', 'messages.css']);
     }

diff --git a/pkg/dev_compiler/test/codegen/expect/html_input.html b/pkg/dev_compiler/test/codegen/expect/html_input.html
@@ -1,6 +1,7 @@
 <html><head></head><body>
 <script src="dev_compiler/runtime/harmony_feature_check.js"></script>
 <script src="dev_compiler/runtime/dart_runtime.js"></script>
+<script src="dev_compiler/runtime/dart_core.js"></script>
 <script>
   /* placehorder for unimplemented code libraries */
   var math = Math;

diff --git a/pkg/dev_compiler/test/codegen/expect/server_mode/html_input.html b/pkg/dev_compiler/test/codegen/expect/server_mode/html_input.html
@@ -1,6 +1,7 @@
 <html><head></head><body>
 <script src="cached/c947f9f732203b97dd2882e63da78dbe/dev_compiler/runtime/harmony_feature_check.js"></script>
 <script src="cached/e0c88ce05fb3615397b4fd408c68cf8a/dev_compiler/runtime/dart_runtime.js"></script>
+<script src="cached/cd344ed9303198405463664eacd77748/dev_compiler/runtime/dart_core.js"></script>
 <script src="cached/fa4d5796ad409e1bbdbd3c64354488c4/dev_compiler/runtime/messages_widget.js"></script>
 <link rel="stylesheet" href="cached/307a7ef1e0cd0544d55c6f768f5e3886/dev_compiler/runtime/messages.css">
 <script>

diff --git a/pkg/dev_compiler/test/dependency_graph_test.dart b/pkg/dev_compiler/test/dependency_graph_test.dart
@@ -555,6 +555,7 @@ main() {
           index3.html
           |-- harmony_feature_check.js
           |-- dart_runtime.js
+          |-- dart_core.js
           ''');
       refreshStructureAndMarks(node, graph);
       expectGraph(node, '''
@@ -567,6 +568,7 @@ main() {
           |    |-- a6.dart (part) [needs-rebuild]
           |-- harmony_feature_check.js [needs-rebuild]
           |-- dart_runtime.js [needs-rebuild]
+          |-- dart_core.js [needs-rebuild]
           ''');
     });
 
@@ -583,6 +585,7 @@ main() {
           |    |-- a6.dart (part) [needs-rebuild]
           |-- harmony_feature_check.js [needs-rebuild]
           |-- dart_runtime.js [needs-rebuild]
+          |-- dart_core.js [needs-rebuild]
           ''');
       clearMarks(node);
       expectGraph(node, '''
@@ -595,6 +598,7 @@ main() {
           |    |-- a6.dart (part)
           |-- harmony_feature_check.js
           |-- dart_runtime.js
+          |-- dart_core.js
           ''');
 
       refreshStructureAndMarks(node, graph);
@@ -608,6 +612,7 @@ main() {
           |    |-- a6.dart (part)
           |-- harmony_feature_check.js
           |-- dart_runtime.js
+          |-- dart_core.js
           ''');
     });
 
@@ -629,6 +634,7 @@ main() {
           |    |-- a6.dart (part)
           |-- harmony_feature_check.js
           |-- dart_runtime.js
+          |-- dart_core.js
           ''');
     });
 
@@ -653,6 +659,7 @@ main() {
           |    |-- a6.dart (part)
           |-- harmony_feature_check.js
           |-- dart_runtime.js
+          |-- dart_core.js
           ''');
     });
   });
@@ -671,6 +678,7 @@ main() {
           index3.html
           |-- harmony_feature_check.js
           |-- dart_runtime.js
+          |-- dart_core.js
           |-- messages_widget.js
           |-- messages.css
           ''');
@@ -685,6 +693,7 @@ main() {
           |    |-- a6.dart (part) [needs-rebuild]
           |-- harmony_feature_check.js [needs-rebuild]
           |-- dart_runtime.js [needs-rebuild]
+          |-- dart_core.js [needs-rebuild]
           |-- messages_widget.js [needs-rebuild]
           |-- messages.css [needs-rebuild]
           ''');
@@ -721,6 +730,7 @@ main() {
         'a2.dart',
         'harmony_feature_check.js',
         'dart_runtime.js',
+        'dart_core.js',
         'index3.html',
       ]);
 
@@ -735,6 +745,7 @@ main() {
           |    |-- a6.dart (part)
           |-- harmony_feature_check.js
           |-- dart_runtime.js
+          |-- dart_core.js
           ''');
     });
 
@@ -887,6 +898,7 @@ main() {
             |    |-- a6.dart (part)
             |-- harmony_feature_check.js
             |-- dart_runtime.js
+            |-- dart_core.js
             ''');
 
         // Modify the file first:
@@ -909,6 +921,7 @@ main() {
             |    |-- a6.dart (part)
             |-- harmony_feature_check.js
             |-- dart_runtime.js
+            |-- dart_core.js
             ''');
 
         a2.source.contents.modificationTime++;
@@ -941,6 +954,7 @@ main() {
             |    |-- a5.dart...
             |-- harmony_feature_check.js
             |-- dart_runtime.js
+            |-- dart_core.js
             ''');
       });
 
@@ -960,6 +974,7 @@ main() {
             |    |-- a6.dart (part)
             |-- harmony_feature_check.js
             |-- dart_runtime.js
+            |-- dart_core.js
             ''');
 
         a2.source.contents.modificationTime++;
@@ -983,6 +998,7 @@ main() {
             |    |-- a5.dart
             |-- harmony_feature_check.js
             |-- dart_runtime.js
+            |-- dart_core.js
             ''');
 
         a6.source.contents.modificationTime++;
@@ -1001,6 +1017,7 @@ main() {
             |    |-- a5.dart...
             |-- harmony_feature_check.js
             |-- dart_runtime.js
+            |-- dart_core.js
             ''');
       });
 
@@ -1020,6 +1037,7 @@ main() {
             |    |-- a6.dart (part)
             |-- harmony_feature_check.js
             |-- dart_runtime.js
+            |-- dart_core.js
             ''');
 
         a2.source.contents.modificationTime++;
@@ -1044,6 +1062,7 @@ main() {
             |    |-- a5.dart
             |-- harmony_feature_check.js
             |-- dart_runtime.js
+            |-- dart_core.js
             ''');
       });
 
@@ -1063,6 +1082,7 @@ main() {
             |    |-- a6.dart (part)
             |-- harmony_feature_check.js
             |-- dart_runtime.js
+            |-- dart_core.js
             ''');
 
         a2.source.contents.modificationTime++;
@@ -1086,6 +1106,7 @@ main() {
             |    |-- a6.dart (part)
             |-- harmony_feature_check.js
             |-- dart_runtime.js
+            |-- dart_core.js
             ''');
 
         a5.source.contents.modificationTime++;
@@ -1103,6 +1124,7 @@ main() {
             |    |-- a6.dart (part)
             |-- harmony_feature_check.js
             |-- dart_runtime.js
+            |-- dart_core.js
             ''');
       });
     });

diff --git a/pkg/dev_compiler/test/test.sh b/pkg/dev_compiler/test/test.sh
@@ -12,6 +12,7 @@ function fail {
 #    duplicated in the expected folder.
 DIFF_ARGS="-u -r -N --exclude=\*.map \
   --exclude=dart_runtime.js \
+  --exclude=dart_core.js \
   --exclude=harmony_feature_check.js \
   --exclude=messages_widget.js \
   --exclude=messages.css \