Fixing parsing of factories.

frog/minfrog

 #!/usr/bin/env node
 //  ********** Library dart:core **************
 //  ********** Natives dart:core **************
 /**
  * Generates a dynamic call stub for a function.
  * Our goal is to create a stub method like this on-the-fly:
  *   function($0, $1, capture) { return this($0, $1, true, capture); }
  *
  * This stub then replaces the dynamic one on Function, with one that is
  * specialized for that particular function, taking into account its default
@@ skipping 8110 matching lines @@
   if (this._maybeEat(77/*TokenKind.IMPLEMENTS*/)) {
     _implements = this.typeList();
   }
   var _native = null;
   if (this._maybeEat(81/*TokenKind.NATIVE*/)) {
     _native = this.maybeStringLiteral();
     if (_native != null) _native = new NativeType(_native);
   }
   var _factory = null;
   if (this._maybeEat(75/*TokenKind.FACTORY*/)) {
-    _factory = this.type(0);
+    _factory = this.nameTypeReference();
+    if (this._peekKind(52/*TokenKind.LT*/)) {
+      this.typeParameters();
+    }
   }
   var body = [];
   if (this._maybeEat(6/*TokenKind.LBRACE*/)) {
     while (!this._maybeEat(7/*TokenKind.RBRACE*/)) {
       if (this.isPrematureEndOfFile()) break;
       body.add$1(this.declaration(true));
     }
   }
   else {
     this._errorExpected('block starting with "{" or ";"');
@@ skipping 1196 matching lines @@
   return new GenericTypeReference(baseType, types, depth, span);
 }
 Parser.prototype.typeList = function() {
   var types = [];
   do {
     types.add$1(this.type(0));
   }
   while (this._maybeEat(11/*TokenKind.COMMA*/))
   return types;
 }
-Parser.prototype.type = function(depth) {
+Parser.prototype.nameTypeReference = function() {
   var start = this._peekToken.start;
   var name;
   var names = null;
   var typeArgs = null;
   var isFinal = false;
   switch (this._peek()) {
     case 114/*TokenKind.VOID*/:
 
       return new TypeReference(this._next().get$span(), $globals.world.voidType);
 
@@ skipping 11 matching lines @@
     default:
 
       name = this.identifier();
       break;
 
   }
   while (this._maybeEat(14/*TokenKind.DOT*/)) {
     if (names == null) names = [];
     names.add$1(this.identifier());
   }
-  var typeRef = new NameTypeReference(isFinal, name, names, this._makeSpan(start));
+  return new NameTypeReference(isFinal, name, names, this._makeSpan(start));
+}
+Parser.prototype.type = function(depth) {
+  var typeRef = this.nameTypeReference();
   if (this._peekKind(52/*TokenKind.LT*/)) {
     return this.addTypeArguments(typeRef, depth);
   }
   else {
     return typeRef;
   }
 }
 Parser.prototype.get$type = function() {
   return Parser.prototype.type.bind(this);
 }
@@ skipping 3046 matching lines @@
 World.prototype.withTiming = function(name, f) {
   var sw = new StopwatchImplementation();
   sw.start();
   var result = f();
   sw.stop();
   this.info(('' + name + ' in ' + sw.elapsedInMs() + 'msec'));
   return result;
 }
 // ********** Code for FrogOptions **************
 function FrogOptions(homedir, args, files) {
+  this.config = 'dev'
   this.enableLeg = false
   this.legOnly = false
   this.enableAsserts = false
   this.enableTypeChecks = false
   this.warningsAsErrors = false
   this.verifyImplements = false
   this.compileAll = false
   this.forceDynamic = false
   this.dietParse = false
   this.compileOnly = false
   this.throwOnErrors = false
   this.throwOnWarnings = false
   this.throwOnFatal = false
   this.showInfo = false
   this.showWarnings = true
   // Initializers done
-  this.libDir = homedir + '/lib';
+  if ($eq(this.config, 'dev')) {
+    this.libDir = joinPaths(homedir, '/lib');
+  }
+  else if ($eq(this.config, 'sdk')) {
+    this.libDir = joinPaths(homedir, '/../lib');
+  }
+  else {
+    $globals.world.error(('Invalid configuration ' + this.config));
+    $throw(('Invalid configuration'));
+  }
   var ignoreUnrecognizedFlags = false;
   var passedLibDir = false;
   this.childArgs = [];
   loop:
   for (var i = 2;
    i < args.length; i++) {
     var arg = args.$index(i);
     switch (arg) {
       case '--enable_leg':
 
@@ skipping 87 matching lines @@
           passedLibDir = true;
         }
         else {
           if (!ignoreUnrecognizedFlags) {
             print(('unrecognized flag: "' + arg + '"'));
           }
         }
 
     }
   }
-  if (!passedLibDir && !files.fileExists(this.libDir)) {
+  if (!passedLibDir && $eq(this.config, 'dev') && !files.fileExists(this.libDir)) {
     var temp = 'frog/lib';
     if (files.fileExists(temp)) {
       this.libDir = temp;
     }
     else {
       this.libDir = 'lib';
     }
   }
 }
 // ********** Code for LibraryReader **************
 function LibraryReader() {
   // Initializers done
-  this._specialLibs = _map(['dart:core', joinPaths($globals.options.libDir, 'corelib.dart'), 'dart:coreimpl', joinPaths($globals.options.libDir, 'corelib_impl.dart'), 'dart:html', joinPaths($globals.options.libDir, '../../client/html/release/html.dart'), 'dart:htmlimpl', joinPaths($globals.options.libDir, '../../client/html/release/htmlimpl.dart'), 'dart:dom', joinPaths($globals.options.libDir, '../../client/dom/frog/frog_dom.dart'), 'dart:json', joinPaths($globals.options.libDir, 'json.dart')]);
+  if ($eq($globals.options.config, 'dev')) {
+    this._specialLibs = _map(['dart:core', joinPaths($globals.options.libDir, 'corelib.dart'), 'dart:coreimpl', joinPaths($globals.options.libDir, 'corelib_impl.dart'), 'dart:html', joinPaths($globals.options.libDir, '../../client/html/release/html.dart'), 'dart:htmlimpl', joinPaths($globals.options.libDir, '../../client/html/release/htmlimpl.dart'), 'dart:dom', joinPaths($globals.options.libDir, '../../client/dom/frog/frog_dom.dart'), 'dart:json', joinPaths($globals.options.libDir, 'json.dart')]);
+  }
+  else if ($eq($globals.options.config, 'sdk')) {
+    this._specialLibs = _map(['dart:core', joinPaths($globals.options.libDir, 'core/core_frog.dart'), 'dart:coreimpl', joinPaths($globals.options.libDir, 'coreimpl/coreimpl_frog.dart'), 'dart:html', joinPaths($globals.options.libDir, 'html/html.dart'), 'dart:htmlimpl', joinPaths($globals.options.libDir, 'htmlimpl/htmlimpl.dart'), 'dart:dom', joinPaths($globals.options.libDir, 'dom/frog/frog_dom.dart'), 'dart:json', joinPaths($globals.options.libDir, 'coreimpl/frog/json.dart')]);
+  }
+  else {
+    $globals.world.error(('Invalid configuration ' + $globals.options.config));
+  }
 }
 LibraryReader.prototype.readFile = function(fullname) {
   var filename = this._specialLibs.$index(fullname);
   if (filename == null) {
     filename = fullname;
   }
   if ($globals.world.files.fileExists(filename)) {
     return new SourceFile(filename, $globals.world.files.readAll(filename));
   }
   else {
@@ skipping 319 matching lines @@
 $inheritsMembers(_DoubleLinkedQueueEntrySentinel_KeyValuePair_K$V, DoubleLinkedQueueEntry_KeyValuePair_K$V);
 //  ********** Globals **************
 function $static_init(){
 }
 var const$0 = new NoMoreElementsException()/*const NoMoreElementsException()*/;
 var const$2 = new EmptyQueueException()/*const EmptyQueueException()*/;
 var const$3 = new _DeletedKeySentinel()/*const _DeletedKeySentinel()*/;
 var $globals = {};
 $static_init();
 main();