summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/JavaScriptCore/parser/Lexer.cpp
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar@trolltech.com>2009-10-23 05:13:34 (GMT)
committerGunnar Sletta <gunnar@trolltech.com>2009-10-23 05:13:34 (GMT)
commitaab648826f0a11a93341f29e88c46902d5f31e4d (patch)
tree11d26e0f7353c66a92c7af23a67bf32782f19332 /src/3rdparty/webkit/JavaScriptCore/parser/Lexer.cpp
parent5de213210ef4f14e698c3fd970cf7e6c5b27c72d (diff)
parenteeb116b56f9555458438dfe235b16488db9b1494 (diff)
downloadQt-aab648826f0a11a93341f29e88c46902d5f31e4d.zip
Qt-aab648826f0a11a93341f29e88c46902d5f31e4d.tar.gz
Qt-aab648826f0a11a93341f29e88c46902d5f31e4d.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/parser/Lexer.cpp')
-rw-r--r--src/3rdparty/webkit/JavaScriptCore/parser/Lexer.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/parser/Lexer.cpp b/src/3rdparty/webkit/JavaScriptCore/parser/Lexer.cpp
index 785b219..df30838 100644
--- a/src/3rdparty/webkit/JavaScriptCore/parser/Lexer.cpp
+++ b/src/3rdparty/webkit/JavaScriptCore/parser/Lexer.cpp
@@ -46,12 +46,6 @@ using namespace JSC;
#include "Lookup.h"
#include "Lexer.lut.h"
-// A bridge for yacc from the C world to the C++ world.
-int jscyylex(void* lvalp, void* llocp, void* globalData)
-{
- return static_cast<JSGlobalData*>(globalData)->lexer->lex(lvalp, llocp);
-}
-
namespace JSC {
static const UChar byteOrderMark = 0xFEFF;