Merge in changes from readability review.

test/cctest/test-func-name-inference.cc

 // Copyright 2007-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 14 matching lines @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "v8.h"
 
 #include "api.h"
 #include "runtime.h"
 #include "cctest.h"
 
 
+using ::v8::internal::CStrVector;

[Søren Thygesen Gjesse, 2009/05/25 06:38:31]

I must admit that I would prefer to not use "using" and either use a namespace
alias or use full namespaces, but lets keep it with "using" for now and getting
rid of the  mix of "using" and namespace alias is good.

[Mikhail Naganov, 2009/05/25 08:38:51]

Honestly, me too, because when using "using" it's good to have some auto-checker
that helps to get rid of no more used imports (like the tool that track imports
for Java).

+using ::v8::internal::Factory;
 using ::v8::internal::Handle;
+using ::v8::internal::Heap;
 using ::v8::internal::JSFunction;
 using ::v8::internal::Object;
+using ::v8::internal::Runtime;
 using ::v8::internal::Script;
+using ::v8::internal::SmartPointer;
 using ::v8::internal::SharedFunctionInfo;
 using ::v8::internal::String;
 
-namespace i = ::v8::internal;
-
 
 static v8::Persistent<v8::Context> env;
 
 
 static void InitializeVM() {
   if (env.IsEmpty()) {
     v8::HandleScope scope;
     env = v8::Context::New();
   }
   v8::HandleScope scope;
   env->Enter();
 }
 
 
 static void CheckFunctionName(v8::Handle<v8::Script> script,
                               const char* func_pos_src,
                               const char* ref_inferred_name) {
   // Get script source.
   Handle<JSFunction> fun = v8::Utils::OpenHandle(*script);
   Handle<Script> i_script(Script::cast(fun->shared()->script()));
   CHECK(i_script->source()->IsString());
   Handle<String> script_src(String::cast(i_script->source()));
 
   // Find the position of a given func source substring in the source.
   Handle<String> func_pos_str =
-      i::Factory::NewStringFromAscii(i::CStrVector(func_pos_src));
-  int func_pos = i::Runtime::StringMatch(script_src, func_pos_str, 0);
+      Factory::NewStringFromAscii(CStrVector(func_pos_src));
+  int func_pos = Runtime::StringMatch(script_src, func_pos_str, 0);
   CHECK_NE(0, func_pos);
 
   // Obtain SharedFunctionInfo for the function.
   Object* shared_func_info_ptr =
-      i::Runtime::FindSharedFunctionInfoInScript(i_script, func_pos);
-  CHECK(shared_func_info_ptr != i::Heap::undefined_value());
+      Runtime::FindSharedFunctionInfoInScript(i_script, func_pos);
+  CHECK(shared_func_info_ptr != Heap::undefined_value());
   Handle<SharedFunctionInfo> shared_func_info(
       SharedFunctionInfo::cast(shared_func_info_ptr));
 
   // Verify inferred function name.
-  i::SmartPointer<char> inferred_name =
+  SmartPointer<char> inferred_name =
       shared_func_info->inferred_name()->ToCString();
   CHECK_EQ(ref_inferred_name, *inferred_name);
 }
 
 
 static v8::Handle<v8::Script> Compile(const char* src) {
   return v8::Script::Compile(v8::String::New(src));
 }
 
 
@@ skipping 149 matching lines @@
   v8::HandleScope scope;
 
   v8::Handle<v8::Script> script = Compile(
       "function MyClass() {}\n"
       "MyClass.prototype = {\n"
       "  method1: 0 ? function() { return 1; } :\n"
       "               function() { return 2; } }");
   CheckFunctionName(script, "return 1", "MyClass.method1");
   CheckFunctionName(script, "return 2", "MyClass.method1");
 }