[NEW TYPE INFERENCE] Warn for anonymous nominal types.

Also fix some ported tests that use @typedef.
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=66314920

Author: blickly

src/com/google/javascript/jscomp/GlobalTypeInfo.java

@@ -149,7 +149,13 @@ class GlobalTypeInfo implements CompilerPass {
       "A typedef variable represents a type name; " +
       "it cannot be assigned a value.");
 
+  static final DiagnosticType ANONYMOUS_NOMINAL_TYPE =
+      DiagnosticType.warning(
+          "JSC_ANONYMOUS_NOMINAL_TYPE",
+          "Must specify a name when defining a class or interface.");
+
   static final DiagnosticGroup ALL_DIAGNOSTICS = new DiagnosticGroup(
+      ANONYMOUS_NOMINAL_TYPE,
       CANNOT_INIT_TYPEDEF,
       CANNOT_OVERRIDE_FINAL_METHOD,
       CONSTRUCTOR_REQUIRED,
@@ -227,11 +233,8 @@ String getFunInternalName(Node n) {
     Preconditions.checkArgument(n.isFunction());
     Node fnNameNode = NodeUtil.getFunctionNameNode(n);
     // We don't want to use qualified names here
-    if (fnNameNode.isName()) {
-      String s = fnNameNode.getString();
-      if (s != null && !s.isEmpty()) {
-        return s;
-      }
+    if (fnNameNode != null && fnNameNode.isName()) {
+      return fnNameNode.getString();
     }
     return anonFunNames.get(n);
   }
@@ -547,6 +550,10 @@ private void initFnScope(Node fn, Scope parentScope) {
       }
       JSDocInfo fnDoc = NodeUtil.getFunctionJSDocInfo(fn);
       if (fnDoc != null && (fnDoc.isConstructor() || fnDoc.isInterface())) {
+        if (qname == null) {
+          warnings.add(JSError.make(fn, ANONYMOUS_NOMINAL_TYPE));
+          return;
+        }
         ImmutableList<String> typeParameters = fnDoc.getTemplateTypeNames();
         RawNominalType rawNominalType;
         if (fnDoc.isInterface()) {
@@ -1232,7 +1239,12 @@ private DeclaredFunctionType computeFnDeclaredType(
         ImmutableSet<NominalType> implementedIntfs =
             typeParser.getImplementedInterfaces(
                 fnDoc, ownerType, parentScope, typeParameters);
-        if (fnDoc.isConstructor()) {
+
+        if (ctorType == null &&
+            (fnDoc.isConstructor() || fnDoc.isInterface())) {
+          // Anonymous type, don't register it.
+          return builder.buildDeclaration();
+        } else if (fnDoc.isConstructor()) {
           String className = ctorType.toString();
           if (parentClass != null) {
             if (!ctorType.addSuperClass(parentClass)) {

src/com/google/javascript/jscomp/NewTypeInference.java

@@ -57,8 +57,6 @@
  *
  * Features left to implement:
  * - @enum
- * - @typedef
- * - @define
  * - @lends
  * - @private (maybe)
  * - @protected (maybe)
@@ -160,6 +158,11 @@ public class NewTypeInference implements CompilerPass {
           "JSC_CONST_REASSIGNED",
           "Cannot change the value of a constant.");
 
+  static final DiagnosticType NOT_A_CONSTRUCTOR =
+      DiagnosticType.warning(
+          "JSC_NOT_A_CONSTRUCTOR",
+          "Expected a constructor but found type {0}.");
+
   static final DiagnosticGroup ALL_DIAGNOSTICS = new DiagnosticGroup(
       CALL_FUNCTION_WITH_BOTTOM_FORMAL,
       CONST_REASSIGNED,
@@ -173,6 +176,7 @@ public class NewTypeInference implements CompilerPass {
       INVALID_OPERAND_TYPE,
       MISTYPED_ASSIGN_RHS,
       NON_NUMERIC_ARRAY_INDEX,
+      NOT_A_CONSTRUCTOR,
       NOT_UNIQUE_INSTANTIATION,
       POSSIBLY_INEXISTENT_PROPERTY,
       PROPERTY_ACCESS_ON_NONOBJECT,
@@ -184,7 +188,6 @@ public class NewTypeInference implements CompilerPass {
       TypeCheck.ILLEGAL_PROPERTY_CREATION,
       TypeCheck.IN_USED_WITH_STRUCT,
       TypeCheck.INEXISTENT_PROPERTY,
-      TypeCheck.NOT_A_CONSTRUCTOR,
       TypeCheck.NOT_CALLABLE,
       TypeCheck.WRONG_ARGUMENT_COUNT,
       TypeValidator.ILLEGAL_PROPERTY_ACCESS,
@@ -1380,7 +1383,7 @@ private EnvTypePair analyzeExprFwd(
           return analyzeCallNodeArgumentsFwd(expr, inEnv);
         } else if (expr.isNew() && !funType.isConstructor()) {
           warnings.add(JSError.make(
-              expr, TypeCheck.NOT_A_CONSTRUCTOR, funType.toString()));
+              expr, NOT_A_CONSTRUCTOR, funType.toString()));
           return analyzeCallNodeArgumentsFwd(expr, inEnv);
         }
         int maxArity = funType.getMaxArity();

src/com/google/javascript/jscomp/NodeUtil.java

@@ -439,7 +439,9 @@ static Node getFunctionNameNode(Node n) {
 
       default:
         // function name() ...
-        return n.getFirstChild();
+        Node funNameNode = n.getFirstChild();
+        // Don't return the name node for anonymous functions
+        return funNameNode.getString().isEmpty() ? null : funNameNode;
     }
   }
 

test/com/google/javascript/jscomp/NewTypeInferenceTest.java

@@ -1909,6 +1909,21 @@ public void testUnionOfFunctionAndNumber() {
             TypeCheck.NOT_CALLABLE, NewTypeInference.INVALID_ARGUMENT_TYPE));
   }
 
+  public void testAnonymousNominalType() {
+    typeCheck(
+        "function f() { return {}; }\n" +
+        "/** @constructor */\n" +
+        "f().Foo = function() {};",
+        GlobalTypeInfo.ANONYMOUS_NOMINAL_TYPE);
+
+    typeCheck(
+        "var x = {};\n" +
+        "function f() { return x; }\n" +
+        "/** @constructor */\n" +
+        "f().Foo = function() {};\n" +
+        "new (f().Foo)();",
+        GlobalTypeInfo.ANONYMOUS_NOMINAL_TYPE);
+  }
 
   public void testFoo() {
     typeCheck(
@@ -1917,7 +1932,7 @@ public void testFoo() {
 
     typeCheck(
         "function Foo() {}; new Foo();",
-        TypeCheck.NOT_A_CONSTRUCTOR);
+        NewTypeInference.NOT_A_CONSTRUCTOR);
 
     checkNoWarnings(
         "/** @constructor */ function Foo() {};\n" +