Reviewers: dcarney,
Message:
Committed patchset #1 manually as r17370 (presubmit successful).
Description:
Experimental scanner: save all token data into one vector.
BUG=
[email protected]
Committed: https://code.google.com/p/v8/source/detail?r=17370
Please review this at https://codereview.chromium.org/39673002/
SVN Base: https://v8.googlecode.com/svn/branches/experimental/parser
Affected files (+12, -15 lines):
M src/lexer/experimental-scanner.h
M src/lexer/experimental-scanner.cc
Index: src/lexer/experimental-scanner.cc
diff --git a/src/lexer/experimental-scanner.cc
b/src/lexer/experimental-scanner.cc
index
77f3ae45965b98866aa1cc8833895b8413b56aa9..d110f5eb2f58dc0aed5e3fb4e7c8801340a45dd7
100644
--- a/src/lexer/experimental-scanner.cc
+++ b/src/lexer/experimental-scanner.cc
@@ -75,12 +75,8 @@ ExperimentalScanner::ExperimentalScanner(const char*
fname,
if (read_all_at_once_) {
source_ = ReadFile(fname, isolate, &length_);
token_.resize(1500);
- beg_.resize(1500);
- end_.resize(1500);
} else {
token_.resize(BUFFER_SIZE);
- beg_.resize(BUFFER_SIZE);
- end_.resize(BUFFER_SIZE);
}
}
@@ -108,17 +104,17 @@ void ExperimentalScanner::FillTokens() {
Token::Value ExperimentalScanner::Next() {
while (current_ == fetched_)
FillTokens();
- return token_[current_++];
+ return token_[current_++].value;
}
Token::Value ExperimentalScanner::current_token() {
- return token_[current_ - 1];
+ return token_[current_ - 1].value;
}
ExperimentalScanner::Location ExperimentalScanner::location() {
- return Location(beg_[current_ - 1], end_[current_ - 1]);
+ return Location(token_[current_ - 1].beg, token_[current_ - 1].end);
}
@@ -126,12 +122,10 @@ void ExperimentalScanner::Record(Token::Value token,
int beg, int end) {
if (token == Token::EOS) end--;
if (fetched_ >= token_.size()) {
token_.resize(token_.size() * 2);
- beg_.resize(beg_.size() * 2);
- end_.resize(end_.size() * 2);
}
- token_[fetched_] = token;
- beg_[fetched_] = beg;
- end_[fetched_] = end;
+ token_[fetched_].value = token;
+ token_[fetched_].beg = beg;
+ token_[fetched_].end = end;
fetched_++;
}
Index: src/lexer/experimental-scanner.h
diff --git a/src/lexer/experimental-scanner.h
b/src/lexer/experimental-scanner.h
index
5b117f97b406a76dfc60b4fe8e3769191cc24b21..18d67fd7cdebfac0ab2144e0753b4879a0cfdc50
100644
--- a/src/lexer/experimental-scanner.h
+++ b/src/lexer/experimental-scanner.h
@@ -54,6 +54,11 @@ class ExperimentalScanner {
int end_pos;
};
+ struct SavedToken {
+ int beg, end;
+ Token::Value value;
+ };
+
ExperimentalScanner(const char* fname,
bool read_all_at_once,
Isolate* isolate);
@@ -68,9 +73,7 @@ class ExperimentalScanner {
private:
void FillTokens();
static const int BUFFER_SIZE = 256;
- std::vector<v8::internal::Token::Value> token_;
- std::vector<int> beg_;
- std::vector<int> end_;
+ std::vector<SavedToken> token_;
size_t current_;
size_t fetched_;
FILE* file_;
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
