frog: generalize checking that type args aren't used in static methods

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 3708 matching lines @@
     var names = ListFactory.ListFactory$from$factory(typeRef.get$names());
     constructorName = names.removeLast$0().get$name();
     if ($eq(names.length, 0)) names = null;
     typeRef = new NameTypeReference(typeRef.get$isFinal(), typeRef.get$name(), names, typeRef.get$span());
   }
   var type = this.method.resolveType(typeRef, true);
   if (type.get$isTop()) {
     type = type.get$library().findTypeByName$1(constructorName);
     constructorName = '';
   }
-  if (this.method.get$isStatic() && ((this.method.get$typeParameters() == null && type.get$hasTypeParams()) || (type instanceof ParameterType))) {
-    $globals.world.error('using type parameter in static context', node.span);
-    return this._makeMissingValue(constructorName);
-  }
-  else if ((type instanceof ParameterType)) {
+  if ((type instanceof ParameterType)) {
     $globals.world.error('cannot instantiate a type parameter', node.span);
     return this._makeMissingValue(constructorName);
   }
   var m = type.getConstructor$1(constructorName);
   if (m == null) {
     var name = type.get$jsname();
     if (type.get$isVar()) {
       name = typeRef.get$name().get$name();
     }
     $globals.world.error(('no matching constructor for ' + name), node.span);
@@ skipping 754 matching lines @@
 Parameter.prototype.set$isInitializer = function(value) { return this.isInitializer = value; };
 Parameter.prototype.get$value = function() { return this.value; };
 Parameter.prototype.set$value = function(value) { return this.value = value; };
 Parameter.prototype.resolve = function() {
   this.name = this.definition.name.name;
   if (this.name.startsWith('this.')) {
     this.name = this.name.substring(5);
     this.isInitializer = true;
   }
   this.type = this.method.resolveType(this.definition.type, false);
-  if (this.method.get$isStatic() && this.method.get$typeParameters() == null && this.type.get$hasTypeParams()) {
-    $globals.world.error('using type parameter in static context', this.definition.span);
-  }
   if (this.definition.value != null) {
     if ((this.definition.value instanceof NullExpression) && this.definition.value.span.start == this.definition.span.start) {
       return;
     }
     if (this.method.name == ':call') {
       if (this.method.get$definition().get$body() == null) {
         $globals.world.error('default value not allowed on function type', this.definition.span);
       }
     }
     else if (this.method.get$isAbstract()) {
@@ skipping 1340 matching lines @@
   for (var $$i = 0;$$i < $$list.length; $$i++) {
     var formal = $$list.$index($$i);
     var param = new Parameter(formal, this);
     param.resolve$0();
     this.parameters.add(param);
   }
   if (!this.isLambda) {
     this.get$library()._addMember(this);
   }
 }
+MethodMember.prototype.resolveType = function(node, typeErrors) {
+  var t = Element.prototype.resolveType.call(this, node, typeErrors);
+  if (this.isStatic && (t instanceof ParameterType) && (this.typeParameters == null || !this.typeParameters.some((function (p) {
+    return p === t;
+  })
+  ))) {
+    $globals.world.error('using type parameter in static context.', node.span);
+  }
+  return t;
+}
 MethodMember.prototype._get$3 = function($0, $1, $2) {
   return this._get($0, $1, $2, false);
 };
 MethodMember.prototype._get$3$isDynamic = MethodMember.prototype._get;
 MethodMember.prototype._get$4 = MethodMember.prototype._get;
 MethodMember.prototype._set$4 = function($0, $1, $2, $3) {
   return this._set($0, $1, $2, $3, false);
 };
 MethodMember.prototype._set$4$isDynamic = MethodMember.prototype._set;
 MethodMember.prototype._set$5 = MethodMember.prototype._set;
@@ skipping 7244 matching lines @@
   $globals._MAGENTA_COLOR = '\u001b[35m';
   $globals._NO_COLOR = '\u001b[0m';
   $globals._RED_COLOR = '\u001b[31m';
 }
 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();