[parser]: Skipping inner funcs / initial implemetation of storing scope analysis data from preparse…

src/parsing/preparsed-scope-data.h

+// Copyright 2017 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef V8_PARSING_PREPARSED_SCOPE_DATA_H_
+#define V8_PARSING_PREPARSED_SCOPE_DATA_H_
+
+#include <vector>
+
+#include "src/globals.h"

[jochen (gone - plz use gerrit), 2017/01/25 11:16:01]

for DISALLOW_COPY_AND_ASSIGN, you only need src/base/macros.h

[marja, 2017/01/25 11:50:29]

For ScopeType I need globals.h.

+
+namespace v8 {
+namespace internal {
+
+class PreParsedScopeData {
+ public:
+  PreParsedScopeData() : current_scope_(nullptr) {}

[jochen (gone - plz use gerrit), 2017/01/25 11:16:01]

nit. don't inline non-trivial ctors, and add a dtor

[marja, 2017/01/25 11:50:29]

Confused about this comment (in the context of one below);  what's wrong with
inlining this? And now that I don't need to initialize current_scope_, should I
have an empty ctor which I'll define in the .cc file or what?

+
+  class ScopeScope {
+   public:
+    ScopeScope(PreParsedScopeData* data, ScopeType scope_type,
+               int start_position, int end_position);
+    ~ScopeScope();
+
+    // TODO(marja): The functions for adding information about local variables
+    // will appear here.
+
+   private:
+    PreParsedScopeData* data_;
+    size_t index_in_data_;
+    ScopeScope* previous_scope_;
+
+    int inner_scope_count_;
+    int variable_count_;
+    DISALLOW_COPY_AND_ASSIGN(ScopeScope);
+  };
+
+ private:
+  friend class ScopeScope;

[jochen (gone - plz use gerrit), 2017/01/25 11:16:01]

nit, you don't need to friend inner classes

[marja, 2017/01/25 11:50:29]

Done.

+  friend class ScopeTestHelper;
+
+  // TODO(marja): Make the backing store more efficient once we know exactly
+  // what data is needed.
+  std::vector<int> backing_store_;
+  ScopeScope* current_scope_;

[jochen (gone - plz use gerrit), 2017/01/25 11:16:01]

you can just declare this as ScopeScope* current_scope_ = nullptr;

[marja, 2017/01/25 11:50:28]

Done.

+
+  DISALLOW_COPY_AND_ASSIGN(PreParsedScopeData);
+};
+
+}  // namespace internal
+}  // namespace v8
+
+#endif  // V8_PARSING_PREPARSED_SCOPE_DATA_H_