| Index: frogsh
|
| ===================================================================
|
| --- frogsh (revision 1140)
|
| +++ frogsh (working copy)
|
| @@ -1479,8 +1479,12 @@
|
| // ********** Code for PromiseImpl$T **************
|
| function PromiseImpl$T() {}
|
| $inherits(PromiseImpl$T, PromiseImpl);
|
| +// ********** Code for PromiseImpl$bool **************
|
| +function PromiseImpl$bool() {}
|
| +$inherits(PromiseImpl$bool, PromiseImpl);
|
| // ********** Code for ProxyBase **************
|
| function ProxyBase() {}
|
| +$inherits(ProxyBase, PromiseImpl$bool);
|
| ProxyBase.prototype.$eq = function(other) {
|
| return ((other instanceof ProxyBase)) && $eq(this._promise.get$value(), other._promise.get$value());
|
| }
|
| @@ -17675,7 +17679,7 @@
|
| return result;
|
| }
|
| // ********** Code for Options **************
|
| -function Options(homedir, args) {
|
| +function Options(homedir, args, files) {
|
| this.enableLeg = false
|
| this.enableAsserts = false
|
| this.enableTypeChecks = false
|
| @@ -17691,6 +17695,8 @@
|
| // Initializers done
|
| this.libDir = homedir + '/lib';
|
| var ignoreUnrecognizedFlags = false;
|
| + var passedLibDir = false;
|
| + this.childArgs = [];
|
| loop:
|
| for (var i = 2;
|
| i < args.length; i++) {
|
| @@ -17757,13 +17763,14 @@
|
| if (arg.endsWith('.dart')) {
|
| this.dartScript = arg;
|
| this.childArgs = args.getRange(i + 1, args.length - i - 1);
|
| - return;
|
| + break loop;
|
| }
|
| else if (arg.startsWith('--out=')) {
|
| this.outfile = arg.substring('--out='.length);
|
| }
|
| else if (arg.startsWith('--libdir=')) {
|
| this.libDir = arg.substring('--libdir='.length);
|
| + passedLibDir = true;
|
| }
|
| else {
|
| if (!ignoreUnrecognizedFlags) {
|
| @@ -17773,7 +17780,15 @@
|
|
|
| }
|
| }
|
| - this.childArgs = [];
|
| + if (!passedLibDir && !files.fileExists(this.libDir)) {
|
| + var temp = 'frog/lib';
|
| + if (files.fileExists(temp)) {
|
| + this.libDir = temp;
|
| + }
|
| + else {
|
| + this.libDir = 'lib';
|
| + }
|
| + }
|
| }
|
| // ********** Code for LibraryReader **************
|
| function LibraryReader() {
|
| @@ -18037,7 +18052,7 @@
|
| world.init();
|
| }
|
| function lang_compile(homedir, args, files) {
|
| - parseOptions(homedir, args);
|
| + parseOptions(homedir, args, files);
|
| initializeWorld(files);
|
| var success = world.compile();
|
| if (options.outfile != null) {
|
| @@ -18055,8 +18070,8 @@
|
| return success;
|
| }
|
| var options;
|
| -function parseOptions(homedir, args) {
|
| - options = new Options(homedir, args);
|
| +function parseOptions(homedir, args, files) {
|
| + options = new Options(homedir, args, files);
|
| }
|
| function _getCallStubName(name, args) {
|
| var nameBuilder = new StringBufferImpl(('' + name + '\$' + args.get$bareCount() + ''));
|
|
|