2012-01-24 16:36:55 +00:00
|
|
|
// Copyright 2012 the V8 project authors. All rights reserved.
|
2009-11-05 10:11:38 +00:00
|
|
|
// 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
|
|
|
|
// with the distribution.
|
|
|
|
// * Neither the name of Google Inc. nor the names of its
|
|
|
|
// contributors may be used to endorse or promote products derived
|
|
|
|
// from this software without specific prior written permission.
|
|
|
|
//
|
|
|
|
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
|
|
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
|
|
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
|
|
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
|
|
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
|
|
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
|
|
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
|
|
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
|
|
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
|
|
// (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 <stdlib.h>
|
2010-11-02 07:21:37 +00:00
|
|
|
#include <stdio.h>
|
2010-11-11 11:45:25 +00:00
|
|
|
#include <string.h>
|
2009-11-05 10:11:38 +00:00
|
|
|
|
|
|
|
#include "v8.h"
|
|
|
|
|
2011-09-08 13:06:44 +00:00
|
|
|
#include "cctest.h"
|
2011-11-15 13:48:40 +00:00
|
|
|
#include "compiler.h"
|
2011-09-08 13:06:44 +00:00
|
|
|
#include "execution.h"
|
2011-03-18 20:35:07 +00:00
|
|
|
#include "isolate.h"
|
2010-09-07 12:52:16 +00:00
|
|
|
#include "parser.h"
|
2010-11-02 07:21:37 +00:00
|
|
|
#include "preparser.h"
|
2011-09-08 13:06:44 +00:00
|
|
|
#include "scanner-character-streams.h"
|
|
|
|
#include "token.h"
|
|
|
|
#include "utils.h"
|
2009-11-05 10:11:38 +00:00
|
|
|
|
2011-08-09 13:32:53 +00:00
|
|
|
TEST(ScanKeywords) {
|
2009-11-05 10:11:38 +00:00
|
|
|
struct KeywordToken {
|
|
|
|
const char* keyword;
|
|
|
|
i::Token::Value token;
|
|
|
|
};
|
|
|
|
|
|
|
|
static const KeywordToken keywords[] = {
|
|
|
|
#define KEYWORD(t, s, d) { s, i::Token::t },
|
2011-08-09 13:32:53 +00:00
|
|
|
TOKEN_LIST(IGNORE_TOKEN, KEYWORD)
|
2009-11-05 10:11:38 +00:00
|
|
|
#undef KEYWORD
|
|
|
|
{ NULL, i::Token::IDENTIFIER }
|
|
|
|
};
|
|
|
|
|
|
|
|
KeywordToken key_token;
|
2011-08-09 13:32:53 +00:00
|
|
|
i::UnicodeCache unicode_cache;
|
|
|
|
i::byte buffer[32];
|
2009-11-05 10:11:38 +00:00
|
|
|
for (int i = 0; (key_token = keywords[i]).keyword != NULL; i++) {
|
2011-08-09 13:32:53 +00:00
|
|
|
const i::byte* keyword =
|
|
|
|
reinterpret_cast<const i::byte*>(key_token.keyword);
|
|
|
|
int length = i::StrLength(key_token.keyword);
|
|
|
|
CHECK(static_cast<int>(sizeof(buffer)) >= length);
|
|
|
|
{
|
2012-03-12 12:35:28 +00:00
|
|
|
i::Utf8ToUtf16CharacterStream stream(keyword, length);
|
2011-11-01 07:47:15 +00:00
|
|
|
i::Scanner scanner(&unicode_cache);
|
2012-02-08 10:53:58 +00:00
|
|
|
// The scanner should parse Harmony keywords for this test.
|
2011-10-12 12:23:06 +00:00
|
|
|
scanner.SetHarmonyScoping(true);
|
2012-02-08 10:53:58 +00:00
|
|
|
scanner.SetHarmonyModules(true);
|
2011-08-17 11:45:04 +00:00
|
|
|
scanner.Initialize(&stream);
|
2011-08-09 13:32:53 +00:00
|
|
|
CHECK_EQ(key_token.token, scanner.Next());
|
|
|
|
CHECK_EQ(i::Token::EOS, scanner.Next());
|
2009-11-05 10:11:38 +00:00
|
|
|
}
|
2011-08-09 13:32:53 +00:00
|
|
|
// Removing characters will make keyword matching fail.
|
|
|
|
{
|
2012-03-12 12:35:28 +00:00
|
|
|
i::Utf8ToUtf16CharacterStream stream(keyword, length - 1);
|
2011-11-01 07:47:15 +00:00
|
|
|
i::Scanner scanner(&unicode_cache);
|
2011-08-09 13:32:53 +00:00
|
|
|
scanner.Initialize(&stream);
|
|
|
|
CHECK_EQ(i::Token::IDENTIFIER, scanner.Next());
|
|
|
|
CHECK_EQ(i::Token::EOS, scanner.Next());
|
|
|
|
}
|
|
|
|
// Adding characters will make keyword matching fail.
|
|
|
|
static const char chars_to_append[] = { 'z', '0', '_' };
|
|
|
|
for (int j = 0; j < static_cast<int>(ARRAY_SIZE(chars_to_append)); ++j) {
|
2013-04-16 12:30:51 +00:00
|
|
|
i::OS::MemMove(buffer, keyword, length);
|
2011-08-09 13:32:53 +00:00
|
|
|
buffer[length] = chars_to_append[j];
|
2012-03-12 12:35:28 +00:00
|
|
|
i::Utf8ToUtf16CharacterStream stream(buffer, length + 1);
|
2011-11-01 07:47:15 +00:00
|
|
|
i::Scanner scanner(&unicode_cache);
|
2011-08-09 13:32:53 +00:00
|
|
|
scanner.Initialize(&stream);
|
|
|
|
CHECK_EQ(i::Token::IDENTIFIER, scanner.Next());
|
|
|
|
CHECK_EQ(i::Token::EOS, scanner.Next());
|
|
|
|
}
|
|
|
|
// Replacing characters will make keyword matching fail.
|
|
|
|
{
|
2013-04-16 12:30:51 +00:00
|
|
|
i::OS::MemMove(buffer, keyword, length);
|
2011-08-09 13:32:53 +00:00
|
|
|
buffer[length - 1] = '_';
|
2012-03-12 12:35:28 +00:00
|
|
|
i::Utf8ToUtf16CharacterStream stream(buffer, length);
|
2011-11-01 07:47:15 +00:00
|
|
|
i::Scanner scanner(&unicode_cache);
|
2011-08-09 13:32:53 +00:00
|
|
|
scanner.Initialize(&stream);
|
|
|
|
CHECK_EQ(i::Token::IDENTIFIER, scanner.Next());
|
|
|
|
CHECK_EQ(i::Token::EOS, scanner.Next());
|
2009-11-05 10:11:38 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-09-02 07:36:30 +00:00
|
|
|
|
|
|
|
TEST(ScanHTMLEndComments) {
|
2011-08-04 15:18:18 +00:00
|
|
|
v8::V8::Initialize();
|
2013-10-01 09:56:04 +00:00
|
|
|
v8::Isolate* isolate = CcTest::isolate();
|
2014-01-13 11:15:06 +00:00
|
|
|
v8::HandleScope handles(isolate);
|
2011-08-04 15:18:18 +00:00
|
|
|
|
2010-09-02 07:36:30 +00:00
|
|
|
// Regression test. See:
|
|
|
|
// http://code.google.com/p/chromium/issues/detail?id=53548
|
|
|
|
// Tests that --> is correctly interpreted as comment-to-end-of-line if there
|
2011-06-21 13:34:16 +00:00
|
|
|
// is only whitespace before it on the line (with comments considered as
|
|
|
|
// whitespace, even a multiline-comment containing a newline).
|
|
|
|
// This was not the case if it occurred before the first real token
|
2010-09-02 07:36:30 +00:00
|
|
|
// in the input.
|
|
|
|
const char* tests[] = {
|
|
|
|
// Before first real token.
|
|
|
|
"--> is eol-comment\nvar y = 37;\n",
|
|
|
|
"\n --> is eol-comment\nvar y = 37;\n",
|
|
|
|
"/* precomment */ --> is eol-comment\nvar y = 37;\n",
|
|
|
|
"\n/* precomment */ --> is eol-comment\nvar y = 37;\n",
|
|
|
|
// After first real token.
|
|
|
|
"var x = 42;\n--> is eol-comment\nvar y = 37;\n",
|
|
|
|
"var x = 42;\n/* precomment */ --> is eol-comment\nvar y = 37;\n",
|
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
2011-06-21 13:34:16 +00:00
|
|
|
const char* fail_tests[] = {
|
|
|
|
"x --> is eol-comment\nvar y = 37;\n",
|
|
|
|
"\"\\n\" --> is eol-comment\nvar y = 37;\n",
|
|
|
|
"x/* precomment */ --> is eol-comment\nvar y = 37;\n",
|
|
|
|
"x/* precomment\n */ --> is eol-comment\nvar y = 37;\n",
|
|
|
|
"var x = 42; --> is eol-comment\nvar y = 37;\n",
|
|
|
|
"var x = 42; /* precomment\n */ --> is eol-comment\nvar y = 37;\n",
|
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
2010-09-07 12:52:16 +00:00
|
|
|
// Parser/Scanner needs a stack limit.
|
2010-09-02 07:36:30 +00:00
|
|
|
int marker;
|
2013-09-19 09:17:13 +00:00
|
|
|
CcTest::i_isolate()->stack_guard()->SetStackLimit(
|
2010-09-02 07:36:30 +00:00
|
|
|
reinterpret_cast<uintptr_t>(&marker) - 128 * 1024);
|
|
|
|
|
|
|
|
for (int i = 0; tests[i]; i++) {
|
2014-01-13 10:51:40 +00:00
|
|
|
v8::Handle<v8::String> source = v8::String::NewFromUtf8(
|
|
|
|
isolate, tests[i], v8::String::kNormalString, i::StrLength(tests[i]));
|
|
|
|
v8::ScriptData* data = v8::ScriptData::PreCompile(source);
|
2010-09-02 07:36:30 +00:00
|
|
|
CHECK(data != NULL && !data->HasError());
|
|
|
|
delete data;
|
|
|
|
}
|
2011-06-21 13:34:16 +00:00
|
|
|
|
|
|
|
for (int i = 0; fail_tests[i]; i++) {
|
2014-01-13 10:51:40 +00:00
|
|
|
v8::Handle<v8::String> source =
|
|
|
|
v8::String::NewFromUtf8(isolate,
|
|
|
|
fail_tests[i],
|
|
|
|
v8::String::kNormalString,
|
|
|
|
i::StrLength(fail_tests[i]));
|
|
|
|
v8::ScriptData* data = v8::ScriptData::PreCompile(source);
|
2011-06-21 13:34:16 +00:00
|
|
|
CHECK(data == NULL || data->HasError());
|
|
|
|
delete data;
|
|
|
|
}
|
2010-09-02 07:36:30 +00:00
|
|
|
}
|
2010-09-07 12:52:16 +00:00
|
|
|
|
|
|
|
|
|
|
|
class ScriptResource : public v8::String::ExternalAsciiStringResource {
|
|
|
|
public:
|
|
|
|
ScriptResource(const char* data, size_t length)
|
|
|
|
: data_(data), length_(length) { }
|
|
|
|
|
|
|
|
const char* data() const { return data_; }
|
|
|
|
size_t length() const { return length_; }
|
|
|
|
|
|
|
|
private:
|
|
|
|
const char* data_;
|
|
|
|
size_t length_;
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
TEST(Preparsing) {
|
2013-09-19 08:54:58 +00:00
|
|
|
v8::Isolate* isolate = CcTest::isolate();
|
2013-05-08 07:45:16 +00:00
|
|
|
v8::HandleScope handles(isolate);
|
|
|
|
v8::Local<v8::Context> context = v8::Context::New(isolate);
|
|
|
|
v8::Context::Scope context_scope(context);
|
2010-09-07 12:52:16 +00:00
|
|
|
int marker;
|
2013-09-19 09:17:13 +00:00
|
|
|
CcTest::i_isolate()->stack_guard()->SetStackLimit(
|
2010-09-07 12:52:16 +00:00
|
|
|
reinterpret_cast<uintptr_t>(&marker) - 128 * 1024);
|
|
|
|
|
|
|
|
// Source containing functions that might be lazily compiled and all types
|
|
|
|
// of symbols (string, propertyName, regexp).
|
|
|
|
const char* source =
|
|
|
|
"var x = 42;"
|
|
|
|
"function foo(a) { return function nolazy(b) { return a + b; } }"
|
|
|
|
"function bar(a) { if (a) return function lazy(b) { return b; } }"
|
|
|
|
"var z = {'string': 'string literal', bareword: 'propertyName', "
|
|
|
|
" 42: 'number literal', for: 'keyword as propertyName', "
|
|
|
|
" f\\u006fr: 'keyword propertyname with escape'};"
|
|
|
|
"var v = /RegExp Literal/;"
|
|
|
|
"var w = /RegExp Literal\\u0020With Escape/gin;"
|
|
|
|
"var y = { get getter() { return 42; }, "
|
|
|
|
" set setter(v) { this.value = v; }};";
|
2010-09-22 13:24:14 +00:00
|
|
|
int source_length = i::StrLength(source);
|
2010-09-07 12:52:16 +00:00
|
|
|
const char* error_source = "var x = y z;";
|
2010-09-22 13:24:14 +00:00
|
|
|
int error_source_length = i::StrLength(error_source);
|
2010-09-07 12:52:16 +00:00
|
|
|
|
2014-01-13 10:51:40 +00:00
|
|
|
v8::ScriptData* preparse = v8::ScriptData::PreCompile(v8::String::NewFromUtf8(
|
|
|
|
isolate, source, v8::String::kNormalString, source_length));
|
2010-09-07 12:52:16 +00:00
|
|
|
CHECK(!preparse->HasError());
|
|
|
|
bool lazy_flag = i::FLAG_lazy;
|
|
|
|
{
|
|
|
|
i::FLAG_lazy = true;
|
|
|
|
ScriptResource* resource = new ScriptResource(source, source_length);
|
2013-11-28 08:21:26 +00:00
|
|
|
v8::Local<v8::String> script_source =
|
|
|
|
v8::String::NewExternal(isolate, resource);
|
2010-09-07 12:52:16 +00:00
|
|
|
v8::Script::Compile(script_source, NULL, preparse);
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
i::FLAG_lazy = false;
|
|
|
|
|
|
|
|
ScriptResource* resource = new ScriptResource(source, source_length);
|
2013-11-28 08:21:26 +00:00
|
|
|
v8::Local<v8::String> script_source =
|
|
|
|
v8::String::NewExternal(isolate, resource);
|
2010-09-07 12:52:16 +00:00
|
|
|
v8::Script::New(script_source, NULL, preparse, v8::Local<v8::String>());
|
|
|
|
}
|
|
|
|
delete preparse;
|
|
|
|
i::FLAG_lazy = lazy_flag;
|
|
|
|
|
|
|
|
// Syntax error.
|
2014-01-13 10:51:40 +00:00
|
|
|
v8::ScriptData* error_preparse = v8::ScriptData::PreCompile(
|
|
|
|
v8::String::NewFromUtf8(isolate,
|
|
|
|
error_source,
|
|
|
|
v8::String::kNormalString,
|
|
|
|
error_source_length));
|
2010-09-07 12:52:16 +00:00
|
|
|
CHECK(error_preparse->HasError());
|
|
|
|
i::ScriptDataImpl *pre_impl =
|
|
|
|
reinterpret_cast<i::ScriptDataImpl*>(error_preparse);
|
|
|
|
i::Scanner::Location error_location =
|
|
|
|
pre_impl->MessageLocation();
|
|
|
|
// Error is at "z" in source, location 10..11.
|
|
|
|
CHECK_EQ(10, error_location.beg_pos);
|
|
|
|
CHECK_EQ(11, error_location.end_pos);
|
|
|
|
// Should not crash.
|
|
|
|
const char* message = pre_impl->BuildMessage();
|
2012-01-24 16:36:55 +00:00
|
|
|
pre_impl->BuildArgs();
|
2010-09-07 12:52:16 +00:00
|
|
|
CHECK_GT(strlen(message), 0);
|
|
|
|
}
|
2010-11-02 07:21:37 +00:00
|
|
|
|
|
|
|
|
|
|
|
TEST(StandAlonePreParser) {
|
2011-08-04 15:18:18 +00:00
|
|
|
v8::V8::Initialize();
|
|
|
|
|
2010-11-02 07:21:37 +00:00
|
|
|
int marker;
|
2013-09-19 09:17:13 +00:00
|
|
|
CcTest::i_isolate()->stack_guard()->SetStackLimit(
|
2010-11-02 07:21:37 +00:00
|
|
|
reinterpret_cast<uintptr_t>(&marker) - 128 * 1024);
|
|
|
|
|
|
|
|
const char* programs[] = {
|
|
|
|
"{label: 42}",
|
|
|
|
"var x = 42;",
|
|
|
|
"function foo(x, y) { return x + y; }",
|
2011-06-20 10:20:57 +00:00
|
|
|
"%ArgleBargle(glop);",
|
2010-11-04 07:19:06 +00:00
|
|
|
"var x = new new Function('this.x = 42');",
|
2010-11-02 07:21:37 +00:00
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
2013-09-19 09:17:13 +00:00
|
|
|
uintptr_t stack_limit = CcTest::i_isolate()->stack_guard()->real_climit();
|
2010-11-02 07:21:37 +00:00
|
|
|
for (int i = 0; programs[i]; i++) {
|
|
|
|
const char* program = programs[i];
|
2012-03-12 12:35:28 +00:00
|
|
|
i::Utf8ToUtf16CharacterStream stream(
|
2010-12-07 14:03:59 +00:00
|
|
|
reinterpret_cast<const i::byte*>(program),
|
|
|
|
static_cast<unsigned>(strlen(program)));
|
2010-11-02 07:21:37 +00:00
|
|
|
i::CompleteParserRecorder log;
|
2013-09-19 09:17:13 +00:00
|
|
|
i::Scanner scanner(CcTest::i_isolate()->unicode_cache());
|
2010-12-07 14:03:59 +00:00
|
|
|
scanner.Initialize(&stream);
|
2010-11-29 13:24:37 +00:00
|
|
|
|
2013-10-14 13:07:20 +00:00
|
|
|
i::PreParser preparser(&scanner, &log, stack_limit);
|
Refactor parser mode configuration for correctness
This patch refactors the parser and preparser interface to be more
readable and type-safe. It has no behavior changes.
Previously, parsers and preparsers were configured via bitfield called
parser_flags in the Parser constructor, and flags in
PreParser::PreParseProgram, ParserApi::Parse, and ParserApi::PreParse.
This was error-prone in practice: six call sites passed incorrectly
typed values to this interface (a boolean FLAG value, a boolean false
and a boolean true value). None of these errors were caught by the
compiler because it's just an "int".
The parser flags interface was also awkward because it encoded a
language mode, but the language mode was only used to turn on harmony
scoping or not -- it wasn't used to actually set the parser's language
mode.
Fundamentally these errors came in because of the desire for a
procedural parser interface, in ParserApi. Because we need to be able
to configure the parser in various ways, the flags argument got added;
but no one understood how to use the flags properly. Also they were
only used by constructors: callers packed bits, and the constructors
unpacked them into booleans on the parser or preparser.
The solution is to allow parser construction, configuration, and
invocation to be separated. This patch does that.
It passes the existing tests.
BUG=
Review URL: https://codereview.chromium.org/13450007
Patch from Andy Wingo <wingo@igalia.com>.
git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@14151 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
2013-04-05 13:01:06 +00:00
|
|
|
preparser.set_allow_lazy(true);
|
|
|
|
preparser.set_allow_natives_syntax(true);
|
2013-10-14 13:07:20 +00:00
|
|
|
i::PreParser::PreParseResult result = preparser.PreParseProgram();
|
|
|
|
CHECK_EQ(i::PreParser::kPreParseSuccess, result);
|
2010-11-02 07:21:37 +00:00
|
|
|
i::ScriptDataImpl data(log.ExtractData());
|
|
|
|
CHECK(!data.has_error());
|
|
|
|
}
|
|
|
|
}
|
2010-11-11 10:18:48 +00:00
|
|
|
|
|
|
|
|
2011-10-17 12:45:52 +00:00
|
|
|
TEST(StandAlonePreParserNoNatives) {
|
|
|
|
v8::V8::Initialize();
|
|
|
|
|
|
|
|
int marker;
|
2013-09-19 09:17:13 +00:00
|
|
|
CcTest::i_isolate()->stack_guard()->SetStackLimit(
|
2011-10-17 12:45:52 +00:00
|
|
|
reinterpret_cast<uintptr_t>(&marker) - 128 * 1024);
|
|
|
|
|
|
|
|
const char* programs[] = {
|
|
|
|
"%ArgleBargle(glop);",
|
|
|
|
"var x = %_IsSmi(42);",
|
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
2013-09-19 09:17:13 +00:00
|
|
|
uintptr_t stack_limit = CcTest::i_isolate()->stack_guard()->real_climit();
|
2011-10-17 12:45:52 +00:00
|
|
|
for (int i = 0; programs[i]; i++) {
|
|
|
|
const char* program = programs[i];
|
2012-03-12 12:35:28 +00:00
|
|
|
i::Utf8ToUtf16CharacterStream stream(
|
2011-10-17 12:45:52 +00:00
|
|
|
reinterpret_cast<const i::byte*>(program),
|
|
|
|
static_cast<unsigned>(strlen(program)));
|
|
|
|
i::CompleteParserRecorder log;
|
2013-09-19 09:17:13 +00:00
|
|
|
i::Scanner scanner(CcTest::i_isolate()->unicode_cache());
|
2011-10-17 12:45:52 +00:00
|
|
|
scanner.Initialize(&stream);
|
|
|
|
|
Refactor parser mode configuration for correctness
This patch refactors the parser and preparser interface to be more
readable and type-safe. It has no behavior changes.
Previously, parsers and preparsers were configured via bitfield called
parser_flags in the Parser constructor, and flags in
PreParser::PreParseProgram, ParserApi::Parse, and ParserApi::PreParse.
This was error-prone in practice: six call sites passed incorrectly
typed values to this interface (a boolean FLAG value, a boolean false
and a boolean true value). None of these errors were caught by the
compiler because it's just an "int".
The parser flags interface was also awkward because it encoded a
language mode, but the language mode was only used to turn on harmony
scoping or not -- it wasn't used to actually set the parser's language
mode.
Fundamentally these errors came in because of the desire for a
procedural parser interface, in ParserApi. Because we need to be able
to configure the parser in various ways, the flags argument got added;
but no one understood how to use the flags properly. Also they were
only used by constructors: callers packed bits, and the constructors
unpacked them into booleans on the parser or preparser.
The solution is to allow parser construction, configuration, and
invocation to be separated. This patch does that.
It passes the existing tests.
BUG=
Review URL: https://codereview.chromium.org/13450007
Patch from Andy Wingo <wingo@igalia.com>.
git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@14151 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
2013-04-05 13:01:06 +00:00
|
|
|
// Preparser defaults to disallowing natives syntax.
|
2013-10-14 13:07:20 +00:00
|
|
|
i::PreParser preparser(&scanner, &log, stack_limit);
|
Refactor parser mode configuration for correctness
This patch refactors the parser and preparser interface to be more
readable and type-safe. It has no behavior changes.
Previously, parsers and preparsers were configured via bitfield called
parser_flags in the Parser constructor, and flags in
PreParser::PreParseProgram, ParserApi::Parse, and ParserApi::PreParse.
This was error-prone in practice: six call sites passed incorrectly
typed values to this interface (a boolean FLAG value, a boolean false
and a boolean true value). None of these errors were caught by the
compiler because it's just an "int".
The parser flags interface was also awkward because it encoded a
language mode, but the language mode was only used to turn on harmony
scoping or not -- it wasn't used to actually set the parser's language
mode.
Fundamentally these errors came in because of the desire for a
procedural parser interface, in ParserApi. Because we need to be able
to configure the parser in various ways, the flags argument got added;
but no one understood how to use the flags properly. Also they were
only used by constructors: callers packed bits, and the constructors
unpacked them into booleans on the parser or preparser.
The solution is to allow parser construction, configuration, and
invocation to be separated. This patch does that.
It passes the existing tests.
BUG=
Review URL: https://codereview.chromium.org/13450007
Patch from Andy Wingo <wingo@igalia.com>.
git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@14151 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
2013-04-05 13:01:06 +00:00
|
|
|
preparser.set_allow_lazy(true);
|
2013-10-14 13:07:20 +00:00
|
|
|
i::PreParser::PreParseResult result = preparser.PreParseProgram();
|
|
|
|
CHECK_EQ(i::PreParser::kPreParseSuccess, result);
|
2011-10-17 12:45:52 +00:00
|
|
|
i::ScriptDataImpl data(log.ExtractData());
|
|
|
|
// Data contains syntax error.
|
|
|
|
CHECK(data.has_error());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-11-11 10:18:48 +00:00
|
|
|
TEST(RegressChromium62639) {
|
2011-08-04 15:18:18 +00:00
|
|
|
v8::V8::Initialize();
|
2013-09-19 09:17:13 +00:00
|
|
|
i::Isolate* isolate = CcTest::i_isolate();
|
2011-08-04 15:18:18 +00:00
|
|
|
|
2010-11-11 10:18:48 +00:00
|
|
|
int marker;
|
2013-09-04 07:05:11 +00:00
|
|
|
isolate->stack_guard()->SetStackLimit(
|
2010-11-11 10:18:48 +00:00
|
|
|
reinterpret_cast<uintptr_t>(&marker) - 128 * 1024);
|
|
|
|
|
2010-11-11 13:47:15 +00:00
|
|
|
const char* program = "var x = 'something';\n"
|
|
|
|
"escape: function() {}";
|
2010-11-11 10:18:48 +00:00
|
|
|
// Fails parsing expecting an identifier after "function".
|
|
|
|
// Before fix, didn't check *ok after Expect(Token::Identifier, ok),
|
|
|
|
// and then used the invalid currently scanned literal. This always
|
|
|
|
// failed in debug mode, and sometimes crashed in release mode.
|
|
|
|
|
2012-03-12 12:35:28 +00:00
|
|
|
i::Utf8ToUtf16CharacterStream stream(
|
|
|
|
reinterpret_cast<const i::byte*>(program),
|
|
|
|
static_cast<unsigned>(strlen(program)));
|
2013-09-04 07:05:11 +00:00
|
|
|
i::ScriptDataImpl* data = i::PreParserApi::PreParse(isolate, &stream);
|
2010-11-11 10:18:48 +00:00
|
|
|
CHECK(data->HasError());
|
|
|
|
delete data;
|
|
|
|
}
|
2010-11-11 11:45:25 +00:00
|
|
|
|
|
|
|
|
|
|
|
TEST(Regress928) {
|
2011-08-04 15:18:18 +00:00
|
|
|
v8::V8::Initialize();
|
2013-09-19 09:17:13 +00:00
|
|
|
i::Isolate* isolate = CcTest::i_isolate();
|
2013-06-04 10:30:05 +00:00
|
|
|
i::Factory* factory = isolate->factory();
|
2011-08-04 15:18:18 +00:00
|
|
|
|
2010-11-11 11:45:25 +00:00
|
|
|
// Preparsing didn't consider the catch clause of a try statement
|
|
|
|
// as with-content, which made it assume that a function inside
|
|
|
|
// the block could be lazily compiled, and an extra, unexpected,
|
|
|
|
// entry was added to the data.
|
|
|
|
int marker;
|
2013-06-04 10:30:05 +00:00
|
|
|
isolate->stack_guard()->SetStackLimit(
|
2010-11-11 11:45:25 +00:00
|
|
|
reinterpret_cast<uintptr_t>(&marker) - 128 * 1024);
|
|
|
|
|
|
|
|
const char* program =
|
|
|
|
"try { } catch (e) { var foo = function () { /* first */ } }"
|
|
|
|
"var bar = function () { /* second */ }";
|
|
|
|
|
2013-09-19 08:54:58 +00:00
|
|
|
v8::HandleScope handles(CcTest::isolate());
|
2011-11-29 08:43:14 +00:00
|
|
|
i::Handle<i::String> source(
|
2013-06-04 10:30:05 +00:00
|
|
|
factory->NewStringFromAscii(i::CStrVector(program)));
|
2012-07-17 11:31:05 +00:00
|
|
|
i::GenericStringUtf16CharacterStream stream(source, 0, source->length());
|
2013-09-04 07:05:11 +00:00
|
|
|
i::ScriptDataImpl* data = i::PreParserApi::PreParse(isolate, &stream);
|
2010-11-11 11:45:25 +00:00
|
|
|
CHECK(!data->HasError());
|
|
|
|
|
|
|
|
data->Initialize();
|
|
|
|
|
2011-02-16 13:37:26 +00:00
|
|
|
int first_function =
|
|
|
|
static_cast<int>(strstr(program, "function") - program);
|
2012-03-12 15:26:05 +00:00
|
|
|
int first_lbrace = first_function + i::StrLength("function () ");
|
2010-11-11 11:45:25 +00:00
|
|
|
CHECK_EQ('{', program[first_lbrace]);
|
|
|
|
i::FunctionEntry entry1 = data->GetFunctionEntry(first_lbrace);
|
|
|
|
CHECK(!entry1.is_valid());
|
|
|
|
|
2011-02-16 13:37:26 +00:00
|
|
|
int second_function =
|
|
|
|
static_cast<int>(strstr(program + first_lbrace, "function") - program);
|
2011-02-16 13:42:26 +00:00
|
|
|
int second_lbrace =
|
2012-03-12 15:26:05 +00:00
|
|
|
second_function + i::StrLength("function () ");
|
2010-11-11 11:45:25 +00:00
|
|
|
CHECK_EQ('{', program[second_lbrace]);
|
|
|
|
i::FunctionEntry entry2 = data->GetFunctionEntry(second_lbrace);
|
|
|
|
CHECK(entry2.is_valid());
|
|
|
|
CHECK_EQ('}', program[entry2.end_pos() - 1]);
|
|
|
|
delete data;
|
|
|
|
}
|
2010-11-29 13:24:37 +00:00
|
|
|
|
|
|
|
|
|
|
|
TEST(PreParseOverflow) {
|
2011-08-04 15:18:18 +00:00
|
|
|
v8::V8::Initialize();
|
|
|
|
|
2010-11-29 13:24:37 +00:00
|
|
|
int marker;
|
2013-09-19 09:17:13 +00:00
|
|
|
CcTest::i_isolate()->stack_guard()->SetStackLimit(
|
2010-11-29 13:24:37 +00:00
|
|
|
reinterpret_cast<uintptr_t>(&marker) - 128 * 1024);
|
|
|
|
|
|
|
|
size_t kProgramSize = 1024 * 1024;
|
2013-05-15 08:59:28 +00:00
|
|
|
i::SmartArrayPointer<char> program(i::NewArray<char>(kProgramSize + 1));
|
2013-12-09 07:41:20 +00:00
|
|
|
memset(program.get(), '(', kProgramSize);
|
2010-11-29 13:24:37 +00:00
|
|
|
program[kProgramSize] = '\0';
|
|
|
|
|
2013-09-19 09:17:13 +00:00
|
|
|
uintptr_t stack_limit = CcTest::i_isolate()->stack_guard()->real_climit();
|
2010-11-29 13:24:37 +00:00
|
|
|
|
2012-03-12 12:35:28 +00:00
|
|
|
i::Utf8ToUtf16CharacterStream stream(
|
2013-12-09 07:41:20 +00:00
|
|
|
reinterpret_cast<const i::byte*>(program.get()),
|
2010-12-07 14:03:59 +00:00
|
|
|
static_cast<unsigned>(kProgramSize));
|
2010-11-29 13:24:37 +00:00
|
|
|
i::CompleteParserRecorder log;
|
2013-09-19 09:17:13 +00:00
|
|
|
i::Scanner scanner(CcTest::i_isolate()->unicode_cache());
|
2010-12-07 14:03:59 +00:00
|
|
|
scanner.Initialize(&stream);
|
2010-11-29 13:24:37 +00:00
|
|
|
|
2013-10-14 13:07:20 +00:00
|
|
|
i::PreParser preparser(&scanner, &log, stack_limit);
|
Refactor parser mode configuration for correctness
This patch refactors the parser and preparser interface to be more
readable and type-safe. It has no behavior changes.
Previously, parsers and preparsers were configured via bitfield called
parser_flags in the Parser constructor, and flags in
PreParser::PreParseProgram, ParserApi::Parse, and ParserApi::PreParse.
This was error-prone in practice: six call sites passed incorrectly
typed values to this interface (a boolean FLAG value, a boolean false
and a boolean true value). None of these errors were caught by the
compiler because it's just an "int".
The parser flags interface was also awkward because it encoded a
language mode, but the language mode was only used to turn on harmony
scoping or not -- it wasn't used to actually set the parser's language
mode.
Fundamentally these errors came in because of the desire for a
procedural parser interface, in ParserApi. Because we need to be able
to configure the parser in various ways, the flags argument got added;
but no one understood how to use the flags properly. Also they were
only used by constructors: callers packed bits, and the constructors
unpacked them into booleans on the parser or preparser.
The solution is to allow parser construction, configuration, and
invocation to be separated. This patch does that.
It passes the existing tests.
BUG=
Review URL: https://codereview.chromium.org/13450007
Patch from Andy Wingo <wingo@igalia.com>.
git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@14151 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
2013-04-05 13:01:06 +00:00
|
|
|
preparser.set_allow_lazy(true);
|
2013-10-14 13:07:20 +00:00
|
|
|
i::PreParser::PreParseResult result = preparser.PreParseProgram();
|
|
|
|
CHECK_EQ(i::PreParser::kPreParseStackOverflow, result);
|
2010-11-29 13:24:37 +00:00
|
|
|
}
|
2010-12-07 14:03:59 +00:00
|
|
|
|
|
|
|
|
|
|
|
class TestExternalResource: public v8::String::ExternalStringResource {
|
|
|
|
public:
|
|
|
|
explicit TestExternalResource(uint16_t* data, int length)
|
|
|
|
: data_(data), length_(static_cast<size_t>(length)) { }
|
|
|
|
|
|
|
|
~TestExternalResource() { }
|
|
|
|
|
|
|
|
const uint16_t* data() const {
|
|
|
|
return data_;
|
|
|
|
}
|
|
|
|
|
|
|
|
size_t length() const {
|
|
|
|
return length_;
|
|
|
|
}
|
|
|
|
private:
|
|
|
|
uint16_t* data_;
|
|
|
|
size_t length_;
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
#define CHECK_EQU(v1, v2) CHECK_EQ(static_cast<int>(v1), static_cast<int>(v2))
|
|
|
|
|
|
|
|
void TestCharacterStream(const char* ascii_source,
|
|
|
|
unsigned length,
|
|
|
|
unsigned start = 0,
|
|
|
|
unsigned end = 0) {
|
|
|
|
if (end == 0) end = length;
|
|
|
|
unsigned sub_length = end - start;
|
2013-09-19 09:17:13 +00:00
|
|
|
i::Isolate* isolate = CcTest::i_isolate();
|
2013-06-04 10:30:05 +00:00
|
|
|
i::Factory* factory = isolate->factory();
|
|
|
|
i::HandleScope test_scope(isolate);
|
2011-09-09 22:39:47 +00:00
|
|
|
i::SmartArrayPointer<i::uc16> uc16_buffer(new i::uc16[length]);
|
2010-12-07 14:03:59 +00:00
|
|
|
for (unsigned i = 0; i < length; i++) {
|
|
|
|
uc16_buffer[i] = static_cast<i::uc16>(ascii_source[i]);
|
|
|
|
}
|
|
|
|
i::Vector<const char> ascii_vector(ascii_source, static_cast<int>(length));
|
|
|
|
i::Handle<i::String> ascii_string(
|
2013-06-04 10:30:05 +00:00
|
|
|
factory->NewStringFromAscii(ascii_vector));
|
2013-12-09 07:41:20 +00:00
|
|
|
TestExternalResource resource(uc16_buffer.get(), length);
|
2010-12-07 14:03:59 +00:00
|
|
|
i::Handle<i::String> uc16_string(
|
2013-06-04 10:30:05 +00:00
|
|
|
factory->NewExternalStringFromTwoByte(&resource));
|
2010-12-07 14:03:59 +00:00
|
|
|
|
2012-03-12 12:35:28 +00:00
|
|
|
i::ExternalTwoByteStringUtf16CharacterStream uc16_stream(
|
2010-12-07 14:03:59 +00:00
|
|
|
i::Handle<i::ExternalTwoByteString>::cast(uc16_string), start, end);
|
2012-03-12 12:35:28 +00:00
|
|
|
i::GenericStringUtf16CharacterStream string_stream(ascii_string, start, end);
|
|
|
|
i::Utf8ToUtf16CharacterStream utf8_stream(
|
2010-12-07 14:03:59 +00:00
|
|
|
reinterpret_cast<const i::byte*>(ascii_source), end);
|
|
|
|
utf8_stream.SeekForward(start);
|
|
|
|
|
|
|
|
unsigned i = start;
|
|
|
|
while (i < end) {
|
|
|
|
// Read streams one char at a time
|
|
|
|
CHECK_EQU(i, uc16_stream.pos());
|
|
|
|
CHECK_EQU(i, string_stream.pos());
|
|
|
|
CHECK_EQU(i, utf8_stream.pos());
|
|
|
|
int32_t c0 = ascii_source[i];
|
|
|
|
int32_t c1 = uc16_stream.Advance();
|
|
|
|
int32_t c2 = string_stream.Advance();
|
|
|
|
int32_t c3 = utf8_stream.Advance();
|
|
|
|
i++;
|
|
|
|
CHECK_EQ(c0, c1);
|
|
|
|
CHECK_EQ(c0, c2);
|
|
|
|
CHECK_EQ(c0, c3);
|
|
|
|
CHECK_EQU(i, uc16_stream.pos());
|
|
|
|
CHECK_EQU(i, string_stream.pos());
|
|
|
|
CHECK_EQU(i, utf8_stream.pos());
|
|
|
|
}
|
|
|
|
while (i > start + sub_length / 4) {
|
|
|
|
// Pushback, re-read, pushback again.
|
|
|
|
int32_t c0 = ascii_source[i - 1];
|
|
|
|
CHECK_EQU(i, uc16_stream.pos());
|
|
|
|
CHECK_EQU(i, string_stream.pos());
|
|
|
|
CHECK_EQU(i, utf8_stream.pos());
|
|
|
|
uc16_stream.PushBack(c0);
|
|
|
|
string_stream.PushBack(c0);
|
|
|
|
utf8_stream.PushBack(c0);
|
|
|
|
i--;
|
|
|
|
CHECK_EQU(i, uc16_stream.pos());
|
|
|
|
CHECK_EQU(i, string_stream.pos());
|
|
|
|
CHECK_EQU(i, utf8_stream.pos());
|
|
|
|
int32_t c1 = uc16_stream.Advance();
|
|
|
|
int32_t c2 = string_stream.Advance();
|
|
|
|
int32_t c3 = utf8_stream.Advance();
|
|
|
|
i++;
|
|
|
|
CHECK_EQU(i, uc16_stream.pos());
|
|
|
|
CHECK_EQU(i, string_stream.pos());
|
|
|
|
CHECK_EQU(i, utf8_stream.pos());
|
|
|
|
CHECK_EQ(c0, c1);
|
|
|
|
CHECK_EQ(c0, c2);
|
|
|
|
CHECK_EQ(c0, c3);
|
|
|
|
uc16_stream.PushBack(c0);
|
|
|
|
string_stream.PushBack(c0);
|
|
|
|
utf8_stream.PushBack(c0);
|
|
|
|
i--;
|
|
|
|
CHECK_EQU(i, uc16_stream.pos());
|
|
|
|
CHECK_EQU(i, string_stream.pos());
|
|
|
|
CHECK_EQU(i, utf8_stream.pos());
|
|
|
|
}
|
|
|
|
unsigned halfway = start + sub_length / 2;
|
|
|
|
uc16_stream.SeekForward(halfway - i);
|
|
|
|
string_stream.SeekForward(halfway - i);
|
|
|
|
utf8_stream.SeekForward(halfway - i);
|
|
|
|
i = halfway;
|
|
|
|
CHECK_EQU(i, uc16_stream.pos());
|
|
|
|
CHECK_EQU(i, string_stream.pos());
|
|
|
|
CHECK_EQU(i, utf8_stream.pos());
|
|
|
|
|
|
|
|
while (i < end) {
|
|
|
|
// Read streams one char at a time
|
|
|
|
CHECK_EQU(i, uc16_stream.pos());
|
|
|
|
CHECK_EQU(i, string_stream.pos());
|
|
|
|
CHECK_EQU(i, utf8_stream.pos());
|
|
|
|
int32_t c0 = ascii_source[i];
|
|
|
|
int32_t c1 = uc16_stream.Advance();
|
|
|
|
int32_t c2 = string_stream.Advance();
|
|
|
|
int32_t c3 = utf8_stream.Advance();
|
|
|
|
i++;
|
|
|
|
CHECK_EQ(c0, c1);
|
|
|
|
CHECK_EQ(c0, c2);
|
|
|
|
CHECK_EQ(c0, c3);
|
|
|
|
CHECK_EQU(i, uc16_stream.pos());
|
|
|
|
CHECK_EQU(i, string_stream.pos());
|
|
|
|
CHECK_EQU(i, utf8_stream.pos());
|
|
|
|
}
|
|
|
|
|
|
|
|
int32_t c1 = uc16_stream.Advance();
|
|
|
|
int32_t c2 = string_stream.Advance();
|
|
|
|
int32_t c3 = utf8_stream.Advance();
|
|
|
|
CHECK_LT(c1, 0);
|
|
|
|
CHECK_LT(c2, 0);
|
|
|
|
CHECK_LT(c3, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
TEST(CharacterStreams) {
|
2013-09-19 08:54:58 +00:00
|
|
|
v8::Isolate* isolate = CcTest::isolate();
|
2013-05-08 07:45:16 +00:00
|
|
|
v8::HandleScope handles(isolate);
|
|
|
|
v8::Local<v8::Context> context = v8::Context::New(isolate);
|
|
|
|
v8::Context::Scope context_scope(context);
|
2010-12-07 14:03:59 +00:00
|
|
|
|
|
|
|
TestCharacterStream("abc\0\n\r\x7f", 7);
|
|
|
|
static const unsigned kBigStringSize = 4096;
|
|
|
|
char buffer[kBigStringSize + 1];
|
|
|
|
for (unsigned i = 0; i < kBigStringSize; i++) {
|
|
|
|
buffer[i] = static_cast<char>(i & 0x7f);
|
|
|
|
}
|
|
|
|
TestCharacterStream(buffer, kBigStringSize);
|
|
|
|
|
|
|
|
TestCharacterStream(buffer, kBigStringSize, 576, 3298);
|
|
|
|
|
|
|
|
TestCharacterStream("\0", 1);
|
|
|
|
TestCharacterStream("", 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
TEST(Utf8CharacterStream) {
|
|
|
|
static const unsigned kMaxUC16CharU = unibrow::Utf8::kMaxThreeByteChar;
|
|
|
|
static const int kMaxUC16Char = static_cast<int>(kMaxUC16CharU);
|
|
|
|
|
|
|
|
static const int kAllUtf8CharsSize =
|
|
|
|
(unibrow::Utf8::kMaxOneByteChar + 1) +
|
|
|
|
(unibrow::Utf8::kMaxTwoByteChar - unibrow::Utf8::kMaxOneByteChar) * 2 +
|
|
|
|
(unibrow::Utf8::kMaxThreeByteChar - unibrow::Utf8::kMaxTwoByteChar) * 3;
|
|
|
|
static const unsigned kAllUtf8CharsSizeU =
|
|
|
|
static_cast<unsigned>(kAllUtf8CharsSize);
|
|
|
|
|
|
|
|
char buffer[kAllUtf8CharsSizeU];
|
|
|
|
unsigned cursor = 0;
|
|
|
|
for (int i = 0; i <= kMaxUC16Char; i++) {
|
2012-03-12 12:35:28 +00:00
|
|
|
cursor += unibrow::Utf8::Encode(buffer + cursor,
|
|
|
|
i,
|
|
|
|
unibrow::Utf16::kNoPreviousCharacter);
|
2010-12-07 14:03:59 +00:00
|
|
|
}
|
|
|
|
ASSERT(cursor == kAllUtf8CharsSizeU);
|
|
|
|
|
2012-03-12 12:35:28 +00:00
|
|
|
i::Utf8ToUtf16CharacterStream stream(reinterpret_cast<const i::byte*>(buffer),
|
|
|
|
kAllUtf8CharsSizeU);
|
2010-12-07 14:03:59 +00:00
|
|
|
for (int i = 0; i <= kMaxUC16Char; i++) {
|
|
|
|
CHECK_EQU(i, stream.pos());
|
|
|
|
int32_t c = stream.Advance();
|
|
|
|
CHECK_EQ(i, c);
|
|
|
|
CHECK_EQU(i + 1, stream.pos());
|
|
|
|
}
|
|
|
|
for (int i = kMaxUC16Char; i >= 0; i--) {
|
|
|
|
CHECK_EQU(i + 1, stream.pos());
|
|
|
|
stream.PushBack(i);
|
|
|
|
CHECK_EQU(i, stream.pos());
|
|
|
|
}
|
|
|
|
int i = 0;
|
|
|
|
while (stream.pos() < kMaxUC16CharU) {
|
|
|
|
CHECK_EQU(i, stream.pos());
|
|
|
|
unsigned progress = stream.SeekForward(12);
|
|
|
|
i += progress;
|
|
|
|
int32_t c = stream.Advance();
|
|
|
|
if (i <= kMaxUC16Char) {
|
|
|
|
CHECK_EQ(i, c);
|
|
|
|
} else {
|
|
|
|
CHECK_EQ(-1, c);
|
|
|
|
}
|
|
|
|
i += 1;
|
|
|
|
CHECK_EQU(i, stream.pos());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#undef CHECK_EQU
|
|
|
|
|
2012-03-12 12:35:28 +00:00
|
|
|
void TestStreamScanner(i::Utf16CharacterStream* stream,
|
2010-12-07 14:03:59 +00:00
|
|
|
i::Token::Value* expected_tokens,
|
|
|
|
int skip_pos = 0, // Zero means not skipping.
|
|
|
|
int skip_to = 0) {
|
2013-09-19 09:17:13 +00:00
|
|
|
i::Scanner scanner(CcTest::i_isolate()->unicode_cache());
|
2010-12-22 20:14:19 +00:00
|
|
|
scanner.Initialize(stream);
|
2010-12-07 14:03:59 +00:00
|
|
|
|
|
|
|
int i = 0;
|
|
|
|
do {
|
|
|
|
i::Token::Value expected = expected_tokens[i];
|
|
|
|
i::Token::Value actual = scanner.Next();
|
|
|
|
CHECK_EQ(i::Token::String(expected), i::Token::String(actual));
|
|
|
|
if (scanner.location().end_pos == skip_pos) {
|
|
|
|
scanner.SeekForward(skip_to);
|
|
|
|
}
|
|
|
|
i++;
|
|
|
|
} while (expected_tokens[i] != i::Token::ILLEGAL);
|
|
|
|
}
|
|
|
|
|
2013-07-05 09:52:11 +00:00
|
|
|
|
2010-12-07 14:03:59 +00:00
|
|
|
TEST(StreamScanner) {
|
2011-08-04 15:18:18 +00:00
|
|
|
v8::V8::Initialize();
|
|
|
|
|
2010-12-07 14:03:59 +00:00
|
|
|
const char* str1 = "{ foo get for : */ <- \n\n /*foo*/ bib";
|
2012-03-12 12:35:28 +00:00
|
|
|
i::Utf8ToUtf16CharacterStream stream1(reinterpret_cast<const i::byte*>(str1),
|
|
|
|
static_cast<unsigned>(strlen(str1)));
|
2010-12-07 14:03:59 +00:00
|
|
|
i::Token::Value expectations1[] = {
|
|
|
|
i::Token::LBRACE,
|
|
|
|
i::Token::IDENTIFIER,
|
|
|
|
i::Token::IDENTIFIER,
|
|
|
|
i::Token::FOR,
|
|
|
|
i::Token::COLON,
|
|
|
|
i::Token::MUL,
|
|
|
|
i::Token::DIV,
|
|
|
|
i::Token::LT,
|
|
|
|
i::Token::SUB,
|
|
|
|
i::Token::IDENTIFIER,
|
|
|
|
i::Token::EOS,
|
|
|
|
i::Token::ILLEGAL
|
|
|
|
};
|
|
|
|
TestStreamScanner(&stream1, expectations1, 0, 0);
|
|
|
|
|
|
|
|
const char* str2 = "case default const {THIS\nPART\nSKIPPED} do";
|
2012-03-12 12:35:28 +00:00
|
|
|
i::Utf8ToUtf16CharacterStream stream2(reinterpret_cast<const i::byte*>(str2),
|
|
|
|
static_cast<unsigned>(strlen(str2)));
|
2010-12-07 14:03:59 +00:00
|
|
|
i::Token::Value expectations2[] = {
|
|
|
|
i::Token::CASE,
|
|
|
|
i::Token::DEFAULT,
|
|
|
|
i::Token::CONST,
|
|
|
|
i::Token::LBRACE,
|
|
|
|
// Skipped part here
|
|
|
|
i::Token::RBRACE,
|
|
|
|
i::Token::DO,
|
|
|
|
i::Token::EOS,
|
|
|
|
i::Token::ILLEGAL
|
|
|
|
};
|
|
|
|
ASSERT_EQ('{', str2[19]);
|
|
|
|
ASSERT_EQ('}', str2[37]);
|
|
|
|
TestStreamScanner(&stream2, expectations2, 20, 37);
|
|
|
|
|
|
|
|
const char* str3 = "{}}}}";
|
|
|
|
i::Token::Value expectations3[] = {
|
|
|
|
i::Token::LBRACE,
|
|
|
|
i::Token::RBRACE,
|
|
|
|
i::Token::RBRACE,
|
|
|
|
i::Token::RBRACE,
|
|
|
|
i::Token::RBRACE,
|
|
|
|
i::Token::EOS,
|
|
|
|
i::Token::ILLEGAL
|
|
|
|
};
|
|
|
|
// Skip zero-four RBRACEs.
|
|
|
|
for (int i = 0; i <= 4; i++) {
|
|
|
|
expectations3[6 - i] = i::Token::ILLEGAL;
|
|
|
|
expectations3[5 - i] = i::Token::EOS;
|
2012-03-12 12:35:28 +00:00
|
|
|
i::Utf8ToUtf16CharacterStream stream3(
|
2010-12-07 14:03:59 +00:00
|
|
|
reinterpret_cast<const i::byte*>(str3),
|
|
|
|
static_cast<unsigned>(strlen(str3)));
|
|
|
|
TestStreamScanner(&stream3, expectations3, 1, 1 + i);
|
|
|
|
}
|
|
|
|
}
|
2011-01-07 12:35:42 +00:00
|
|
|
|
|
|
|
|
|
|
|
void TestScanRegExp(const char* re_source, const char* expected) {
|
2012-03-12 12:35:28 +00:00
|
|
|
i::Utf8ToUtf16CharacterStream stream(
|
2011-01-07 12:35:42 +00:00
|
|
|
reinterpret_cast<const i::byte*>(re_source),
|
|
|
|
static_cast<unsigned>(strlen(re_source)));
|
2013-09-19 09:17:13 +00:00
|
|
|
i::Scanner scanner(CcTest::i_isolate()->unicode_cache());
|
2011-01-07 12:35:42 +00:00
|
|
|
scanner.Initialize(&stream);
|
|
|
|
|
|
|
|
i::Token::Value start = scanner.peek();
|
|
|
|
CHECK(start == i::Token::DIV || start == i::Token::ASSIGN_DIV);
|
|
|
|
CHECK(scanner.ScanRegExpPattern(start == i::Token::ASSIGN_DIV));
|
|
|
|
scanner.Next(); // Current token is now the regexp literal.
|
|
|
|
CHECK(scanner.is_literal_ascii());
|
|
|
|
i::Vector<const char> actual = scanner.literal_ascii_string();
|
|
|
|
for (int i = 0; i < actual.length(); i++) {
|
|
|
|
CHECK_NE('\0', expected[i]);
|
|
|
|
CHECK_EQ(expected[i], actual[i]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
TEST(RegExpScanning) {
|
2011-08-04 15:18:18 +00:00
|
|
|
v8::V8::Initialize();
|
|
|
|
|
2011-01-07 12:35:42 +00:00
|
|
|
// RegExp token with added garbage at the end. The scanner should only
|
|
|
|
// scan the RegExp until the terminating slash just before "flipperwald".
|
|
|
|
TestScanRegExp("/b/flipperwald", "b");
|
|
|
|
// Incomplete escape sequences doesn't hide the terminating slash.
|
|
|
|
TestScanRegExp("/\\x/flipperwald", "\\x");
|
|
|
|
TestScanRegExp("/\\u/flipperwald", "\\u");
|
|
|
|
TestScanRegExp("/\\u1/flipperwald", "\\u1");
|
|
|
|
TestScanRegExp("/\\u12/flipperwald", "\\u12");
|
|
|
|
TestScanRegExp("/\\u123/flipperwald", "\\u123");
|
|
|
|
TestScanRegExp("/\\c/flipperwald", "\\c");
|
|
|
|
TestScanRegExp("/\\c//flipperwald", "\\c");
|
|
|
|
// Slashes inside character classes are not terminating.
|
|
|
|
TestScanRegExp("/[/]/flipperwald", "[/]");
|
|
|
|
TestScanRegExp("/[\\s-/]/flipperwald", "[\\s-/]");
|
|
|
|
// Incomplete escape sequences inside a character class doesn't hide
|
|
|
|
// the end of the character class.
|
|
|
|
TestScanRegExp("/[\\c/]/flipperwald", "[\\c/]");
|
|
|
|
TestScanRegExp("/[\\c]/flipperwald", "[\\c]");
|
|
|
|
TestScanRegExp("/[\\x]/flipperwald", "[\\x]");
|
|
|
|
TestScanRegExp("/[\\x1]/flipperwald", "[\\x1]");
|
|
|
|
TestScanRegExp("/[\\u]/flipperwald", "[\\u]");
|
|
|
|
TestScanRegExp("/[\\u1]/flipperwald", "[\\u1]");
|
|
|
|
TestScanRegExp("/[\\u12]/flipperwald", "[\\u12]");
|
|
|
|
TestScanRegExp("/[\\u123]/flipperwald", "[\\u123]");
|
|
|
|
// Escaped ']'s wont end the character class.
|
|
|
|
TestScanRegExp("/[\\]/]/flipperwald", "[\\]/]");
|
|
|
|
// Escaped slashes are not terminating.
|
|
|
|
TestScanRegExp("/\\//flipperwald", "\\/");
|
|
|
|
// Starting with '=' works too.
|
|
|
|
TestScanRegExp("/=/", "=");
|
|
|
|
TestScanRegExp("/=?/", "=?");
|
|
|
|
}
|
2011-10-21 10:26:59 +00:00
|
|
|
|
|
|
|
|
2012-03-12 12:35:28 +00:00
|
|
|
static int Utf8LengthHelper(const char* s) {
|
2012-03-12 15:26:05 +00:00
|
|
|
int len = i::StrLength(s);
|
2012-03-12 12:35:28 +00:00
|
|
|
int character_length = len;
|
|
|
|
for (int i = 0; i < len; i++) {
|
|
|
|
unsigned char c = s[i];
|
|
|
|
int input_offset = 0;
|
|
|
|
int output_adjust = 0;
|
|
|
|
if (c > 0x7f) {
|
|
|
|
if (c < 0xc0) continue;
|
|
|
|
if (c >= 0xf0) {
|
|
|
|
if (c >= 0xf8) {
|
|
|
|
// 5 and 6 byte UTF-8 sequences turn into a kBadChar for each UTF-8
|
|
|
|
// byte.
|
|
|
|
continue; // Handle first UTF-8 byte.
|
|
|
|
}
|
|
|
|
if ((c & 7) == 0 && ((s[i + 1] & 0x30) == 0)) {
|
|
|
|
// This 4 byte sequence could have been coded as a 3 byte sequence.
|
|
|
|
// Record a single kBadChar for the first byte and continue.
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
input_offset = 3;
|
|
|
|
// 4 bytes of UTF-8 turn into 2 UTF-16 code units.
|
|
|
|
character_length -= 2;
|
|
|
|
} else if (c >= 0xe0) {
|
|
|
|
if ((c & 0xf) == 0 && ((s[i + 1] & 0x20) == 0)) {
|
|
|
|
// This 3 byte sequence could have been coded as a 2 byte sequence.
|
|
|
|
// Record a single kBadChar for the first byte and continue.
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
input_offset = 2;
|
|
|
|
// 3 bytes of UTF-8 turn into 1 UTF-16 code unit.
|
|
|
|
output_adjust = 2;
|
|
|
|
} else {
|
|
|
|
if ((c & 0x1e) == 0) {
|
|
|
|
// This 2 byte sequence could have been coded as a 1 byte sequence.
|
|
|
|
// Record a single kBadChar for the first byte and continue.
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
input_offset = 1;
|
|
|
|
// 2 bytes of UTF-8 turn into 1 UTF-16 code unit.
|
|
|
|
output_adjust = 1;
|
|
|
|
}
|
|
|
|
bool bad = false;
|
|
|
|
for (int j = 1; j <= input_offset; j++) {
|
|
|
|
if ((s[i + j] & 0xc0) != 0x80) {
|
|
|
|
// Bad UTF-8 sequence turns the first in the sequence into kBadChar,
|
|
|
|
// which is a single UTF-16 code unit.
|
|
|
|
bad = true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!bad) {
|
|
|
|
i += input_offset;
|
|
|
|
character_length -= output_adjust;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return character_length;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2011-10-21 10:26:59 +00:00
|
|
|
TEST(ScopePositions) {
|
|
|
|
// Test the parser for correctly setting the start and end positions
|
|
|
|
// of a scope. We check the scope positions of exactly one scope
|
|
|
|
// nested in the global scope of a program. 'inner source' is the
|
|
|
|
// source code that determines the part of the source belonging
|
|
|
|
// to the nested scope. 'outer_prefix' and 'outer_suffix' are
|
|
|
|
// parts of the source that belong to the global scope.
|
|
|
|
struct SourceData {
|
|
|
|
const char* outer_prefix;
|
|
|
|
const char* inner_source;
|
|
|
|
const char* outer_suffix;
|
|
|
|
i::ScopeType scope_type;
|
2011-11-24 15:17:04 +00:00
|
|
|
i::LanguageMode language_mode;
|
2011-10-21 10:26:59 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
const SourceData source_data[] = {
|
2011-11-24 15:17:04 +00:00
|
|
|
{ " with ({}) ", "{ block; }", " more;", i::WITH_SCOPE, i::CLASSIC_MODE },
|
|
|
|
{ " with ({}) ", "{ block; }", "; more;", i::WITH_SCOPE, i::CLASSIC_MODE },
|
2011-10-21 10:26:59 +00:00
|
|
|
{ " with ({}) ", "{\n"
|
|
|
|
" block;\n"
|
|
|
|
" }", "\n"
|
2011-11-24 15:17:04 +00:00
|
|
|
" more;", i::WITH_SCOPE, i::CLASSIC_MODE },
|
|
|
|
{ " with ({}) ", "statement;", " more;", i::WITH_SCOPE, i::CLASSIC_MODE },
|
2011-10-21 10:26:59 +00:00
|
|
|
{ " with ({}) ", "statement", "\n"
|
2011-11-24 15:17:04 +00:00
|
|
|
" more;", i::WITH_SCOPE, i::CLASSIC_MODE },
|
2011-10-21 10:26:59 +00:00
|
|
|
{ " with ({})\n"
|
|
|
|
" ", "statement;", "\n"
|
2011-11-24 15:17:04 +00:00
|
|
|
" more;", i::WITH_SCOPE, i::CLASSIC_MODE },
|
|
|
|
{ " try {} catch ", "(e) { block; }", " more;",
|
|
|
|
i::CATCH_SCOPE, i::CLASSIC_MODE },
|
|
|
|
{ " try {} catch ", "(e) { block; }", "; more;",
|
|
|
|
i::CATCH_SCOPE, i::CLASSIC_MODE },
|
2011-10-21 10:26:59 +00:00
|
|
|
{ " try {} catch ", "(e) {\n"
|
|
|
|
" block;\n"
|
|
|
|
" }", "\n"
|
2011-11-24 15:17:04 +00:00
|
|
|
" more;", i::CATCH_SCOPE, i::CLASSIC_MODE },
|
2011-10-21 10:26:59 +00:00
|
|
|
{ " try {} catch ", "(e) { block; }", " finally { block; } more;",
|
2011-11-24 15:17:04 +00:00
|
|
|
i::CATCH_SCOPE, i::CLASSIC_MODE },
|
2011-10-21 10:26:59 +00:00
|
|
|
{ " start;\n"
|
2011-11-24 15:17:04 +00:00
|
|
|
" ", "{ let block; }", " more;", i::BLOCK_SCOPE, i::EXTENDED_MODE },
|
2011-10-21 10:26:59 +00:00
|
|
|
{ " start;\n"
|
2011-11-24 15:17:04 +00:00
|
|
|
" ", "{ let block; }", "; more;", i::BLOCK_SCOPE, i::EXTENDED_MODE },
|
2011-10-21 10:26:59 +00:00
|
|
|
{ " start;\n"
|
|
|
|
" ", "{\n"
|
|
|
|
" let block;\n"
|
|
|
|
" }", "\n"
|
2011-11-24 15:17:04 +00:00
|
|
|
" more;", i::BLOCK_SCOPE, i::EXTENDED_MODE },
|
2011-10-21 10:26:59 +00:00
|
|
|
{ " start;\n"
|
|
|
|
" function fun", "(a,b) { infunction; }", " more;",
|
2011-11-24 15:17:04 +00:00
|
|
|
i::FUNCTION_SCOPE, i::CLASSIC_MODE },
|
2011-10-21 10:26:59 +00:00
|
|
|
{ " start;\n"
|
|
|
|
" function fun", "(a,b) {\n"
|
|
|
|
" infunction;\n"
|
|
|
|
" }", "\n"
|
2011-11-24 15:17:04 +00:00
|
|
|
" more;", i::FUNCTION_SCOPE, i::CLASSIC_MODE },
|
2011-10-21 10:26:59 +00:00
|
|
|
{ " (function fun", "(a,b) { infunction; }", ")();",
|
2011-11-24 15:17:04 +00:00
|
|
|
i::FUNCTION_SCOPE, i::CLASSIC_MODE },
|
2011-10-21 10:26:59 +00:00
|
|
|
{ " for ", "(let x = 1 ; x < 10; ++ x) { block; }", " more;",
|
2011-11-24 15:17:04 +00:00
|
|
|
i::BLOCK_SCOPE, i::EXTENDED_MODE },
|
2011-10-21 10:26:59 +00:00
|
|
|
{ " for ", "(let x = 1 ; x < 10; ++ x) { block; }", "; more;",
|
2011-11-24 15:17:04 +00:00
|
|
|
i::BLOCK_SCOPE, i::EXTENDED_MODE },
|
2011-10-21 10:26:59 +00:00
|
|
|
{ " for ", "(let x = 1 ; x < 10; ++ x) {\n"
|
|
|
|
" block;\n"
|
|
|
|
" }", "\n"
|
2011-11-24 15:17:04 +00:00
|
|
|
" more;", i::BLOCK_SCOPE, i::EXTENDED_MODE },
|
2011-10-21 10:26:59 +00:00
|
|
|
{ " for ", "(let x = 1 ; x < 10; ++ x) statement;", " more;",
|
2011-11-24 15:17:04 +00:00
|
|
|
i::BLOCK_SCOPE, i::EXTENDED_MODE },
|
2011-10-21 10:26:59 +00:00
|
|
|
{ " for ", "(let x = 1 ; x < 10; ++ x) statement", "\n"
|
2011-11-24 15:17:04 +00:00
|
|
|
" more;", i::BLOCK_SCOPE, i::EXTENDED_MODE },
|
2011-10-21 10:26:59 +00:00
|
|
|
{ " for ", "(let x = 1 ; x < 10; ++ x)\n"
|
|
|
|
" statement;", "\n"
|
2011-11-24 15:17:04 +00:00
|
|
|
" more;", i::BLOCK_SCOPE, i::EXTENDED_MODE },
|
|
|
|
{ " for ", "(let x in {}) { block; }", " more;",
|
|
|
|
i::BLOCK_SCOPE, i::EXTENDED_MODE },
|
|
|
|
{ " for ", "(let x in {}) { block; }", "; more;",
|
|
|
|
i::BLOCK_SCOPE, i::EXTENDED_MODE },
|
2011-10-21 10:26:59 +00:00
|
|
|
{ " for ", "(let x in {}) {\n"
|
|
|
|
" block;\n"
|
|
|
|
" }", "\n"
|
2011-11-24 15:17:04 +00:00
|
|
|
" more;", i::BLOCK_SCOPE, i::EXTENDED_MODE },
|
|
|
|
{ " for ", "(let x in {}) statement;", " more;",
|
|
|
|
i::BLOCK_SCOPE, i::EXTENDED_MODE },
|
2011-10-21 10:26:59 +00:00
|
|
|
{ " for ", "(let x in {}) statement", "\n"
|
2011-11-24 15:17:04 +00:00
|
|
|
" more;", i::BLOCK_SCOPE, i::EXTENDED_MODE },
|
2011-10-21 10:26:59 +00:00
|
|
|
{ " for ", "(let x in {})\n"
|
|
|
|
" statement;", "\n"
|
2011-11-24 15:17:04 +00:00
|
|
|
" more;", i::BLOCK_SCOPE, i::EXTENDED_MODE },
|
2012-03-12 12:35:28 +00:00
|
|
|
// Check that 6-byte and 4-byte encodings of UTF-8 strings do not throw
|
|
|
|
// the preparser off in terms of byte offsets.
|
|
|
|
// 6 byte encoding.
|
|
|
|
{ " 'foo\355\240\201\355\260\211';\n"
|
|
|
|
" (function fun", "(a,b) { infunction; }", ")();",
|
|
|
|
i::FUNCTION_SCOPE, i::CLASSIC_MODE },
|
|
|
|
// 4 byte encoding.
|
|
|
|
{ " 'foo\360\220\220\212';\n"
|
|
|
|
" (function fun", "(a,b) { infunction; }", ")();",
|
|
|
|
i::FUNCTION_SCOPE, i::CLASSIC_MODE },
|
|
|
|
// 3 byte encoding of \u0fff.
|
|
|
|
{ " 'foo\340\277\277';\n"
|
|
|
|
" (function fun", "(a,b) { infunction; }", ")();",
|
|
|
|
i::FUNCTION_SCOPE, i::CLASSIC_MODE },
|
|
|
|
// Broken 6 byte encoding with missing last byte.
|
|
|
|
{ " 'foo\355\240\201\355\211';\n"
|
|
|
|
" (function fun", "(a,b) { infunction; }", ")();",
|
|
|
|
i::FUNCTION_SCOPE, i::CLASSIC_MODE },
|
|
|
|
// Broken 3 byte encoding of \u0fff with missing last byte.
|
|
|
|
{ " 'foo\340\277';\n"
|
|
|
|
" (function fun", "(a,b) { infunction; }", ")();",
|
|
|
|
i::FUNCTION_SCOPE, i::CLASSIC_MODE },
|
|
|
|
// Broken 3 byte encoding of \u0fff with missing 2 last bytes.
|
|
|
|
{ " 'foo\340';\n"
|
|
|
|
" (function fun", "(a,b) { infunction; }", ")();",
|
|
|
|
i::FUNCTION_SCOPE, i::CLASSIC_MODE },
|
|
|
|
// Broken 3 byte encoding of \u00ff should be a 2 byte encoding.
|
|
|
|
{ " 'foo\340\203\277';\n"
|
|
|
|
" (function fun", "(a,b) { infunction; }", ")();",
|
|
|
|
i::FUNCTION_SCOPE, i::CLASSIC_MODE },
|
|
|
|
// Broken 3 byte encoding of \u007f should be a 2 byte encoding.
|
|
|
|
{ " 'foo\340\201\277';\n"
|
|
|
|
" (function fun", "(a,b) { infunction; }", ")();",
|
|
|
|
i::FUNCTION_SCOPE, i::CLASSIC_MODE },
|
|
|
|
// Unpaired lead surrogate.
|
|
|
|
{ " 'foo\355\240\201';\n"
|
|
|
|
" (function fun", "(a,b) { infunction; }", ")();",
|
|
|
|
i::FUNCTION_SCOPE, i::CLASSIC_MODE },
|
|
|
|
// Unpaired lead surrogate where following code point is a 3 byte sequence.
|
|
|
|
{ " 'foo\355\240\201\340\277\277';\n"
|
|
|
|
" (function fun", "(a,b) { infunction; }", ")();",
|
|
|
|
i::FUNCTION_SCOPE, i::CLASSIC_MODE },
|
|
|
|
// Unpaired lead surrogate where following code point is a 4 byte encoding
|
|
|
|
// of a trail surrogate.
|
|
|
|
{ " 'foo\355\240\201\360\215\260\211';\n"
|
|
|
|
" (function fun", "(a,b) { infunction; }", ")();",
|
|
|
|
i::FUNCTION_SCOPE, i::CLASSIC_MODE },
|
|
|
|
// Unpaired trail surrogate.
|
|
|
|
{ " 'foo\355\260\211';\n"
|
|
|
|
" (function fun", "(a,b) { infunction; }", ")();",
|
|
|
|
i::FUNCTION_SCOPE, i::CLASSIC_MODE },
|
|
|
|
// 2 byte encoding of \u00ff.
|
|
|
|
{ " 'foo\303\277';\n"
|
|
|
|
" (function fun", "(a,b) { infunction; }", ")();",
|
|
|
|
i::FUNCTION_SCOPE, i::CLASSIC_MODE },
|
|
|
|
// Broken 2 byte encoding of \u00ff with missing last byte.
|
|
|
|
{ " 'foo\303';\n"
|
|
|
|
" (function fun", "(a,b) { infunction; }", ")();",
|
|
|
|
i::FUNCTION_SCOPE, i::CLASSIC_MODE },
|
|
|
|
// Broken 2 byte encoding of \u007f should be a 1 byte encoding.
|
|
|
|
{ " 'foo\301\277';\n"
|
|
|
|
" (function fun", "(a,b) { infunction; }", ")();",
|
|
|
|
i::FUNCTION_SCOPE, i::CLASSIC_MODE },
|
|
|
|
// Illegal 5 byte encoding.
|
|
|
|
{ " 'foo\370\277\277\277\277';\n"
|
|
|
|
" (function fun", "(a,b) { infunction; }", ")();",
|
|
|
|
i::FUNCTION_SCOPE, i::CLASSIC_MODE },
|
|
|
|
// Illegal 6 byte encoding.
|
|
|
|
{ " 'foo\374\277\277\277\277\277';\n"
|
|
|
|
" (function fun", "(a,b) { infunction; }", ")();",
|
|
|
|
i::FUNCTION_SCOPE, i::CLASSIC_MODE },
|
|
|
|
// Illegal 0xfe byte
|
|
|
|
{ " 'foo\376\277\277\277\277\277\277';\n"
|
|
|
|
" (function fun", "(a,b) { infunction; }", ")();",
|
|
|
|
i::FUNCTION_SCOPE, i::CLASSIC_MODE },
|
|
|
|
// Illegal 0xff byte
|
|
|
|
{ " 'foo\377\277\277\277\277\277\277\277';\n"
|
|
|
|
" (function fun", "(a,b) { infunction; }", ")();",
|
|
|
|
i::FUNCTION_SCOPE, i::CLASSIC_MODE },
|
|
|
|
{ " 'foo';\n"
|
|
|
|
" (function fun", "(a,b) { 'bar\355\240\201\355\260\213'; }", ")();",
|
|
|
|
i::FUNCTION_SCOPE, i::CLASSIC_MODE },
|
|
|
|
{ " 'foo';\n"
|
|
|
|
" (function fun", "(a,b) { 'bar\360\220\220\214'; }", ")();",
|
|
|
|
i::FUNCTION_SCOPE, i::CLASSIC_MODE },
|
2011-11-24 15:17:04 +00:00
|
|
|
{ NULL, NULL, NULL, i::EVAL_SCOPE, i::CLASSIC_MODE }
|
2011-10-21 10:26:59 +00:00
|
|
|
};
|
|
|
|
|
2013-09-19 09:17:13 +00:00
|
|
|
i::Isolate* isolate = CcTest::i_isolate();
|
2013-06-04 10:30:05 +00:00
|
|
|
i::Factory* factory = isolate->factory();
|
|
|
|
|
2013-09-19 08:54:58 +00:00
|
|
|
v8::HandleScope handles(CcTest::isolate());
|
|
|
|
v8::Handle<v8::Context> context = v8::Context::New(CcTest::isolate());
|
2011-10-21 10:26:59 +00:00
|
|
|
v8::Context::Scope context_scope(context);
|
|
|
|
|
|
|
|
int marker;
|
2013-06-04 10:30:05 +00:00
|
|
|
isolate->stack_guard()->SetStackLimit(
|
2011-10-21 10:26:59 +00:00
|
|
|
reinterpret_cast<uintptr_t>(&marker) - 128 * 1024);
|
|
|
|
|
|
|
|
for (int i = 0; source_data[i].outer_prefix; i++) {
|
2012-03-12 12:35:28 +00:00
|
|
|
int kPrefixLen = Utf8LengthHelper(source_data[i].outer_prefix);
|
|
|
|
int kInnerLen = Utf8LengthHelper(source_data[i].inner_source);
|
|
|
|
int kSuffixLen = Utf8LengthHelper(source_data[i].outer_suffix);
|
|
|
|
int kPrefixByteLen = i::StrLength(source_data[i].outer_prefix);
|
|
|
|
int kInnerByteLen = i::StrLength(source_data[i].inner_source);
|
|
|
|
int kSuffixByteLen = i::StrLength(source_data[i].outer_suffix);
|
2011-10-21 10:26:59 +00:00
|
|
|
int kProgramSize = kPrefixLen + kInnerLen + kSuffixLen;
|
2012-03-12 12:35:28 +00:00
|
|
|
int kProgramByteSize = kPrefixByteLen + kInnerByteLen + kSuffixByteLen;
|
|
|
|
i::Vector<char> program = i::Vector<char>::New(kProgramByteSize + 1);
|
|
|
|
i::OS::SNPrintF(program, "%s%s%s",
|
|
|
|
source_data[i].outer_prefix,
|
|
|
|
source_data[i].inner_source,
|
|
|
|
source_data[i].outer_suffix);
|
2011-10-21 10:26:59 +00:00
|
|
|
|
|
|
|
// Parse program source.
|
|
|
|
i::Handle<i::String> source(
|
2013-06-04 10:30:05 +00:00
|
|
|
factory->NewStringFromUtf8(i::CStrVector(program.start())));
|
2012-03-12 12:35:28 +00:00
|
|
|
CHECK_EQ(source->length(), kProgramSize);
|
2013-06-04 10:30:05 +00:00
|
|
|
i::Handle<i::Script> script = factory->NewScript(source);
|
2012-06-20 08:58:41 +00:00
|
|
|
i::CompilationInfoWithZone info(script);
|
Refactor parser mode configuration for correctness
This patch refactors the parser and preparser interface to be more
readable and type-safe. It has no behavior changes.
Previously, parsers and preparsers were configured via bitfield called
parser_flags in the Parser constructor, and flags in
PreParser::PreParseProgram, ParserApi::Parse, and ParserApi::PreParse.
This was error-prone in practice: six call sites passed incorrectly
typed values to this interface (a boolean FLAG value, a boolean false
and a boolean true value). None of these errors were caught by the
compiler because it's just an "int".
The parser flags interface was also awkward because it encoded a
language mode, but the language mode was only used to turn on harmony
scoping or not -- it wasn't used to actually set the parser's language
mode.
Fundamentally these errors came in because of the desire for a
procedural parser interface, in ParserApi. Because we need to be able
to configure the parser in various ways, the flags argument got added;
but no one understood how to use the flags properly. Also they were
only used by constructors: callers packed bits, and the constructors
unpacked them into booleans on the parser or preparser.
The solution is to allow parser construction, configuration, and
invocation to be separated. This patch does that.
It passes the existing tests.
BUG=
Review URL: https://codereview.chromium.org/13450007
Patch from Andy Wingo <wingo@igalia.com>.
git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@14151 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
2013-04-05 13:01:06 +00:00
|
|
|
i::Parser parser(&info);
|
|
|
|
parser.set_allow_lazy(true);
|
|
|
|
parser.set_allow_harmony_scoping(true);
|
2011-11-15 13:48:40 +00:00
|
|
|
info.MarkAsGlobal();
|
2011-11-24 15:17:04 +00:00
|
|
|
info.SetLanguageMode(source_data[i].language_mode);
|
2013-10-01 09:27:03 +00:00
|
|
|
parser.Parse();
|
|
|
|
CHECK(info.function() != NULL);
|
2011-10-21 10:26:59 +00:00
|
|
|
|
|
|
|
// Check scope types and positions.
|
2013-10-01 09:27:03 +00:00
|
|
|
i::Scope* scope = info.function()->scope();
|
2011-10-21 10:26:59 +00:00
|
|
|
CHECK(scope->is_global_scope());
|
|
|
|
CHECK_EQ(scope->start_position(), 0);
|
|
|
|
CHECK_EQ(scope->end_position(), kProgramSize);
|
|
|
|
CHECK_EQ(scope->inner_scopes()->length(), 1);
|
|
|
|
|
|
|
|
i::Scope* inner_scope = scope->inner_scopes()->at(0);
|
2013-06-06 13:28:22 +00:00
|
|
|
CHECK_EQ(inner_scope->scope_type(), source_data[i].scope_type);
|
2011-10-21 10:26:59 +00:00
|
|
|
CHECK_EQ(inner_scope->start_position(), kPrefixLen);
|
|
|
|
// The end position of a token is one position after the last
|
|
|
|
// character belonging to that token.
|
|
|
|
CHECK_EQ(inner_scope->end_position(), kPrefixLen + kInnerLen);
|
|
|
|
}
|
|
|
|
}
|
2011-12-07 16:03:29 +00:00
|
|
|
|
|
|
|
|
2012-11-14 09:14:47 +00:00
|
|
|
i::Handle<i::String> FormatMessage(i::ScriptDataImpl* data) {
|
2013-09-19 09:17:13 +00:00
|
|
|
i::Isolate* isolate = CcTest::i_isolate();
|
2013-06-04 10:30:05 +00:00
|
|
|
i::Factory* factory = isolate->factory();
|
2013-07-04 15:57:43 +00:00
|
|
|
const char* message = data->BuildMessage();
|
2012-11-14 09:14:47 +00:00
|
|
|
i::Handle<i::String> format = v8::Utils::OpenHandle(
|
2013-11-22 12:43:17 +00:00
|
|
|
*v8::String::NewFromUtf8(CcTest::isolate(), message));
|
2012-11-14 09:14:47 +00:00
|
|
|
i::Vector<const char*> args = data->BuildArgs();
|
2013-06-04 10:30:05 +00:00
|
|
|
i::Handle<i::JSArray> args_array = factory->NewJSArray(args.length());
|
2012-11-14 09:14:47 +00:00
|
|
|
for (int i = 0; i < args.length(); i++) {
|
2013-11-22 12:43:17 +00:00
|
|
|
i::JSArray::SetElement(
|
|
|
|
args_array, i, v8::Utils::OpenHandle(*v8::String::NewFromUtf8(
|
|
|
|
CcTest::isolate(), args[i])),
|
|
|
|
NONE, i::kNonStrictMode);
|
2012-11-14 09:14:47 +00:00
|
|
|
}
|
2013-06-04 10:30:05 +00:00
|
|
|
i::Handle<i::JSObject> builtins(isolate->js_builtins_object());
|
2012-11-14 09:14:47 +00:00
|
|
|
i::Handle<i::Object> format_fun =
|
|
|
|
i::GetProperty(builtins, "FormatMessage");
|
|
|
|
i::Handle<i::Object> arg_handles[] = { format, args_array };
|
|
|
|
bool has_exception = false;
|
2013-09-05 08:48:34 +00:00
|
|
|
i::Handle<i::Object> result = i::Execution::Call(
|
|
|
|
isolate, format_fun, builtins, 2, arg_handles, &has_exception);
|
2012-11-14 09:14:47 +00:00
|
|
|
CHECK(!has_exception);
|
|
|
|
CHECK(result->IsString());
|
2013-07-04 15:57:43 +00:00
|
|
|
for (int i = 0; i < args.length(); i++) {
|
|
|
|
i::DeleteArray(args[i]);
|
|
|
|
}
|
|
|
|
i::DeleteArray(args.start());
|
|
|
|
i::DeleteArray(message);
|
2012-11-14 09:14:47 +00:00
|
|
|
return i::Handle<i::String>::cast(result);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
Refactor parser mode configuration for correctness
This patch refactors the parser and preparser interface to be more
readable and type-safe. It has no behavior changes.
Previously, parsers and preparsers were configured via bitfield called
parser_flags in the Parser constructor, and flags in
PreParser::PreParseProgram, ParserApi::Parse, and ParserApi::PreParse.
This was error-prone in practice: six call sites passed incorrectly
typed values to this interface (a boolean FLAG value, a boolean false
and a boolean true value). None of these errors were caught by the
compiler because it's just an "int".
The parser flags interface was also awkward because it encoded a
language mode, but the language mode was only used to turn on harmony
scoping or not -- it wasn't used to actually set the parser's language
mode.
Fundamentally these errors came in because of the desire for a
procedural parser interface, in ParserApi. Because we need to be able
to configure the parser in various ways, the flags argument got added;
but no one understood how to use the flags properly. Also they were
only used by constructors: callers packed bits, and the constructors
unpacked them into booleans on the parser or preparser.
The solution is to allow parser construction, configuration, and
invocation to be separated. This patch does that.
It passes the existing tests.
BUG=
Review URL: https://codereview.chromium.org/13450007
Patch from Andy Wingo <wingo@igalia.com>.
git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@14151 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
2013-04-05 13:01:06 +00:00
|
|
|
enum ParserFlag {
|
|
|
|
kAllowLazy,
|
|
|
|
kAllowNativesSyntax,
|
|
|
|
kAllowHarmonyScoping,
|
|
|
|
kAllowModules,
|
|
|
|
kAllowGenerators,
|
2013-06-06 14:38:26 +00:00
|
|
|
kAllowForOf,
|
2013-10-25 07:24:08 +00:00
|
|
|
kAllowHarmonyNumericLiterals
|
Refactor parser mode configuration for correctness
This patch refactors the parser and preparser interface to be more
readable and type-safe. It has no behavior changes.
Previously, parsers and preparsers were configured via bitfield called
parser_flags in the Parser constructor, and flags in
PreParser::PreParseProgram, ParserApi::Parse, and ParserApi::PreParse.
This was error-prone in practice: six call sites passed incorrectly
typed values to this interface (a boolean FLAG value, a boolean false
and a boolean true value). None of these errors were caught by the
compiler because it's just an "int".
The parser flags interface was also awkward because it encoded a
language mode, but the language mode was only used to turn on harmony
scoping or not -- it wasn't used to actually set the parser's language
mode.
Fundamentally these errors came in because of the desire for a
procedural parser interface, in ParserApi. Because we need to be able
to configure the parser in various ways, the flags argument got added;
but no one understood how to use the flags properly. Also they were
only used by constructors: callers packed bits, and the constructors
unpacked them into booleans on the parser or preparser.
The solution is to allow parser construction, configuration, and
invocation to be separated. This patch does that.
It passes the existing tests.
BUG=
Review URL: https://codereview.chromium.org/13450007
Patch from Andy Wingo <wingo@igalia.com>.
git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@14151 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
2013-04-05 13:01:06 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
2013-10-25 07:24:08 +00:00
|
|
|
void SetParserFlags(i::ParserBase* parser, i::EnumSet<ParserFlag> flags) {
|
|
|
|
parser->set_allow_lazy(flags.Contains(kAllowLazy));
|
|
|
|
parser->set_allow_natives_syntax(flags.Contains(kAllowNativesSyntax));
|
|
|
|
parser->set_allow_harmony_scoping(flags.Contains(kAllowHarmonyScoping));
|
|
|
|
parser->set_allow_modules(flags.Contains(kAllowModules));
|
|
|
|
parser->set_allow_generators(flags.Contains(kAllowGenerators));
|
|
|
|
parser->set_allow_for_of(flags.Contains(kAllowForOf));
|
|
|
|
parser->set_allow_harmony_numeric_literals(
|
|
|
|
flags.Contains(kAllowHarmonyNumericLiterals));
|
Refactor parser mode configuration for correctness
This patch refactors the parser and preparser interface to be more
readable and type-safe. It has no behavior changes.
Previously, parsers and preparsers were configured via bitfield called
parser_flags in the Parser constructor, and flags in
PreParser::PreParseProgram, ParserApi::Parse, and ParserApi::PreParse.
This was error-prone in practice: six call sites passed incorrectly
typed values to this interface (a boolean FLAG value, a boolean false
and a boolean true value). None of these errors were caught by the
compiler because it's just an "int".
The parser flags interface was also awkward because it encoded a
language mode, but the language mode was only used to turn on harmony
scoping or not -- it wasn't used to actually set the parser's language
mode.
Fundamentally these errors came in because of the desire for a
procedural parser interface, in ParserApi. Because we need to be able
to configure the parser in various ways, the flags argument got added;
but no one understood how to use the flags properly. Also they were
only used by constructors: callers packed bits, and the constructors
unpacked them into booleans on the parser or preparser.
The solution is to allow parser construction, configuration, and
invocation to be separated. This patch does that.
It passes the existing tests.
BUG=
Review URL: https://codereview.chromium.org/13450007
Patch from Andy Wingo <wingo@igalia.com>.
git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@14151 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
2013-04-05 13:01:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-10-25 07:24:08 +00:00
|
|
|
void TestParserSyncWithFlags(i::Handle<i::String> source,
|
|
|
|
i::EnumSet<ParserFlag> flags) {
|
2013-09-19 09:17:13 +00:00
|
|
|
i::Isolate* isolate = CcTest::i_isolate();
|
2013-06-04 10:30:05 +00:00
|
|
|
i::Factory* factory = isolate->factory();
|
|
|
|
|
|
|
|
uintptr_t stack_limit = isolate->stack_guard()->real_climit();
|
2011-12-07 16:03:29 +00:00
|
|
|
|
|
|
|
// Preparse the data.
|
|
|
|
i::CompleteParserRecorder log;
|
Refactor parser mode configuration for correctness
This patch refactors the parser and preparser interface to be more
readable and type-safe. It has no behavior changes.
Previously, parsers and preparsers were configured via bitfield called
parser_flags in the Parser constructor, and flags in
PreParser::PreParseProgram, ParserApi::Parse, and ParserApi::PreParse.
This was error-prone in practice: six call sites passed incorrectly
typed values to this interface (a boolean FLAG value, a boolean false
and a boolean true value). None of these errors were caught by the
compiler because it's just an "int".
The parser flags interface was also awkward because it encoded a
language mode, but the language mode was only used to turn on harmony
scoping or not -- it wasn't used to actually set the parser's language
mode.
Fundamentally these errors came in because of the desire for a
procedural parser interface, in ParserApi. Because we need to be able
to configure the parser in various ways, the flags argument got added;
but no one understood how to use the flags properly. Also they were
only used by constructors: callers packed bits, and the constructors
unpacked them into booleans on the parser or preparser.
The solution is to allow parser construction, configuration, and
invocation to be separated. This patch does that.
It passes the existing tests.
BUG=
Review URL: https://codereview.chromium.org/13450007
Patch from Andy Wingo <wingo@igalia.com>.
git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@14151 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
2013-04-05 13:01:06 +00:00
|
|
|
{
|
2013-06-04 10:30:05 +00:00
|
|
|
i::Scanner scanner(isolate->unicode_cache());
|
Refactor parser mode configuration for correctness
This patch refactors the parser and preparser interface to be more
readable and type-safe. It has no behavior changes.
Previously, parsers and preparsers were configured via bitfield called
parser_flags in the Parser constructor, and flags in
PreParser::PreParseProgram, ParserApi::Parse, and ParserApi::PreParse.
This was error-prone in practice: six call sites passed incorrectly
typed values to this interface (a boolean FLAG value, a boolean false
and a boolean true value). None of these errors were caught by the
compiler because it's just an "int".
The parser flags interface was also awkward because it encoded a
language mode, but the language mode was only used to turn on harmony
scoping or not -- it wasn't used to actually set the parser's language
mode.
Fundamentally these errors came in because of the desire for a
procedural parser interface, in ParserApi. Because we need to be able
to configure the parser in various ways, the flags argument got added;
but no one understood how to use the flags properly. Also they were
only used by constructors: callers packed bits, and the constructors
unpacked them into booleans on the parser or preparser.
The solution is to allow parser construction, configuration, and
invocation to be separated. This patch does that.
It passes the existing tests.
BUG=
Review URL: https://codereview.chromium.org/13450007
Patch from Andy Wingo <wingo@igalia.com>.
git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@14151 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
2013-04-05 13:01:06 +00:00
|
|
|
i::GenericStringUtf16CharacterStream stream(source, 0, source->length());
|
2013-10-14 13:07:20 +00:00
|
|
|
i::PreParser preparser(&scanner, &log, stack_limit);
|
2013-10-25 07:24:08 +00:00
|
|
|
SetParserFlags(&preparser, flags);
|
Refactor parser mode configuration for correctness
This patch refactors the parser and preparser interface to be more
readable and type-safe. It has no behavior changes.
Previously, parsers and preparsers were configured via bitfield called
parser_flags in the Parser constructor, and flags in
PreParser::PreParseProgram, ParserApi::Parse, and ParserApi::PreParse.
This was error-prone in practice: six call sites passed incorrectly
typed values to this interface (a boolean FLAG value, a boolean false
and a boolean true value). None of these errors were caught by the
compiler because it's just an "int".
The parser flags interface was also awkward because it encoded a
language mode, but the language mode was only used to turn on harmony
scoping or not -- it wasn't used to actually set the parser's language
mode.
Fundamentally these errors came in because of the desire for a
procedural parser interface, in ParserApi. Because we need to be able
to configure the parser in various ways, the flags argument got added;
but no one understood how to use the flags properly. Also they were
only used by constructors: callers packed bits, and the constructors
unpacked them into booleans on the parser or preparser.
The solution is to allow parser construction, configuration, and
invocation to be separated. This patch does that.
It passes the existing tests.
BUG=
Review URL: https://codereview.chromium.org/13450007
Patch from Andy Wingo <wingo@igalia.com>.
git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@14151 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
2013-04-05 13:01:06 +00:00
|
|
|
scanner.Initialize(&stream);
|
2013-10-14 13:07:20 +00:00
|
|
|
i::PreParser::PreParseResult result = preparser.PreParseProgram();
|
|
|
|
CHECK_EQ(i::PreParser::kPreParseSuccess, result);
|
Refactor parser mode configuration for correctness
This patch refactors the parser and preparser interface to be more
readable and type-safe. It has no behavior changes.
Previously, parsers and preparsers were configured via bitfield called
parser_flags in the Parser constructor, and flags in
PreParser::PreParseProgram, ParserApi::Parse, and ParserApi::PreParse.
This was error-prone in practice: six call sites passed incorrectly
typed values to this interface (a boolean FLAG value, a boolean false
and a boolean true value). None of these errors were caught by the
compiler because it's just an "int".
The parser flags interface was also awkward because it encoded a
language mode, but the language mode was only used to turn on harmony
scoping or not -- it wasn't used to actually set the parser's language
mode.
Fundamentally these errors came in because of the desire for a
procedural parser interface, in ParserApi. Because we need to be able
to configure the parser in various ways, the flags argument got added;
but no one understood how to use the flags properly. Also they were
only used by constructors: callers packed bits, and the constructors
unpacked them into booleans on the parser or preparser.
The solution is to allow parser construction, configuration, and
invocation to be separated. This patch does that.
It passes the existing tests.
BUG=
Review URL: https://codereview.chromium.org/13450007
Patch from Andy Wingo <wingo@igalia.com>.
git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@14151 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
2013-04-05 13:01:06 +00:00
|
|
|
}
|
2011-12-07 16:03:29 +00:00
|
|
|
i::ScriptDataImpl data(log.ExtractData());
|
|
|
|
|
|
|
|
// Parse the data
|
Refactor parser mode configuration for correctness
This patch refactors the parser and preparser interface to be more
readable and type-safe. It has no behavior changes.
Previously, parsers and preparsers were configured via bitfield called
parser_flags in the Parser constructor, and flags in
PreParser::PreParseProgram, ParserApi::Parse, and ParserApi::PreParse.
This was error-prone in practice: six call sites passed incorrectly
typed values to this interface (a boolean FLAG value, a boolean false
and a boolean true value). None of these errors were caught by the
compiler because it's just an "int".
The parser flags interface was also awkward because it encoded a
language mode, but the language mode was only used to turn on harmony
scoping or not -- it wasn't used to actually set the parser's language
mode.
Fundamentally these errors came in because of the desire for a
procedural parser interface, in ParserApi. Because we need to be able
to configure the parser in various ways, the flags argument got added;
but no one understood how to use the flags properly. Also they were
only used by constructors: callers packed bits, and the constructors
unpacked them into booleans on the parser or preparser.
The solution is to allow parser construction, configuration, and
invocation to be separated. This patch does that.
It passes the existing tests.
BUG=
Review URL: https://codereview.chromium.org/13450007
Patch from Andy Wingo <wingo@igalia.com>.
git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@14151 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
2013-04-05 13:01:06 +00:00
|
|
|
i::FunctionLiteral* function;
|
|
|
|
{
|
2013-06-04 10:30:05 +00:00
|
|
|
i::Handle<i::Script> script = factory->NewScript(source);
|
Refactor parser mode configuration for correctness
This patch refactors the parser and preparser interface to be more
readable and type-safe. It has no behavior changes.
Previously, parsers and preparsers were configured via bitfield called
parser_flags in the Parser constructor, and flags in
PreParser::PreParseProgram, ParserApi::Parse, and ParserApi::PreParse.
This was error-prone in practice: six call sites passed incorrectly
typed values to this interface (a boolean FLAG value, a boolean false
and a boolean true value). None of these errors were caught by the
compiler because it's just an "int".
The parser flags interface was also awkward because it encoded a
language mode, but the language mode was only used to turn on harmony
scoping or not -- it wasn't used to actually set the parser's language
mode.
Fundamentally these errors came in because of the desire for a
procedural parser interface, in ParserApi. Because we need to be able
to configure the parser in various ways, the flags argument got added;
but no one understood how to use the flags properly. Also they were
only used by constructors: callers packed bits, and the constructors
unpacked them into booleans on the parser or preparser.
The solution is to allow parser construction, configuration, and
invocation to be separated. This patch does that.
It passes the existing tests.
BUG=
Review URL: https://codereview.chromium.org/13450007
Patch from Andy Wingo <wingo@igalia.com>.
git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@14151 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
2013-04-05 13:01:06 +00:00
|
|
|
i::CompilationInfoWithZone info(script);
|
|
|
|
i::Parser parser(&info);
|
2013-10-25 07:24:08 +00:00
|
|
|
SetParserFlags(&parser, flags);
|
Refactor parser mode configuration for correctness
This patch refactors the parser and preparser interface to be more
readable and type-safe. It has no behavior changes.
Previously, parsers and preparsers were configured via bitfield called
parser_flags in the Parser constructor, and flags in
PreParser::PreParseProgram, ParserApi::Parse, and ParserApi::PreParse.
This was error-prone in practice: six call sites passed incorrectly
typed values to this interface (a boolean FLAG value, a boolean false
and a boolean true value). None of these errors were caught by the
compiler because it's just an "int".
The parser flags interface was also awkward because it encoded a
language mode, but the language mode was only used to turn on harmony
scoping or not -- it wasn't used to actually set the parser's language
mode.
Fundamentally these errors came in because of the desire for a
procedural parser interface, in ParserApi. Because we need to be able
to configure the parser in various ways, the flags argument got added;
but no one understood how to use the flags properly. Also they were
only used by constructors: callers packed bits, and the constructors
unpacked them into booleans on the parser or preparser.
The solution is to allow parser construction, configuration, and
invocation to be separated. This patch does that.
It passes the existing tests.
BUG=
Review URL: https://codereview.chromium.org/13450007
Patch from Andy Wingo <wingo@igalia.com>.
git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@14151 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
2013-04-05 13:01:06 +00:00
|
|
|
info.MarkAsGlobal();
|
2013-10-01 09:27:03 +00:00
|
|
|
parser.Parse();
|
|
|
|
function = info.function();
|
Refactor parser mode configuration for correctness
This patch refactors the parser and preparser interface to be more
readable and type-safe. It has no behavior changes.
Previously, parsers and preparsers were configured via bitfield called
parser_flags in the Parser constructor, and flags in
PreParser::PreParseProgram, ParserApi::Parse, and ParserApi::PreParse.
This was error-prone in practice: six call sites passed incorrectly
typed values to this interface (a boolean FLAG value, a boolean false
and a boolean true value). None of these errors were caught by the
compiler because it's just an "int".
The parser flags interface was also awkward because it encoded a
language mode, but the language mode was only used to turn on harmony
scoping or not -- it wasn't used to actually set the parser's language
mode.
Fundamentally these errors came in because of the desire for a
procedural parser interface, in ParserApi. Because we need to be able
to configure the parser in various ways, the flags argument got added;
but no one understood how to use the flags properly. Also they were
only used by constructors: callers packed bits, and the constructors
unpacked them into booleans on the parser or preparser.
The solution is to allow parser construction, configuration, and
invocation to be separated. This patch does that.
It passes the existing tests.
BUG=
Review URL: https://codereview.chromium.org/13450007
Patch from Andy Wingo <wingo@igalia.com>.
git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@14151 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
2013-04-05 13:01:06 +00:00
|
|
|
}
|
2011-12-07 16:03:29 +00:00
|
|
|
|
2012-11-14 09:14:47 +00:00
|
|
|
// Check that preparsing fails iff parsing fails.
|
2011-12-07 16:03:29 +00:00
|
|
|
if (function == NULL) {
|
|
|
|
// Extract exception from the parser.
|
2013-06-04 10:30:05 +00:00
|
|
|
CHECK(isolate->has_pending_exception());
|
|
|
|
i::MaybeObject* maybe_object = isolate->pending_exception();
|
2011-12-07 16:03:29 +00:00
|
|
|
i::JSObject* exception = NULL;
|
|
|
|
CHECK(maybe_object->To(&exception));
|
2012-11-14 09:14:47 +00:00
|
|
|
i::Handle<i::JSObject> exception_handle(exception);
|
|
|
|
i::Handle<i::String> message_string =
|
2012-11-14 09:32:51 +00:00
|
|
|
i::Handle<i::String>::cast(i::GetProperty(exception_handle, "message"));
|
2011-12-07 16:03:29 +00:00
|
|
|
|
2012-11-14 09:14:47 +00:00
|
|
|
if (!data.has_error()) {
|
|
|
|
i::OS::Print(
|
|
|
|
"Parser failed on:\n"
|
|
|
|
"\t%s\n"
|
|
|
|
"with error:\n"
|
|
|
|
"\t%s\n"
|
|
|
|
"However, the preparser succeeded",
|
2013-12-09 07:41:20 +00:00
|
|
|
source->ToCString().get(), message_string->ToCString().get());
|
2012-11-14 09:14:47 +00:00
|
|
|
CHECK(false);
|
|
|
|
}
|
|
|
|
// Check that preparser and parser produce the same error.
|
|
|
|
i::Handle<i::String> preparser_message = FormatMessage(&data);
|
|
|
|
if (!message_string->Equals(*preparser_message)) {
|
2011-12-07 16:03:29 +00:00
|
|
|
i::OS::Print(
|
|
|
|
"Expected parser and preparser to produce the same error on:\n"
|
|
|
|
"\t%s\n"
|
|
|
|
"However, found the following error messages\n"
|
|
|
|
"\tparser: %s\n"
|
|
|
|
"\tpreparser: %s\n",
|
2013-12-09 07:41:20 +00:00
|
|
|
source->ToCString().get(),
|
|
|
|
message_string->ToCString().get(),
|
|
|
|
preparser_message->ToCString().get());
|
2011-12-07 16:03:29 +00:00
|
|
|
CHECK(false);
|
|
|
|
}
|
2012-11-14 09:14:47 +00:00
|
|
|
} else if (data.has_error()) {
|
|
|
|
i::OS::Print(
|
|
|
|
"Preparser failed on:\n"
|
|
|
|
"\t%s\n"
|
|
|
|
"with error:\n"
|
|
|
|
"\t%s\n"
|
|
|
|
"However, the parser succeeded",
|
2013-12-09 07:41:20 +00:00
|
|
|
source->ToCString().get(), FormatMessage(&data)->ToCString().get());
|
2012-11-14 09:14:47 +00:00
|
|
|
CHECK(false);
|
2011-12-07 16:03:29 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-10-25 07:24:08 +00:00
|
|
|
void TestParserSync(const char* source,
|
|
|
|
const ParserFlag* flag_list,
|
|
|
|
size_t flag_list_length) {
|
|
|
|
i::Handle<i::String> str =
|
|
|
|
CcTest::i_isolate()->factory()->NewStringFromAscii(i::CStrVector(source));
|
|
|
|
for (int bits = 0; bits < (1 << flag_list_length); bits++) {
|
|
|
|
i::EnumSet<ParserFlag> flags;
|
|
|
|
for (size_t flag_index = 0; flag_index < flag_list_length; flag_index++) {
|
|
|
|
if ((bits & (1 << flag_index)) != 0) flags.Add(flag_list[flag_index]);
|
|
|
|
}
|
|
|
|
TestParserSyncWithFlags(str, flags);
|
2011-12-07 16:03:29 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
TEST(ParserSync) {
|
|
|
|
const char* context_data[][2] = {
|
|
|
|
{ "", "" },
|
|
|
|
{ "{", "}" },
|
|
|
|
{ "if (true) ", " else {}" },
|
|
|
|
{ "if (true) {} else ", "" },
|
|
|
|
{ "if (true) ", "" },
|
|
|
|
{ "do ", " while (false)" },
|
|
|
|
{ "while (false) ", "" },
|
|
|
|
{ "for (;;) ", "" },
|
|
|
|
{ "with ({})", "" },
|
|
|
|
{ "switch (12) { case 12: ", "}" },
|
|
|
|
{ "switch (12) { default: ", "}" },
|
2012-07-11 07:47:29 +00:00
|
|
|
{ "switch (12) { ", "case 12: }" },
|
2011-12-07 16:03:29 +00:00
|
|
|
{ "label2: ", "" },
|
|
|
|
{ NULL, NULL }
|
|
|
|
};
|
|
|
|
|
|
|
|
const char* statement_data[] = {
|
|
|
|
"{}",
|
|
|
|
"var x",
|
|
|
|
"var x = 1",
|
|
|
|
"const x",
|
|
|
|
"const x = 1",
|
|
|
|
";",
|
|
|
|
"12",
|
|
|
|
"if (false) {} else ;",
|
|
|
|
"if (false) {} else {}",
|
|
|
|
"if (false) {} else 12",
|
|
|
|
"if (false) ;"
|
|
|
|
"if (false) {}",
|
|
|
|
"if (false) 12",
|
|
|
|
"do {} while (false)",
|
|
|
|
"for (;;) ;",
|
|
|
|
"for (;;) {}",
|
|
|
|
"for (;;) 12",
|
|
|
|
"continue",
|
|
|
|
"continue label",
|
|
|
|
"continue\nlabel",
|
|
|
|
"break",
|
|
|
|
"break label",
|
|
|
|
"break\nlabel",
|
|
|
|
"return",
|
|
|
|
"return 12",
|
|
|
|
"return\n12",
|
|
|
|
"with ({}) ;",
|
|
|
|
"with ({}) {}",
|
|
|
|
"with ({}) 12",
|
|
|
|
"switch ({}) { default: }"
|
|
|
|
"label3: "
|
|
|
|
"throw",
|
|
|
|
"throw 12",
|
|
|
|
"throw\n12",
|
|
|
|
"try {} catch(e) {}",
|
|
|
|
"try {} finally {}",
|
|
|
|
"try {} catch(e) {} finally {}",
|
|
|
|
"debugger",
|
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
|
|
|
const char* termination_data[] = {
|
|
|
|
"",
|
|
|
|
";",
|
|
|
|
"\n",
|
|
|
|
";\n",
|
|
|
|
"\n;",
|
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
2013-09-19 08:54:58 +00:00
|
|
|
v8::HandleScope handles(CcTest::isolate());
|
|
|
|
v8::Handle<v8::Context> context = v8::Context::New(CcTest::isolate());
|
2011-12-07 16:03:29 +00:00
|
|
|
v8::Context::Scope context_scope(context);
|
|
|
|
|
|
|
|
int marker;
|
2013-10-25 07:24:08 +00:00
|
|
|
CcTest::i_isolate()->stack_guard()->SetStackLimit(
|
2011-12-07 16:03:29 +00:00
|
|
|
reinterpret_cast<uintptr_t>(&marker) - 128 * 1024);
|
|
|
|
|
2013-10-25 07:24:08 +00:00
|
|
|
static const ParserFlag flags1[] = {
|
|
|
|
kAllowLazy, kAllowHarmonyScoping, kAllowModules, kAllowGenerators,
|
|
|
|
kAllowForOf
|
|
|
|
};
|
2011-12-07 16:03:29 +00:00
|
|
|
for (int i = 0; context_data[i][0] != NULL; ++i) {
|
|
|
|
for (int j = 0; statement_data[j] != NULL; ++j) {
|
|
|
|
for (int k = 0; termination_data[k] != NULL; ++k) {
|
|
|
|
int kPrefixLen = i::StrLength(context_data[i][0]);
|
|
|
|
int kStatementLen = i::StrLength(statement_data[j]);
|
|
|
|
int kTerminationLen = i::StrLength(termination_data[k]);
|
|
|
|
int kSuffixLen = i::StrLength(context_data[i][1]);
|
|
|
|
int kProgramSize = kPrefixLen + kStatementLen + kTerminationLen
|
|
|
|
+ kSuffixLen + i::StrLength("label: for (;;) { }");
|
|
|
|
|
|
|
|
// Plug the source code pieces together.
|
2013-07-04 15:57:43 +00:00
|
|
|
i::ScopedVector<char> program(kProgramSize + 1);
|
2011-12-07 16:03:29 +00:00
|
|
|
int length = i::OS::SNPrintF(program,
|
|
|
|
"label: for (;;) { %s%s%s%s }",
|
|
|
|
context_data[i][0],
|
|
|
|
statement_data[j],
|
|
|
|
termination_data[k],
|
|
|
|
context_data[i][1]);
|
|
|
|
CHECK(length == kProgramSize);
|
2013-10-25 07:24:08 +00:00
|
|
|
TestParserSync(program.start(), flags1, ARRAY_SIZE(flags1));
|
2011-12-07 16:03:29 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2013-10-25 07:24:08 +00:00
|
|
|
|
|
|
|
// Neither Harmony numeric literals nor our natives syntax have any
|
|
|
|
// interaction with the flags above, so test these separately to reduce
|
|
|
|
// the combinatorial explosion.
|
|
|
|
static const ParserFlag flags2[] = { kAllowHarmonyNumericLiterals };
|
|
|
|
TestParserSync("0o1234", flags2, ARRAY_SIZE(flags2));
|
|
|
|
TestParserSync("0b1011", flags2, ARRAY_SIZE(flags2));
|
|
|
|
|
|
|
|
static const ParserFlag flags3[] = { kAllowNativesSyntax };
|
|
|
|
TestParserSync("%DebugPrint(123)", flags3, ARRAY_SIZE(flags3));
|
2011-12-07 16:03:29 +00:00
|
|
|
}
|
2012-07-10 12:24:17 +00:00
|
|
|
|
|
|
|
|
|
|
|
TEST(PreparserStrictOctal) {
|
|
|
|
// Test that syntax error caused by octal literal is reported correctly as
|
|
|
|
// such (issue 2220).
|
|
|
|
v8::internal::FLAG_min_preparse_length = 1; // Force preparsing.
|
|
|
|
v8::V8::Initialize();
|
2013-09-19 08:54:58 +00:00
|
|
|
v8::HandleScope scope(CcTest::isolate());
|
2013-05-02 20:18:42 +00:00
|
|
|
v8::Context::Scope context_scope(
|
2013-09-19 08:54:58 +00:00
|
|
|
v8::Context::New(CcTest::isolate()));
|
2012-07-10 12:24:17 +00:00
|
|
|
v8::TryCatch try_catch;
|
|
|
|
const char* script =
|
|
|
|
"\"use strict\"; \n"
|
|
|
|
"a = function() { \n"
|
|
|
|
" b = function() { \n"
|
|
|
|
" 01; \n"
|
|
|
|
" }; \n"
|
|
|
|
"}; \n";
|
2013-11-22 12:43:17 +00:00
|
|
|
v8::Script::Compile(v8::String::NewFromUtf8(CcTest::isolate(), script));
|
2012-07-10 12:24:17 +00:00
|
|
|
CHECK(try_catch.HasCaught());
|
|
|
|
v8::String::Utf8Value exception(try_catch.Exception());
|
|
|
|
CHECK_EQ("SyntaxError: Octal literals are not allowed in strict mode.",
|
|
|
|
*exception);
|
|
|
|
}
|