Allow multiple function literals to be assigned to the same var / property.

src/func-name-inferrer.h

 // Copyright 2006-2009 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 27 matching lines @@
 // The basic idea is that during AST traversal LHSs of expressions are
 // always visited before RHSs. Thus, during visiting the LHS, a name can be
 // collected, and during visiting the RHS, a function literal can be collected.
 // Inference is performed while leaving the assignment node.
 
 class FuncNameInferrer BASE_EMBEDDED {
  public:
   FuncNameInferrer() :
       entries_stack_(10),
       names_stack_(5),
-      func_to_infer_(NULL),
+      funcs_to_infer_(4),
       dot_(Factory::NewStringFromAscii(CStrVector("."))) {
   }
 
   bool IsOpen() const { return !entries_stack_.is_empty(); }
 
   void PushEnclosingName(Handle<String> name);
 
   void Enter() {
     entries_stack_.Add(names_stack_.length());
   }
 
-  void Leave() {
-    ASSERT(IsOpen());
-    names_stack_.Rewind(entries_stack_.RemoveLast());
-  }
-
   void PushName(Handle<String> name) {
     if (IsOpen()) {
       names_stack_.Add(name);
     }
   }
 
-  void SetFuncToInfer(FunctionLiteral* func_to_infer) {
+  void AddFunction(FunctionLiteral* func_to_infer) {
     if (IsOpen()) {
-      // If we encounter another function literal after already having
-      // encountered one, the second one replaces the first.
-      func_to_infer_ = func_to_infer;
+      funcs_to_infer_.Add(func_to_infer);
     }
   }
 
   void InferAndLeave() {
     ASSERT(IsOpen());
-    MaybeInferFunctionName();
-    Leave();
+    if (!funcs_to_infer_.is_empty()) {
+      InferFunctionsNames();
+    }
+    names_stack_.Rewind(entries_stack_.RemoveLast());
   }
 
  private:
   Handle<String> MakeNameFromStack();
   Handle<String> MakeNameFromStackHelper(int pos, Handle<String> prev);
-  void MaybeInferFunctionName();
+  void InferFunctionsNames();
 
   List<int> entries_stack_;
   List<Handle<String> > names_stack_;
-  FunctionLiteral* func_to_infer_;
+  List<FunctionLiteral*> funcs_to_infer_;
   Handle<String> dot_;
 
   DISALLOW_COPY_AND_ASSIGN(FuncNameInferrer);
 };
 
 
 // A wrapper class that automatically calls InferAndLeave when
 // leaving scope.
 class ScopedFuncNameInferrer BASE_EMBEDDED {
  public:
@@ skipping 15 matching lines @@
   FuncNameInferrer* inferrer_;
   bool is_entered_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedFuncNameInferrer);
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_FUNC_NAME_INFERRER_H_