diff options
| author | Steve Block <steveblock@google.com> | 2011-05-26 01:26:41 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-02 15:09:56 +0100 |
| commit | 44f0eee88ff00398ff7f715fab053374d808c90d (patch) | |
| tree | addd100e906cd43f843f3aaf64b445f17f46fe0f /src/preparser-api.cc | |
| parent | 1b63b9ad386abd62f61af0e29246a687f5311b53 (diff) | |
| download | android_external_v8-44f0eee88ff00398ff7f715fab053374d808c90d.tar.gz android_external_v8-44f0eee88ff00398ff7f715fab053374d808c90d.tar.bz2 android_external_v8-44f0eee88ff00398ff7f715fab053374d808c90d.zip | |
Update V8 to r7427: Initial merge by git
As required by WebKit r82507
Change-Id: I7ae83ef3f689356043b4929255b7c1dd31d8c5df
Diffstat (limited to 'src/preparser-api.cc')
| -rw-r--r-- | src/preparser-api.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/preparser-api.cc b/src/preparser-api.cc index 3817935f..61e9e7e0 100644 --- a/src/preparser-api.cc +++ b/src/preparser-api.cc @@ -26,6 +26,7 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "../include/v8-preparser.h" + #include "globals.h" #include "checks.h" #include "allocation.h" @@ -158,6 +159,9 @@ class InputStreamUTF16Buffer : public UC16CharacterStream { class StandAloneJavaScriptScanner : public JavaScriptScanner { public: + explicit StandAloneJavaScriptScanner(ScannerConstants* scanner_constants) + : JavaScriptScanner(scanner_constants) { } + void Initialize(UC16CharacterStream* source) { source_ = source; Init(); @@ -170,7 +174,8 @@ class StandAloneJavaScriptScanner : public JavaScriptScanner { }; -// Functions declared by allocation.h +// Functions declared by allocation.h and implemented in both api.cc (for v8) +// or here (for a stand-alone preparser). void FatalProcessOutOfMemory(const char* reason) { V8_Fatal(__FILE__, __LINE__, reason); @@ -187,7 +192,8 @@ UnicodeInputStream::~UnicodeInputStream() { } PreParserData Preparse(UnicodeInputStream* input, size_t max_stack) { internal::InputStreamUTF16Buffer buffer(input); uintptr_t stack_limit = reinterpret_cast<uintptr_t>(&buffer) - max_stack; - internal::StandAloneJavaScriptScanner scanner; + internal::ScannerConstants scanner_constants; + internal::StandAloneJavaScriptScanner scanner(&scanner_constants); scanner.Initialize(&buffer); internal::CompleteParserRecorder recorder; preparser::PreParser::PreParseResult result = |