Rename JS_CURRENT_ISOLATE to JS_CURRENT_ISOLATE_CONTEXT.

dart/sdk/lib/_internal/compiler/implementation/dart2js.dart

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library dart2js.cmdline;
 
 import 'dart:async';
 import 'dart:collection' show Queue, LinkedHashMap;
 import 'dart:io';
 import 'dart:utf';
@@ skipping 147 matching lines @@
       categories = allowedCategoriesList;
     } else {
       String allowedCategoriesString = allowedCategoriesList.join(', ');
       for (String category in categories) {
         if (!allowedCategories.contains(category)) {
           fail('Error: unsupported library category "$category", '
                'supported categories are: $allowedCategoriesString');
         }
       }
     }
-    return passThrough('--categories=${categories.join(",")}');
+    passThrough('--categories=${categories.join(",")}');
+  }
+
+  checkGlobalName(String argument) {
+    String globalName = extractParameter(argument);
+    if (!new RegExp(r'^\$[a-z]*$').hasMatch(globalName)) {
+      fail('Error: "$globalName" must match "\\\$[a-z]*"');

[ngeoffray, 2013/05/28 20:01:54]

Why? We could reserve the name in the namer.

[ahe, 2013/05/30 09:13:31]

That wouldn't handle calling it "init", for example.  I'd rather keep this
limitation until I have removed all other global names introduced by dart2js
output.

+    }
+    passThrough(argument);
   }
 
   handleShortOptions(String argument) {
     var shortOptions = argument.substring(1).split("");
     for (var shortOption in shortOptions) {
       switch (shortOption) {
         case 'v':
           setVerbose(null);
           break;
         case 'h':
@@ skipping 38 matching lines @@
     new OptionHandler('--package-root=.+|-p.+', setPackageRoot),
     new OptionHandler('--disallow-unsafe-eval', passThrough),
     new OptionHandler('--analyze-all', passThrough),
     new OptionHandler('--analyze-only', setAnalyzeOnly),
     new OptionHandler('--analyze-signatures-only', passThrough),
     new OptionHandler('--disable-native-live-type-analysis', passThrough),
     new OptionHandler('--reject-deprecated-language-features', passThrough),
     new OptionHandler('--report-sdk-use-of-deprecated-language-features',
                       passThrough),
     new OptionHandler('--categories=.*', setCategories),
+    new OptionHandler('--global-js-name=.*', checkGlobalName),
 
     // The following two options must come last.
     new OptionHandler('-.*', (String argument) {
       helpAndFail('Error: Unknown option "$argument".');
     }),
     new OptionHandler('.*', (String argument) {
       arguments.add(nativeToUriPath(argument));
     })
   ];
 
@@ skipping 151 matching lines @@
 
 Compiles Dart to JavaScript.
 
 Common options:
   -o<file> Generate the output into <file>.
   -c       Insert runtime type checks and enable assertions (checked mode).
   -h       Display this message (add -v for information about all options).''');
 }
 
 void verboseHelp() {
-  print('''
+  print(r'''
 Usage: dart2js [options] dartfile
 
 Compiles Dart to JavaScript.
 
 Supported options:
   -o<file>, --out=<file>
     Generate the output into <file>.
 
   -c, --enable-checked-mode, --checked
     Insert runtime type checks and enable assertions (checked mode).
@@ skipping 68 matching lines @@
     deprecated language features from these libraries.  The option
     --reject-deprecated-language-features controls if these usages are
     reported as errors or warnings.
 
   --categories=<categories>
     A comma separated list of allowed library categories.  The default
     is "Client".  Possible categories can be seen by providing an
     unsupported category, for example, --categories=help.  To enable
     all categories, use --categories=all.
 
+  --global-js-name=<name>
+    By default, dart2js generates JavaScript output that uses a global
+    variable named "$".  The name of this global can be overridden
+    with this option.  The name must match the regular expression "\$[a-z]*".
+
 '''.trim());
 }
 
 void helpAndExit(bool verbose) {
   if (verbose) {
     verboseHelp();
   } else {
     help();
   }
   exit(0);
@@ skipping 18 matching lines @@
       print(trace);
     } finally {
       exit(253); // 253 is recognized as a crash by our test scripts.
     }
   }
 }
 
 void main() {
   mainWithErrorHandler(new Options());
 }