From a94275402997c11dd2e778633dacf4b7e630a35d Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Fri, 22 Oct 2010 13:02:20 +0100 Subject: Merge WebKit at r70209: Initial merge by Git Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e --- JavaScriptCore/parser/Parser.cpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'JavaScriptCore/parser/Parser.cpp') diff --git a/JavaScriptCore/parser/Parser.cpp b/JavaScriptCore/parser/Parser.cpp index bd77742..5092357 100644 --- a/JavaScriptCore/parser/Parser.cpp +++ b/JavaScriptCore/parser/Parser.cpp @@ -26,12 +26,6 @@ #include "Debugger.h" #include "JSParser.h" #include "Lexer.h" -#include -#include - -#ifndef yyparse -extern int jscyyparse(void*); -#endif #ifdef ANDROID_INSTRUMENT #include "TimeCounter.h" @@ -39,11 +33,15 @@ extern int jscyyparse(void*); namespace JSC { -void Parser::parse(JSGlobalData* globalData, FunctionParameters* parameters, int* errLine, UString* errMsg) +void Parser::parse(JSGlobalObject* lexicalGlobalObject, FunctionParameters* parameters, JSParserStrictness strictness, JSParserMode mode, int* errLine, UString* errMsg) { +<<<<<<< HEAD #ifdef ANDROID_INSTRUMENT android::TimeCounter::start(android::TimeCounter::JavaScriptParseTimeCounter); #endif +======= + ASSERT(lexicalGlobalObject); +>>>>>>> webkit.org at r70209 m_sourceElements = 0; int defaultErrLine; @@ -57,10 +55,10 @@ void Parser::parse(JSGlobalData* globalData, FunctionParameters* parameters, int *errLine = -1; *errMsg = UString(); - Lexer& lexer = *globalData->lexer; + Lexer& lexer = *lexicalGlobalObject->globalData()->lexer; lexer.setCode(*m_source, m_arena); - int parseError = jsParse(globalData, parameters, m_source); + int parseError = jsParse(lexicalGlobalObject, parameters, strictness, mode, m_source); int lineNumber = lexer.lineNumber(); bool lexError = lexer.sawError(); lexer.clear(); -- cgit v1.1