| OLD | NEW |
| 1 // Copyright 2011 the V8 project authors. All rights reserved. | 1 // Copyright 2011 the V8 project authors. All rights reserved. |
| 2 // Redistribution and use in source and binary forms, with or without | 2 // Redistribution and use in source and binary forms, with or without |
| 3 // modification, are permitted provided that the following conditions are | 3 // modification, are permitted provided that the following conditions are |
| 4 // met: | 4 // met: |
| 5 // | 5 // |
| 6 // * Redistributions of source code must retain the above copyright | 6 // * Redistributions of source code must retain the above copyright |
| 7 // notice, this list of conditions and the following disclaimer. | 7 // notice, this list of conditions and the following disclaimer. |
| 8 // * Redistributions in binary form must reproduce the above | 8 // * Redistributions in binary form must reproduce the above |
| 9 // copyright notice, this list of conditions and the following | 9 // copyright notice, this list of conditions and the following |
| 10 // disclaimer in the documentation and/or other materials provided | 10 // disclaimer in the documentation and/or other materials provided |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 48 // that it is really a constructor, we check that it is not empty | 48 // that it is really a constructor, we check that it is not empty |
| 49 // and starts with a capital letter. | 49 // and starts with a capital letter. |
| 50 if (name->length() > 0 && Runtime::IsUpperCaseChar( | 50 if (name->length() > 0 && Runtime::IsUpperCaseChar( |
| 51 isolate()->runtime_state(), name->Get(0))) { | 51 isolate()->runtime_state(), name->Get(0))) { |
| 52 names_stack_.Add(Name(name, kEnclosingConstructorName), zone()); | 52 names_stack_.Add(Name(name, kEnclosingConstructorName), zone()); |
| 53 } | 53 } |
| 54 } | 54 } |
| 55 | 55 |
| 56 | 56 |
| 57 void FuncNameInferrer::PushLiteralName(Handle<String> name) { | 57 void FuncNameInferrer::PushLiteralName(Handle<String> name) { |
| 58 if (IsOpen() && !isolate()->heap()->prototype_symbol()->Equals(*name)) { | 58 if (IsOpen() && !isolate()->heap()->prototype_string()->Equals(*name)) { |
| 59 names_stack_.Add(Name(name, kLiteralName), zone()); | 59 names_stack_.Add(Name(name, kLiteralName), zone()); |
| 60 } | 60 } |
| 61 } | 61 } |
| 62 | 62 |
| 63 | 63 |
| 64 void FuncNameInferrer::PushVariableName(Handle<String> name) { | 64 void FuncNameInferrer::PushVariableName(Handle<String> name) { |
| 65 if (IsOpen() && !isolate()->heap()->result_symbol()->Equals(*name)) { | 65 if (IsOpen() && !isolate()->heap()->result_string()->Equals(*name)) { |
| 66 names_stack_.Add(Name(name, kVariableName), zone()); | 66 names_stack_.Add(Name(name, kVariableName), zone()); |
| 67 } | 67 } |
| 68 } | 68 } |
| 69 | 69 |
| 70 | 70 |
| 71 Handle<String> FuncNameInferrer::MakeNameFromStack() { | 71 Handle<String> FuncNameInferrer::MakeNameFromStack() { |
| 72 return MakeNameFromStackHelper(0, isolate()->factory()->empty_string()); | 72 return MakeNameFromStackHelper(0, isolate()->factory()->empty_string()); |
| 73 } | 73 } |
| 74 | 74 |
| 75 | 75 |
| 76 Handle<String> FuncNameInferrer::MakeNameFromStackHelper(int pos, | 76 Handle<String> FuncNameInferrer::MakeNameFromStackHelper(int pos, |
| 77 Handle<String> prev) { | 77 Handle<String> prev) { |
| 78 if (pos >= names_stack_.length()) return prev; | 78 if (pos >= names_stack_.length()) return prev; |
| 79 if (pos < names_stack_.length() - 1 && | 79 if (pos < names_stack_.length() - 1 && |
| 80 names_stack_.at(pos).type == kVariableName && | 80 names_stack_.at(pos).type == kVariableName && |
| 81 names_stack_.at(pos + 1).type == kVariableName) { | 81 names_stack_.at(pos + 1).type == kVariableName) { |
| 82 // Skip consecutive variable declarations. | 82 // Skip consecutive variable declarations. |
| 83 return MakeNameFromStackHelper(pos + 1, prev); | 83 return MakeNameFromStackHelper(pos + 1, prev); |
| 84 } else { | 84 } else { |
| 85 if (prev->length() > 0) { | 85 if (prev->length() > 0) { |
| 86 Factory* factory = isolate()->factory(); | 86 Factory* factory = isolate()->factory(); |
| 87 Handle<String> curr = factory->NewConsString( | 87 Handle<String> curr = factory->NewConsString( |
| 88 factory->dot_symbol(), names_stack_.at(pos).name); | 88 factory->dot_string(), names_stack_.at(pos).name); |
| 89 return MakeNameFromStackHelper(pos + 1, | 89 return MakeNameFromStackHelper(pos + 1, |
| 90 factory->NewConsString(prev, curr)); | 90 factory->NewConsString(prev, curr)); |
| 91 } else { | 91 } else { |
| 92 return MakeNameFromStackHelper(pos + 1, names_stack_.at(pos).name); | 92 return MakeNameFromStackHelper(pos + 1, names_stack_.at(pos).name); |
| 93 } | 93 } |
| 94 } | 94 } |
| 95 } | 95 } |
| 96 | 96 |
| 97 | 97 |
| 98 void FuncNameInferrer::InferFunctionsNames() { | 98 void FuncNameInferrer::InferFunctionsNames() { |
| 99 Handle<String> func_name = MakeNameFromStack(); | 99 Handle<String> func_name = MakeNameFromStack(); |
| 100 for (int i = 0; i < funcs_to_infer_.length(); ++i) { | 100 for (int i = 0; i < funcs_to_infer_.length(); ++i) { |
| 101 funcs_to_infer_[i]->set_inferred_name(func_name); | 101 funcs_to_infer_[i]->set_inferred_name(func_name); |
| 102 } | 102 } |
| 103 funcs_to_infer_.Rewind(0); | 103 funcs_to_infer_.Rewind(0); |
| 104 } | 104 } |
| 105 | 105 |
| 106 | 106 |
| 107 } } // namespace v8::internal | 107 } } // namespace v8::internal |
| OLD | NEW |