| OLD | NEW |
| 1 // Copyright 2006-2009 the V8 project authors. All rights reserved. | 1 // Copyright 2006-2009 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 27 matching lines...) Expand all Loading... |
| 38 // Inference is performed in cases when an anonymous function is assigned | 38 // Inference is performed in cases when an anonymous function is assigned |
| 39 // to a variable or a property (see test-func-name-inference.cc for examples.) | 39 // to a variable or a property (see test-func-name-inference.cc for examples.) |
| 40 // | 40 // |
| 41 // The basic idea is that during parsing of LHSs of certain expressions | 41 // The basic idea is that during parsing of LHSs of certain expressions |
| 42 // (assignments, declarations, object literals) we collect name strings, | 42 // (assignments, declarations, object literals) we collect name strings, |
| 43 // and during parsing of the RHS, a function literal can be collected. After | 43 // and during parsing of the RHS, a function literal can be collected. After |
| 44 // parsing the RHS we can infer a name for function literals that do not have | 44 // parsing the RHS we can infer a name for function literals that do not have |
| 45 // a name. | 45 // a name. |
| 46 class FuncNameInferrer : public ZoneObject { | 46 class FuncNameInferrer : public ZoneObject { |
| 47 public: | 47 public: |
| 48 explicit FuncNameInferrer(Isolate* isolate); | 48 FuncNameInferrer(Isolate* isolate, Zone* zone); |
| 49 | 49 |
| 50 // Returns whether we have entered name collection state. | 50 // Returns whether we have entered name collection state. |
| 51 bool IsOpen() const { return !entries_stack_.is_empty(); } | 51 bool IsOpen() const { return !entries_stack_.is_empty(); } |
| 52 | 52 |
| 53 // Pushes an enclosing the name of enclosing function onto names stack. | 53 // Pushes an enclosing the name of enclosing function onto names stack. |
| 54 void PushEnclosingName(Handle<String> name); | 54 void PushEnclosingName(Handle<String> name); |
| 55 | 55 |
| 56 // Enters name collection state. | 56 // Enters name collection state. |
| 57 void Enter() { | 57 void Enter() { |
| 58 entries_stack_.Add(names_stack_.length()); | 58 entries_stack_.Add(names_stack_.length(), zone()); |
| 59 } | 59 } |
| 60 | 60 |
| 61 // Pushes an encountered name onto names stack when in collection state. | 61 // Pushes an encountered name onto names stack when in collection state. |
| 62 void PushLiteralName(Handle<String> name); | 62 void PushLiteralName(Handle<String> name); |
| 63 | 63 |
| 64 void PushVariableName(Handle<String> name); | 64 void PushVariableName(Handle<String> name); |
| 65 | 65 |
| 66 // Adds a function to infer name for. | 66 // Adds a function to infer name for. |
| 67 void AddFunction(FunctionLiteral* func_to_infer) { | 67 void AddFunction(FunctionLiteral* func_to_infer) { |
| 68 if (IsOpen()) { | 68 if (IsOpen()) { |
| 69 funcs_to_infer_.Add(func_to_infer); | 69 funcs_to_infer_.Add(func_to_infer, zone()); |
| 70 } | 70 } |
| 71 } | 71 } |
| 72 | 72 |
| 73 void RemoveLastFunction() { | 73 void RemoveLastFunction() { |
| 74 if (IsOpen() && !funcs_to_infer_.is_empty()) { | 74 if (IsOpen() && !funcs_to_infer_.is_empty()) { |
| 75 funcs_to_infer_.RemoveLast(); | 75 funcs_to_infer_.RemoveLast(); |
| 76 } | 76 } |
| 77 } | 77 } |
| 78 | 78 |
| 79 // Infers a function name and leaves names collection state. | 79 // Infers a function name and leaves names collection state. |
| (...skipping 18 matching lines...) Expand all Loading... |
| 98 kLiteralName, | 98 kLiteralName, |
| 99 kVariableName | 99 kVariableName |
| 100 }; | 100 }; |
| 101 struct Name { | 101 struct Name { |
| 102 Name(Handle<String> name, NameType type) : name(name), type(type) { } | 102 Name(Handle<String> name, NameType type) : name(name), type(type) { } |
| 103 Handle<String> name; | 103 Handle<String> name; |
| 104 NameType type; | 104 NameType type; |
| 105 }; | 105 }; |
| 106 | 106 |
| 107 Isolate* isolate() { return isolate_; } | 107 Isolate* isolate() { return isolate_; } |
| 108 Zone* zone() const { return zone_; } |
| 108 | 109 |
| 109 // Constructs a full name in dotted notation from gathered names. | 110 // Constructs a full name in dotted notation from gathered names. |
| 110 Handle<String> MakeNameFromStack(); | 111 Handle<String> MakeNameFromStack(); |
| 111 | 112 |
| 112 // A helper function for MakeNameFromStack. | 113 // A helper function for MakeNameFromStack. |
| 113 Handle<String> MakeNameFromStackHelper(int pos, Handle<String> prev); | 114 Handle<String> MakeNameFromStackHelper(int pos, Handle<String> prev); |
| 114 | 115 |
| 115 // Performs name inferring for added functions. | 116 // Performs name inferring for added functions. |
| 116 void InferFunctionsNames(); | 117 void InferFunctionsNames(); |
| 117 | 118 |
| 118 Isolate* isolate_; | 119 Isolate* isolate_; |
| 119 ZoneList<int> entries_stack_; | 120 ZoneList<int> entries_stack_; |
| 120 ZoneList<Name> names_stack_; | 121 ZoneList<Name> names_stack_; |
| 121 ZoneList<FunctionLiteral*> funcs_to_infer_; | 122 ZoneList<FunctionLiteral*> funcs_to_infer_; |
| 123 Zone* zone_; |
| 122 | 124 |
| 123 DISALLOW_COPY_AND_ASSIGN(FuncNameInferrer); | 125 DISALLOW_COPY_AND_ASSIGN(FuncNameInferrer); |
| 124 }; | 126 }; |
| 125 | 127 |
| 126 | 128 |
| 127 } } // namespace v8::internal | 129 } } // namespace v8::internal |
| 128 | 130 |
| 129 #endif // V8_FUNC_NAME_INFERRER_H_ | 131 #endif // V8_FUNC_NAME_INFERRER_H_ |
| OLD | NEW |