From 9a7624ce5c4f78f89408eb0d9a33b1cd1569eb3c Mon Sep 17 00:00:00 2001 From: Bill King Date: Wed, 30 Sep 2009 15:26:42 +1000 Subject: (TDS) Fixes missing field/table name escaping. --- src/sql/drivers/tds/qsql_tds.cpp | 11 +++++++++++ src/sql/drivers/tds/qsql_tds.h | 2 ++ 2 files changed, 13 insertions(+) diff --git a/src/sql/drivers/tds/qsql_tds.cpp b/src/sql/drivers/tds/qsql_tds.cpp index 005905b..dddc1b4 100644 --- a/src/sql/drivers/tds/qsql_tds.cpp +++ b/src/sql/drivers/tds/qsql_tds.cpp @@ -794,4 +794,15 @@ QSqlIndex QTDSDriver::primaryIndex(const QString& tablename) const return idx; } +QString QTDSDriver::escapeIdentifier(const QString &identifier, IdentifierType type) const +{ + QString res = identifier; + if(!identifier.isEmpty() && !identifier.startsWith(QLatin1Char('"')) && !identifier.endsWith(QLatin1Char('"')) ) { + res.replace(QLatin1Char('"'), QLatin1String("\"\"")); + res.prepend(QLatin1Char('"')).append(QLatin1Char('"')); + res.replace(QLatin1Char('.'), QLatin1String("\".\"")); + } + return res; +} + QT_END_NAMESPACE diff --git a/src/sql/drivers/tds/qsql_tds.h b/src/sql/drivers/tds/qsql_tds.h index 6001106..0ceae6d 100644 --- a/src/sql/drivers/tds/qsql_tds.h +++ b/src/sql/drivers/tds/qsql_tds.h @@ -116,6 +116,8 @@ public: bool trimStrings) const; QVariant handle() const; + QString escapeIdentifier(const QString &identifier, IdentifierType type) const; + protected: bool beginTransaction(); bool commitTransaction(); -- cgit v0.12 From 1ceaa588f254888e0d9cf73e8d094dfdb8f3b8ab Mon Sep 17 00:00:00 2001 From: Bill King Date: Wed, 30 Sep 2009 15:31:48 +1000 Subject: (TDS) Fixes improper formatting of date values Task-number: QT-754 --- src/sql/drivers/tds/qsql_tds.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/sql/drivers/tds/qsql_tds.cpp b/src/sql/drivers/tds/qsql_tds.cpp index dddc1b4..8acd599 100644 --- a/src/sql/drivers/tds/qsql_tds.cpp +++ b/src/sql/drivers/tds/qsql_tds.cpp @@ -747,7 +747,9 @@ QString QTDSDriver::formatValue(const QSqlField &field, r = QLatin1String("NULL"); else if (field.type() == QVariant::DateTime) { if (field.value().toDateTime().isValid()){ - r = field.value().toDateTime().toString(QLatin1String("'yyyyMMdd hh:mm:ss'")); + r = field.value().toDateTime().toString(QLatin1String("yyyyMMdd hh:mm:ss")); + r.prepend(QLatin1String("'")); + r.append(QLatin1String("'")); } else r = QLatin1String("NULL"); } else if (field.type() == QVariant::ByteArray) { -- cgit v0.12 From decaf4fe6e5270efaec6c51c4bc28664b2dbb3be Mon Sep 17 00:00:00 2001 From: Kent Hansen Date: Wed, 30 Sep 2009 13:54:04 +0200 Subject: avoid JavaScriptCore C API functions being exported from QtScript library Reviewed-by: Simon Hausmann --- src/script/script.pro | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/script/script.pro b/src/script/script.pro index 6c6b701..659aa26 100644 --- a/src/script/script.pro +++ b/src/script/script.pro @@ -62,6 +62,9 @@ DEFINES += WTF_USE_JAVASCRIPTCORE_BINDINGS=1 WTF_CHANGES=1 DEFINES += NDEBUG +# Avoid JSC C API functions being exported. +DEFINES += JS_EXPORT="" JS_EXPORTDATA="" + INCLUDEPATH += $$PWD include(script.pri) -- cgit v0.12 From d48b960a20c125a4cd7f906a89046116e3c8b376 Mon Sep 17 00:00:00 2001 From: Alexis Menard Date: Wed, 30 Sep 2009 13:57:33 +0200 Subject: Fix auto-test build. Reviewed-by:jesper --- tests/auto/qlistview/tst_qlistview.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/auto/qlistview/tst_qlistview.cpp b/tests/auto/qlistview/tst_qlistview.cpp index 499fb0b..d9cab02 100644 --- a/tests/auto/qlistview/tst_qlistview.cpp +++ b/tests/auto/qlistview/tst_qlistview.cpp @@ -59,6 +59,8 @@ #include #endif +#include "../../shared/util.h" + //TESTED_CLASS= //TESTED_FILES= -- cgit v0.12 From 21cfe5bf6550ae359d6bfa937b1308891954e9bb Mon Sep 17 00:00:00 2001 From: Alexis Menard Date: Wed, 30 Sep 2009 14:03:45 +0200 Subject: Make the test fail, not crash for now. A task is already open to fix it. Reviewed-by:jesper --- tests/auto/qdom/tst_qdom.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/auto/qdom/tst_qdom.cpp b/tests/auto/qdom/tst_qdom.cpp index 6637202..6987186 100644 --- a/tests/auto/qdom/tst_qdom.cpp +++ b/tests/auto/qdom/tst_qdom.cpp @@ -1908,7 +1908,8 @@ void tst_QDom::taskQTBUG4595_dontAssertWhenDocumentSpecifiesUnknownEncoding() co QDomDocument d; QVERIFY(d.setContent(xmlWithUnknownEncoding)); - QString dontAssert = d.toString(); // this should not assert + //QString dontAssert = d.toString(); // this should not assert + QVERIFY2(false, "Line above crashes but we still want to run all tests."); QVERIFY(true); } -- cgit v0.12 From 3868e92de3b27f3e030b77cfa746888a0dbb39e7 Mon Sep 17 00:00:00 2001 From: Jani Hautakangas Date: Wed, 30 Sep 2009 15:21:02 +0300 Subject: Add redo keyboard shortcut for Symbian. Symbian had undo shortcut already defined so this will add redo shortcut to get symmetrical undo-redo Reviewed-by: axis --- src/gui/kernel/qkeysequence.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp index aec757f..b44ef7f 100644 --- a/src/gui/kernel/qkeysequence.cpp +++ b/src/gui/kernel/qkeysequence.cpp @@ -571,7 +571,7 @@ const QKeyBinding QKeySequencePrivate::keyBindings[] = { {QKeySequence::Close, 0, Qt::CTRL | Qt::Key_W, QApplicationPrivate::KB_Win | QApplicationPrivate::KB_X11}, {QKeySequence::Close, 1, Qt::CTRL | Qt::Key_W, QApplicationPrivate::KB_Mac}, {QKeySequence::Cut, 1, Qt::CTRL | Qt::Key_X, QApplicationPrivate::KB_All}, - {QKeySequence::Redo, 1, Qt::CTRL | Qt::Key_Y, QApplicationPrivate::KB_Win}, + {QKeySequence::Redo, 1, Qt::CTRL | Qt::Key_Y, QApplicationPrivate::KB_Win | QApplicationPrivate::KB_S60}, {QKeySequence::Redo, 0, Qt::CTRL | Qt::Key_Y, QApplicationPrivate::KB_Mac},//different priority from above {QKeySequence::Undo, 1, Qt::CTRL | Qt::Key_Z, QApplicationPrivate::KB_All}, {QKeySequence::Back, 1, Qt::CTRL | Qt::Key_BracketLeft, QApplicationPrivate::KB_Mac}, @@ -600,7 +600,7 @@ const QKeyBinding QKeySequencePrivate::keyBindings[] = { {QKeySequence::FindPrevious, 0, Qt::CTRL | Qt::SHIFT | Qt::Key_G, QApplicationPrivate::KB_Win}, {QKeySequence::AddTab, 1, Qt::CTRL | Qt::SHIFT | Qt::Key_N, QApplicationPrivate::KB_KDE}, {QKeySequence::SaveAs, 0, Qt::CTRL | Qt::SHIFT | Qt::Key_S, QApplicationPrivate::KB_Gnome | QApplicationPrivate::KB_Mac}, - {QKeySequence::Redo, 0, Qt::CTRL | Qt::SHIFT | Qt::Key_Z, QApplicationPrivate::KB_Win | QApplicationPrivate::KB_X11}, + {QKeySequence::Redo, 0, Qt::CTRL | Qt::SHIFT | Qt::Key_Z, QApplicationPrivate::KB_Win | QApplicationPrivate::KB_X11 | QApplicationPrivate::KB_S60}, {QKeySequence::Redo, 1, Qt::CTRL | Qt::SHIFT | Qt::Key_Z, QApplicationPrivate::KB_Mac}, //different priority from above {QKeySequence::PreviousChild, 1, Qt::CTRL | Qt::SHIFT | Qt::Key_Backtab, QApplicationPrivate::KB_Win | QApplicationPrivate::KB_X11}, {QKeySequence::PreviousChild, 0, Qt::CTRL | Qt::SHIFT | Qt::Key_Backtab, QApplicationPrivate::KB_Mac },//different priority from above -- cgit v0.12 From 71b3a015d5f051c732646ead395e56a609cc51af Mon Sep 17 00:00:00 2001 From: Alexis Menard Date: Wed, 30 Sep 2009 14:30:12 +0200 Subject: Be consistant between static method and regular QFileDialog contructor. The protected constructor of QFileDialog call selectAll() on the line edit. This constructor is only called by static methods. But the regular constructor didn't behave the same. Now it does :D. Task-number:QTBUG-4419 Reviewed-by:jasplin --- src/gui/dialogs/qfiledialog.cpp | 2 ++ tests/auto/qfiledialog/tst_qfiledialog.cpp | 29 +++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/src/gui/dialogs/qfiledialog.cpp b/src/gui/dialogs/qfiledialog.cpp index 14f19f2..297c900 100644 --- a/src/gui/dialogs/qfiledialog.cpp +++ b/src/gui/dialogs/qfiledialog.cpp @@ -317,6 +317,7 @@ QFileDialog::QFileDialog(QWidget *parent, Qt::WindowFlags f) { Q_D(QFileDialog); d->init(); + d->lineEdit()->selectAll(); } /*! @@ -334,6 +335,7 @@ QFileDialog::QFileDialog(QWidget *parent, { Q_D(QFileDialog); d->init(directory, filter, caption); + d->lineEdit()->selectAll(); } /*! diff --git a/tests/auto/qfiledialog/tst_qfiledialog.cpp b/tests/auto/qfiledialog/tst_qfiledialog.cpp index 1aa5ee1..9b083ea 100644 --- a/tests/auto/qfiledialog/tst_qfiledialog.cpp +++ b/tests/auto/qfiledialog/tst_qfiledialog.cpp @@ -169,6 +169,8 @@ private slots: void task257579_sideBarWithNonCleanUrls(); void task259105_filtersCornerCases(); + void QTBUG4419_lineEditSelectAll(); + private: QByteArray userSettings; }; @@ -2153,5 +2155,32 @@ void tst_QFiledialog::task259105_filtersCornerCases() filters->setCurrentIndex(1); QCOMPARE(filters->currentText(), QLatin1String("Text Files")); } + +void tst_QFiledialog::QTBUG4419_lineEditSelectAll() +{ + QString tempPath = QDir::tempPath(); + QTemporaryFile *t; + t = new QTemporaryFile; + t->open(); + QNonNativeFileDialog fd(0, "TestFileDialog", t->fileName()); + + fd.setDirectory(tempPath); + fd.setViewMode(QFileDialog::List); + fd.setAcceptMode(QFileDialog::AcceptSave); + fd.setFileMode(QFileDialog::AnyFile); + + fd.show(); + QApplication::setActiveWindow(&fd); + QTest::qWaitForWindowShown(&fd); + QTRY_COMPARE(fd.isVisible(), true); + QTRY_COMPARE(QApplication::activeWindow(), static_cast(&fd)); + + QTest::qWait(500); + QLineEdit *lineEdit = qFindChild(&fd, "fileNameEdit"); + + QCOMPARE(tempPath + QChar('/') + lineEdit->text(), t->fileName()); + QCOMPARE(tempPath + QChar('/') + lineEdit->selectedText(), t->fileName()); +} + QTEST_MAIN(tst_QFiledialog) #include "tst_qfiledialog.moc" -- cgit v0.12 From ca2834b0056b301f1d1b732840fcb106fdd477ac Mon Sep 17 00:00:00 2001 From: Alexis Menard Date: Wed, 30 Sep 2009 14:34:50 +0200 Subject: Don't need to wait that much. Reviewed-by:TrustMe --- tests/auto/qfiledialog/tst_qfiledialog.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/qfiledialog/tst_qfiledialog.cpp b/tests/auto/qfiledialog/tst_qfiledialog.cpp index 9b083ea..f6b082f 100644 --- a/tests/auto/qfiledialog/tst_qfiledialog.cpp +++ b/tests/auto/qfiledialog/tst_qfiledialog.cpp @@ -2175,7 +2175,7 @@ void tst_QFiledialog::QTBUG4419_lineEditSelectAll() QTRY_COMPARE(fd.isVisible(), true); QTRY_COMPARE(QApplication::activeWindow(), static_cast(&fd)); - QTest::qWait(500); + QTest::qWait(250); QLineEdit *lineEdit = qFindChild(&fd, "fileNameEdit"); QCOMPARE(tempPath + QChar('/') + lineEdit->text(), t->fileName()); -- cgit v0.12 From 343eb73edaa4a05860bf8749a2ff70359f45eb78 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 30 Sep 2009 14:36:22 +0200 Subject: Fix reader.google.com crashes Revert this change: ---- 2008-12-18 Bernhard Rosenkraenzer Reviewed by Darin Adler. https://bugs.webkit.org/show_bug.cgi?id=22205 Fix compatibility with bison 2.4, partially based on older patch by Priit Laes * WebCore/css/CSSGrammar.y: Made compatible with bison 2.4 ----- Cherry-picked from qtwebkit.git 4.5 repository/branch with commit 23d13ba45ee59379c04afdef8472acc8611bb36a --- src/3rdparty/webkit/WebCore/css/CSSGrammar.y | 10 +- .../webkit/WebCore/generated/CSSGrammar.cpp | 2342 ++++++++------------ src/3rdparty/webkit/WebCore/generated/CSSGrammar.h | 231 +- 3 files changed, 1133 insertions(+), 1450 deletions(-) diff --git a/src/3rdparty/webkit/WebCore/css/CSSGrammar.y b/src/3rdparty/webkit/WebCore/css/CSSGrammar.y index 31f1c8b..9ee9c93 100644 --- a/src/3rdparty/webkit/WebCore/css/CSSGrammar.y +++ b/src/3rdparty/webkit/WebCore/css/CSSGrammar.y @@ -94,8 +94,6 @@ static int cssyylex(YYSTYPE* yylval, void* parser) %expect 49 -%nonassoc LOWEST_PREC - %left UNIMPORTANT_TOK %token WHITESPACE SGML_CD @@ -351,7 +349,7 @@ maybe_charset: closing_brace: '}' - | %prec LOWEST_PREC TOKEN_EOF + | %prec maybe_sgml TOKEN_EOF ; charset: @@ -1357,10 +1355,10 @@ term: $$.string = $1; } /* We might need to actually parse the number from a dimension, but we can't just put something that uses $$.string into unary_term. */ - | DIMEN maybe_space { $$.id = 0; $$.string = $1; $$.unit = CSSPrimitiveValue::CSS_DIMENSION; } - | unary_operator DIMEN maybe_space { $$.id = 0; $$.string = $2; $$.unit = CSSPrimitiveValue::CSS_DIMENSION; } + | DIMEN maybe_space { $$.id = 0; $$.string = $1; $$.unit = CSSPrimitiveValue::CSS_DIMENSION } + | unary_operator DIMEN maybe_space { $$.id = 0; $$.string = $2; $$.unit = CSSPrimitiveValue::CSS_DIMENSION } | URI maybe_space { $$.id = 0; $$.string = $1; $$.unit = CSSPrimitiveValue::CSS_URI; } - | UNICODERANGE maybe_space { $$.id = 0; $$.string = $1; $$.unit = CSSPrimitiveValue::CSS_UNICODE_RANGE; } + | UNICODERANGE maybe_space { $$.id = 0; $$.string = $1; $$.unit = CSSPrimitiveValue::CSS_UNICODE_RANGE } | hexcolor { $$.id = 0; $$.string = $1; $$.unit = CSSPrimitiveValue::CSS_PARSER_HEXCOLOR; } | '#' maybe_space { $$.id = 0; $$.string = CSSParserString(); $$.unit = CSSPrimitiveValue::CSS_PARSER_HEXCOLOR; } /* Handle error case: "color: #;" */ /* FIXME: according to the specs a function can have a unary_operator in front. I know no case where this makes sense */ diff --git a/src/3rdparty/webkit/WebCore/generated/CSSGrammar.cpp b/src/3rdparty/webkit/WebCore/generated/CSSGrammar.cpp index 03a7829..b980a0a 100644 --- a/src/3rdparty/webkit/WebCore/generated/CSSGrammar.cpp +++ b/src/3rdparty/webkit/WebCore/generated/CSSGrammar.cpp @@ -1,23 +1,24 @@ - -/* A Bison parser, made by GNU Bison 2.4.1. */ +/* A Bison parser, made by GNU Bison 2.3. */ /* Skeleton implementation for Bison's Yacc-like parsers in C - - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 + + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - - This program is free software: you can redistribute it and/or modify + + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - + the Free Software Foundation; either version 2, or (at your option) + any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ /* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work @@ -28,7 +29,7 @@ special exception, which will cause the skeleton and the resulting Bison output files to be licensed under the GNU General Public License without this special exception. - + This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ @@ -46,7 +47,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.4.1" +#define YYBISON_VERSION "2.3" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -54,28 +55,157 @@ /* Pure parsers. */ #define YYPURE 1 -/* Push parsers. */ -#define YYPUSH 0 - -/* Pull parsers. */ -#define YYPULL 1 - /* Using locations. */ #define YYLSP_NEEDED 0 /* Substitute the variable and function names. */ -#define yyparse cssyyparse -#define yylex cssyylex -#define yyerror cssyyerror -#define yylval cssyylval -#define yychar cssyychar -#define yydebug cssyydebug -#define yynerrs cssyynerrs +#define yyparse cssyyparse +#define yylex cssyylex +#define yyerror cssyyerror +#define yylval cssyylval +#define yychar cssyychar +#define yydebug cssyydebug +#define yynerrs cssyynerrs -/* Copy the first part of user declarations. */ +/* Tokens. */ +#ifndef YYTOKENTYPE +# define YYTOKENTYPE + /* Put the tokens into the symbol table, so that GDB and other debuggers + know about them. */ + enum yytokentype { + TOKEN_EOF = 0, + UNIMPORTANT_TOK = 258, + WHITESPACE = 259, + SGML_CD = 260, + INCLUDES = 261, + DASHMATCH = 262, + BEGINSWITH = 263, + ENDSWITH = 264, + CONTAINS = 265, + STRING = 266, + IDENT = 267, + NTH = 268, + HEX = 269, + IDSEL = 270, + IMPORT_SYM = 271, + PAGE_SYM = 272, + MEDIA_SYM = 273, + FONT_FACE_SYM = 274, + CHARSET_SYM = 275, + NAMESPACE_SYM = 276, + WEBKIT_RULE_SYM = 277, + WEBKIT_DECLS_SYM = 278, + WEBKIT_KEYFRAME_RULE_SYM = 279, + WEBKIT_KEYFRAMES_SYM = 280, + WEBKIT_VALUE_SYM = 281, + WEBKIT_MEDIAQUERY_SYM = 282, + WEBKIT_SELECTOR_SYM = 283, + WEBKIT_VARIABLES_SYM = 284, + WEBKIT_DEFINE_SYM = 285, + VARIABLES_FOR = 286, + WEBKIT_VARIABLES_DECLS_SYM = 287, + ATKEYWORD = 288, + IMPORTANT_SYM = 289, + MEDIA_ONLY = 290, + MEDIA_NOT = 291, + MEDIA_AND = 292, + QEMS = 293, + EMS = 294, + EXS = 295, + PXS = 296, + CMS = 297, + MMS = 298, + INS = 299, + PTS = 300, + PCS = 301, + DEGS = 302, + RADS = 303, + GRADS = 304, + TURNS = 305, + MSECS = 306, + SECS = 307, + HERZ = 308, + KHERZ = 309, + DIMEN = 310, + PERCENTAGE = 311, + FLOATTOKEN = 312, + INTEGER = 313, + URI = 314, + FUNCTION = 315, + NOTFUNCTION = 316, + UNICODERANGE = 317, + VARCALL = 318 + }; +#endif +/* Tokens. */ +#define TOKEN_EOF 0 +#define UNIMPORTANT_TOK 258 +#define WHITESPACE 259 +#define SGML_CD 260 +#define INCLUDES 261 +#define DASHMATCH 262 +#define BEGINSWITH 263 +#define ENDSWITH 264 +#define CONTAINS 265 +#define STRING 266 +#define IDENT 267 +#define NTH 268 +#define HEX 269 +#define IDSEL 270 +#define IMPORT_SYM 271 +#define PAGE_SYM 272 +#define MEDIA_SYM 273 +#define FONT_FACE_SYM 274 +#define CHARSET_SYM 275 +#define NAMESPACE_SYM 276 +#define WEBKIT_RULE_SYM 277 +#define WEBKIT_DECLS_SYM 278 +#define WEBKIT_KEYFRAME_RULE_SYM 279 +#define WEBKIT_KEYFRAMES_SYM 280 +#define WEBKIT_VALUE_SYM 281 +#define WEBKIT_MEDIAQUERY_SYM 282 +#define WEBKIT_SELECTOR_SYM 283 +#define WEBKIT_VARIABLES_SYM 284 +#define WEBKIT_DEFINE_SYM 285 +#define VARIABLES_FOR 286 +#define WEBKIT_VARIABLES_DECLS_SYM 287 +#define ATKEYWORD 288 +#define IMPORTANT_SYM 289 +#define MEDIA_ONLY 290 +#define MEDIA_NOT 291 +#define MEDIA_AND 292 +#define QEMS 293 +#define EMS 294 +#define EXS 295 +#define PXS 296 +#define CMS 297 +#define MMS 298 +#define INS 299 +#define PTS 300 +#define PCS 301 +#define DEGS 302 +#define RADS 303 +#define GRADS 304 +#define TURNS 305 +#define MSECS 306 +#define SECS 307 +#define HERZ 308 +#define KHERZ 309 +#define DIMEN 310 +#define PERCENTAGE 311 +#define FLOATTOKEN 312 +#define INTEGER 313 +#define URI 314 +#define FUNCTION 315 +#define NOTFUNCTION 316 +#define UNICODERANGE 317 +#define VARCALL 318 -/* Line 189 of yacc.c */ + + + +/* Copy the first part of user declarations. */ #line 1 "../css/CSSGrammar.y" @@ -131,9 +261,6 @@ using namespace HTMLNames; -/* Line 189 of yacc.c */ -#line 136 "WebCore/tmp/../generated/CSSGrammar.tab.c" - /* Enabling traces. */ #ifndef YYDEBUG # define YYDEBUG 0 @@ -152,88 +279,10 @@ using namespace HTMLNames; # define YYTOKEN_TABLE 0 #endif - -/* Tokens. */ -#ifndef YYTOKENTYPE -# define YYTOKENTYPE - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ - enum yytokentype { - TOKEN_EOF = 0, - LOWEST_PREC = 258, - UNIMPORTANT_TOK = 259, - WHITESPACE = 260, - SGML_CD = 261, - INCLUDES = 262, - DASHMATCH = 263, - BEGINSWITH = 264, - ENDSWITH = 265, - CONTAINS = 266, - STRING = 267, - IDENT = 268, - NTH = 269, - HEX = 270, - IDSEL = 271, - IMPORT_SYM = 272, - PAGE_SYM = 273, - MEDIA_SYM = 274, - FONT_FACE_SYM = 275, - CHARSET_SYM = 276, - NAMESPACE_SYM = 277, - WEBKIT_RULE_SYM = 278, - WEBKIT_DECLS_SYM = 279, - WEBKIT_KEYFRAME_RULE_SYM = 280, - WEBKIT_KEYFRAMES_SYM = 281, - WEBKIT_VALUE_SYM = 282, - WEBKIT_MEDIAQUERY_SYM = 283, - WEBKIT_SELECTOR_SYM = 284, - WEBKIT_VARIABLES_SYM = 285, - WEBKIT_DEFINE_SYM = 286, - VARIABLES_FOR = 287, - WEBKIT_VARIABLES_DECLS_SYM = 288, - ATKEYWORD = 289, - IMPORTANT_SYM = 290, - MEDIA_ONLY = 291, - MEDIA_NOT = 292, - MEDIA_AND = 293, - QEMS = 294, - EMS = 295, - EXS = 296, - PXS = 297, - CMS = 298, - MMS = 299, - INS = 300, - PTS = 301, - PCS = 302, - DEGS = 303, - RADS = 304, - GRADS = 305, - TURNS = 306, - MSECS = 307, - SECS = 308, - HERZ = 309, - KHERZ = 310, - DIMEN = 311, - PERCENTAGE = 312, - FLOATTOKEN = 313, - INTEGER = 314, - URI = 315, - FUNCTION = 316, - NOTFUNCTION = 317, - UNICODERANGE = 318, - VARCALL = 319 - }; -#endif - - - #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -{ - -/* Line 214 of yacc.c */ #line 57 "../css/CSSGrammar.y" - +{ bool boolean; char character; int integer; @@ -255,21 +304,18 @@ typedef union YYSTYPE WebKitCSSKeyframeRule* keyframeRule; WebKitCSSKeyframesRule* keyframesRule; float val; - - - -/* Line 214 of yacc.c */ -#line 263 "WebCore/tmp/../generated/CSSGrammar.tab.c" -} YYSTYPE; -# define YYSTYPE_IS_TRIVIAL 1 +} +/* Line 187 of yacc.c. */ +#line 310 "WebCore/tmp/../generated/CSSGrammar.tab.c" + YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 +# define YYSTYPE_IS_TRIVIAL 1 #endif -/* Copy the second part of user declarations. */ -/* Line 264 of yacc.c */ +/* Copy the second part of user declarations. */ #line 81 "../css/CSSGrammar.y" @@ -285,8 +331,8 @@ static int cssyylex(YYSTYPE* yylval, void* parser) -/* Line 264 of yacc.c */ -#line 290 "WebCore/tmp/../generated/CSSGrammar.tab.c" +/* Line 216 of yacc.c. */ +#line 336 "WebCore/tmp/../generated/CSSGrammar.tab.c" #ifdef short # undef short @@ -361,14 +407,14 @@ typedef short int yytype_int16; #if (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) static int -YYID (int yyi) +YYID (int i) #else static int -YYID (yyi) - int yyi; +YYID (i) + int i; #endif { - return yyi; + return i; } #endif @@ -449,9 +495,9 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */ /* A type that is properly aligned for any stack member. */ union yyalloc { - yytype_int16 yyss_alloc; - YYSTYPE yyvs_alloc; -}; + yytype_int16 yyss; + YYSTYPE yyvs; + }; /* The size of the maximum gap between one aligned stack and the next. */ # define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1) @@ -485,12 +531,12 @@ union yyalloc elements in the stack, and YYPTR gives the new location of the stack. Advance YYPTR to a properly aligned location for the next stack. */ -# define YYSTACK_RELOCATE(Stack_alloc, Stack) \ +# define YYSTACK_RELOCATE(Stack) \ do \ { \ YYSIZE_T yynewbytes; \ - YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ - Stack = &yyptr->Stack_alloc; \ + YYCOPY (&yyptr->Stack, Stack, yysize); \ + Stack = &yyptr->Stack; \ yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ yyptr += yynewbytes / sizeof (*yyptr); \ } \ @@ -501,10 +547,10 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 28 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 1315 +#define YYLAST 1274 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 85 +#define YYNTOKENS 84 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 90 /* YYNRULES -- Number of rules. */ @@ -514,7 +560,7 @@ union yyalloc /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 319 +#define YYMAXUTOK 318 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -525,16 +571,16 @@ static const yytype_uint8 yytranslate[] = 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 83, 2, 84, 2, 2, - 73, 74, 20, 76, 75, 79, 18, 82, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 17, 72, - 2, 81, 78, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 82, 2, 83, 2, 2, + 72, 73, 19, 75, 74, 78, 17, 81, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 16, 71, + 2, 80, 77, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 19, 2, 80, 2, 2, 2, 2, 2, 2, + 2, 18, 2, 79, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 70, 21, 71, 77, 2, 2, 2, + 2, 2, 2, 69, 20, 70, 76, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -549,11 +595,11 @@ static const yytype_uint8 yytranslate[] = 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, - 15, 16, 22, 23, 24, 25, 26, 27, 28, 29, + 15, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, - 60, 61, 62, 63, 64, 65, 66, 67, 68, 69 + 60, 61, 62, 63, 64, 65, 66, 67, 68 }; #if YYDEBUG @@ -593,130 +639,130 @@ static const yytype_uint16 yyprhs[] = /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int16 yyrhs[] = { - 86, 0, -1, 97, 96, 100, 101, 102, 103, -1, - 88, 95, -1, 90, 95, -1, 92, 95, -1, 93, - 95, -1, 94, 95, -1, 91, 95, -1, 89, 95, - -1, 104, -1, 109, -1, 28, 70, 95, 87, 95, - 71, -1, 30, 70, 95, 133, 95, 71, -1, 29, - 70, 95, 155, 71, -1, 38, 70, 95, 112, 71, - -1, 32, 70, 95, 160, 71, -1, 33, 5, 95, - 125, 71, -1, 34, 70, 95, 141, 71, -1, -1, - 95, 5, -1, -1, 96, 6, -1, 96, 5, -1, - -1, 99, -1, 71, -1, 0, -1, 26, 95, 12, - 95, 72, -1, 26, 1, 173, -1, 26, 1, 72, - -1, -1, 100, 109, 96, -1, 169, -1, -1, 101, - 110, 96, -1, -1, 102, 116, 96, -1, -1, 103, - 105, 96, -1, 140, -1, 128, -1, 136, -1, 137, - -1, 130, -1, 104, -1, 172, -1, 168, -1, 170, - -1, -1, 106, 108, 96, -1, 140, -1, 136, -1, - 137, -1, 130, -1, 107, -1, 172, -1, 168, -1, - 170, -1, 171, -1, 22, 95, 118, 95, 126, 72, - -1, 22, 95, 118, 95, 126, 173, -1, 22, 1, - 72, -1, 22, 1, 173, -1, 35, 95, 126, 70, - 95, 112, 71, -1, 36, 95, 111, 70, 95, 112, - 71, -1, -1, 37, 5, 127, -1, 114, -1, 113, - 114, -1, 113, -1, 1, 174, 1, -1, 1, -1, - 113, 1, -1, 114, 72, 95, -1, 114, 174, 72, - 95, -1, 1, 72, 95, -1, 1, 174, 1, 72, - 95, -1, 113, 114, 72, 95, -1, 113, 1, 72, - 95, -1, 113, 1, 174, 1, 72, 95, -1, 115, - 17, 95, 160, -1, 115, 95, 70, 95, 155, 71, - 95, -1, 115, 1, -1, 115, 17, 95, 1, 160, - -1, 115, 17, 95, -1, 115, 17, 95, 1, -1, - 13, 95, -1, 27, 95, 117, 118, 95, 72, -1, - 27, 1, 173, -1, 27, 1, 72, -1, -1, 13, - 5, -1, 12, -1, 65, -1, 13, 95, -1, -1, - 17, 95, 160, 95, -1, 73, 95, 119, 95, 120, - 74, 95, -1, 121, -1, 122, 95, 43, 95, 121, - -1, -1, 43, 95, 122, -1, -1, 41, -1, 42, - -1, 122, -1, 124, 95, 129, 123, -1, -1, 127, - -1, 125, -1, 127, 75, 95, 125, -1, 127, 1, - -1, 24, 95, 127, 70, 95, 106, 167, -1, 24, - 95, 70, 95, 106, 167, -1, 13, 95, -1, 31, - 95, 131, 95, 70, 95, 132, 71, -1, 13, -1, - 12, -1, -1, 132, 133, 95, -1, 134, 95, 70, - 95, 155, 71, -1, 135, -1, 134, 95, 75, 95, - 135, -1, 62, -1, 13, -1, 23, 1, 173, -1, - 23, 1, 72, -1, 25, 95, 70, 95, 155, 71, - 95, -1, 25, 1, 173, -1, 25, 1, 72, -1, - 76, 95, -1, 77, 95, -1, 78, 95, -1, 79, - -1, 76, -1, 141, 70, 95, 155, 98, -1, 143, - -1, 141, 75, 95, 143, -1, 141, 1, -1, 143, - 5, -1, 145, -1, 142, -1, 142, 145, -1, 143, - 138, 145, -1, 143, 1, -1, 21, -1, 20, 21, - -1, 13, 21, -1, 146, -1, 146, 147, -1, 147, - -1, 144, 146, -1, 144, 146, 147, -1, 144, 147, - -1, 13, -1, 20, -1, 148, -1, 147, 148, -1, - 147, 1, -1, 16, -1, 15, -1, 149, -1, 151, - -1, 154, -1, 18, 13, -1, 13, 95, -1, 19, - 95, 150, 80, -1, 19, 95, 150, 152, 95, 153, - 95, 80, -1, 19, 95, 144, 150, 80, -1, 19, - 95, 144, 150, 152, 95, 153, 95, 80, -1, 81, - -1, 7, -1, 8, -1, 9, -1, 10, -1, 11, - -1, 13, -1, 12, -1, 17, 13, -1, 17, 17, - 13, -1, 17, 66, 14, 74, -1, 17, 66, 64, - 74, -1, 17, 66, 13, 74, -1, 17, 67, 95, - 145, 95, 74, -1, 157, -1, 156, 157, -1, 156, - -1, 1, 174, 1, -1, 1, -1, 156, 1, -1, - 156, 174, -1, 157, 72, 95, -1, 157, 174, 72, - 95, -1, 1, 72, 95, -1, 1, 174, 1, 72, - 95, -1, 156, 157, 72, 95, -1, 156, 1, 72, - 95, -1, 156, 1, 174, 1, 72, 95, -1, 158, - 17, 95, 160, 159, -1, 164, 95, -1, 158, 1, - -1, 158, 17, 95, 1, 160, 159, -1, 158, 17, - 95, 160, 159, 1, -1, 40, 95, -1, 158, 17, - 95, -1, 158, 17, 95, 1, -1, 158, 173, -1, - 13, 95, -1, 40, 95, -1, -1, 162, -1, 160, - 161, 162, -1, 160, 1, -1, 82, 95, -1, 75, - 95, -1, -1, 163, -1, 139, 163, -1, 12, 95, - -1, 13, 95, -1, 61, 95, -1, 139, 61, 95, - -1, 65, 95, -1, 68, 95, -1, 166, -1, 83, - 95, -1, 165, -1, 164, 95, -1, 84, 95, -1, - 64, 95, -1, 63, 95, -1, 62, 95, -1, 47, - 95, -1, 48, 95, -1, 49, 95, -1, 50, 95, - -1, 51, 95, -1, 52, 95, -1, 53, 95, -1, - 54, 95, -1, 55, 95, -1, 56, 95, -1, 57, - 95, -1, 58, 95, -1, 59, 95, -1, 60, 95, - -1, 45, 95, -1, 44, 95, -1, 46, 95, -1, - 69, -1, 66, 95, 160, 74, 95, -1, 66, 95, - 1, -1, 15, 95, -1, 16, 95, -1, 98, -1, - 1, 98, -1, 39, 1, 173, -1, 39, 1, 72, - -1, 168, 96, -1, 169, 168, 96, -1, 109, -1, - 128, -1, 1, 173, -1, 70, 1, 174, 1, 98, - -1, 70, 1, 98, -1, 173, -1, 174, 1, 173, + 85, 0, -1, 96, 95, 99, 100, 101, 102, -1, + 87, 94, -1, 89, 94, -1, 91, 94, -1, 92, + 94, -1, 93, 94, -1, 90, 94, -1, 88, 94, + -1, 103, -1, 108, -1, 27, 69, 94, 86, 94, + 70, -1, 29, 69, 94, 132, 94, 70, -1, 28, + 69, 94, 154, 70, -1, 37, 69, 94, 111, 70, + -1, 31, 69, 94, 159, 70, -1, 32, 4, 94, + 124, 70, -1, 33, 69, 94, 140, 70, -1, -1, + 94, 4, -1, -1, 95, 5, -1, 95, 4, -1, + -1, 98, -1, 70, -1, 0, -1, 25, 94, 11, + 94, 71, -1, 25, 1, 172, -1, 25, 1, 71, + -1, -1, 99, 108, 95, -1, 168, -1, -1, 100, + 109, 95, -1, -1, 101, 115, 95, -1, -1, 102, + 104, 95, -1, 139, -1, 127, -1, 135, -1, 136, + -1, 129, -1, 103, -1, 171, -1, 167, -1, 169, + -1, -1, 105, 107, 95, -1, 139, -1, 135, -1, + 136, -1, 129, -1, 106, -1, 171, -1, 167, -1, + 169, -1, 170, -1, 21, 94, 117, 94, 125, 71, + -1, 21, 94, 117, 94, 125, 172, -1, 21, 1, + 71, -1, 21, 1, 172, -1, 34, 94, 125, 69, + 94, 111, 70, -1, 35, 94, 110, 69, 94, 111, + 70, -1, -1, 36, 4, 126, -1, 113, -1, 112, + 113, -1, 112, -1, 1, 173, 1, -1, 1, -1, + 112, 1, -1, 113, 71, 94, -1, 113, 173, 71, + 94, -1, 1, 71, 94, -1, 1, 173, 1, 71, + 94, -1, 112, 113, 71, 94, -1, 112, 1, 71, + 94, -1, 112, 1, 173, 1, 71, 94, -1, 114, + 16, 94, 159, -1, 114, 94, 69, 94, 154, 70, + 94, -1, 114, 1, -1, 114, 16, 94, 1, 159, + -1, 114, 16, 94, -1, 114, 16, 94, 1, -1, + 12, 94, -1, 26, 94, 116, 117, 94, 71, -1, + 26, 1, 172, -1, 26, 1, 71, -1, -1, 12, + 4, -1, 11, -1, 64, -1, 12, 94, -1, -1, + 16, 94, 159, 94, -1, 72, 94, 118, 94, 119, + 73, 94, -1, 120, -1, 121, 94, 42, 94, 120, + -1, -1, 42, 94, 121, -1, -1, 40, -1, 41, + -1, 121, -1, 123, 94, 128, 122, -1, -1, 126, + -1, 124, -1, 126, 74, 94, 124, -1, 126, 1, + -1, 23, 94, 126, 69, 94, 105, 166, -1, 23, + 94, 69, 94, 105, 166, -1, 12, 94, -1, 30, + 94, 130, 94, 69, 94, 131, 70, -1, 12, -1, + 11, -1, -1, 131, 132, 94, -1, 133, 94, 69, + 94, 154, 70, -1, 134, -1, 133, 94, 74, 94, + 134, -1, 61, -1, 12, -1, 22, 1, 172, -1, + 22, 1, 71, -1, 24, 94, 69, 94, 154, 70, + 94, -1, 24, 1, 172, -1, 24, 1, 71, -1, + 75, 94, -1, 76, 94, -1, 77, 94, -1, 78, + -1, 75, -1, 140, 69, 94, 154, 97, -1, 142, + -1, 140, 74, 94, 142, -1, 140, 1, -1, 142, + 4, -1, 144, -1, 141, -1, 141, 144, -1, 142, + 137, 144, -1, 142, 1, -1, 20, -1, 19, 20, + -1, 12, 20, -1, 145, -1, 145, 146, -1, 146, + -1, 143, 145, -1, 143, 145, 146, -1, 143, 146, + -1, 12, -1, 19, -1, 147, -1, 146, 147, -1, + 146, 1, -1, 15, -1, 14, -1, 148, -1, 150, + -1, 153, -1, 17, 12, -1, 12, 94, -1, 18, + 94, 149, 79, -1, 18, 94, 149, 151, 94, 152, + 94, 79, -1, 18, 94, 143, 149, 79, -1, 18, + 94, 143, 149, 151, 94, 152, 94, 79, -1, 80, + -1, 6, -1, 7, -1, 8, -1, 9, -1, 10, + -1, 12, -1, 11, -1, 16, 12, -1, 16, 16, + 12, -1, 16, 65, 13, 73, -1, 16, 65, 63, + 73, -1, 16, 65, 12, 73, -1, 16, 66, 94, + 144, 94, 73, -1, 156, -1, 155, 156, -1, 155, + -1, 1, 173, 1, -1, 1, -1, 155, 1, -1, + 155, 173, -1, 156, 71, 94, -1, 156, 173, 71, + 94, -1, 1, 71, 94, -1, 1, 173, 1, 71, + 94, -1, 155, 156, 71, 94, -1, 155, 1, 71, + 94, -1, 155, 1, 173, 1, 71, 94, -1, 157, + 16, 94, 159, 158, -1, 163, 94, -1, 157, 1, + -1, 157, 16, 94, 1, 159, 158, -1, 157, 16, + 94, 159, 158, 1, -1, 39, 94, -1, 157, 16, + 94, -1, 157, 16, 94, 1, -1, 157, 172, -1, + 12, 94, -1, 39, 94, -1, -1, 161, -1, 159, + 160, 161, -1, 159, 1, -1, 81, 94, -1, 74, + 94, -1, -1, 162, -1, 138, 162, -1, 11, 94, + -1, 12, 94, -1, 60, 94, -1, 138, 60, 94, + -1, 64, 94, -1, 67, 94, -1, 165, -1, 82, + 94, -1, 164, -1, 163, 94, -1, 83, 94, -1, + 63, 94, -1, 62, 94, -1, 61, 94, -1, 46, + 94, -1, 47, 94, -1, 48, 94, -1, 49, 94, + -1, 50, 94, -1, 51, 94, -1, 52, 94, -1, + 53, 94, -1, 54, 94, -1, 55, 94, -1, 56, + 94, -1, 57, 94, -1, 58, 94, -1, 59, 94, + -1, 44, 94, -1, 43, 94, -1, 45, 94, -1, + 68, -1, 65, 94, 159, 73, 94, -1, 65, 94, + 1, -1, 14, 94, -1, 15, 94, -1, 97, -1, + 1, 97, -1, 38, 1, 172, -1, 38, 1, 71, + -1, 167, 95, -1, 168, 167, 95, -1, 108, -1, + 127, -1, 1, 172, -1, 69, 1, 173, 1, 97, + -1, 69, 1, 97, -1, 172, -1, 173, 1, 172, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 265, 265, 266, 267, 268, 269, 270, 271, 272, - 276, 277, 281, 287, 293, 299, 305, 319, 326, 336, - 337, 340, 342, 343, 346, 348, 353, 354, 358, 364, - 366, 370, 372, 377, 381, 383, 390, 392, 395, 397, - 405, 406, 407, 408, 409, 413, 414, 415, 416, 420, - 421, 432, 433, 434, 435, 439, 440, 441, 442, 443, - 448, 451, 454, 457, 463, 467, 473, 477, 483, 486, - 491, 494, 497, 500, 506, 509, 512, 515, 518, 523, - 526, 532, 536, 540, 544, 548, 553, 560, 566, 571, - 572, 576, 577, 581, 582, 586, 592, 595, 601, 608, - 613, 620, 623, 629, 632, 635, 641, 646, 654, 657, - 661, 666, 671, 677, 680, 686, 692, 699, 700, 704, - 705, 713, 719, 724, 733, 734, 758, 761, 767, 771, - 774, 780, 781, 782, 786, 787, 791, 797, 806, 814, - 820, 826, 829, 833, 849, 869, 875, 876, 877, 881, - 886, 893, 899, 909, 921, 934, 942, 950, 953, 966, - 972, 980, 992, 993, 994, 998, 1009, 1020, 1025, 1031, - 1039, 1051, 1054, 1057, 1060, 1063, 1066, 1072, 1073, 1077, - 1102, 1117, 1135, 1153, 1172, 1187, 1190, 1195, 1198, 1201, - 1204, 1207, 1213, 1216, 1219, 1222, 1225, 1230, 1233, 1239, - 1253, 1265, 1269, 1276, 1281, 1286, 1291, 1296, 1303, 1309, - 1310, 1314, 1319, 1333, 1339, 1342, 1345, 1351, 1352, 1353, - 1354, 1360, 1361, 1362, 1363, 1364, 1365, 1367, 1370, 1373, - 1377, 1378, 1379, 1380, 1381, 1382, 1383, 1384, 1385, 1386, - 1387, 1388, 1389, 1390, 1391, 1392, 1393, 1394, 1395, 1396, - 1400, 1408, 1417, 1433, 1434, 1441, 1444, 1450, 1453, 1459, - 1460, 1464, 1470, 1476, 1494, 1495, 1499, 1500 + 0, 263, 263, 264, 265, 266, 267, 268, 269, 270, + 274, 275, 279, 285, 291, 297, 303, 317, 324, 334, + 335, 338, 340, 341, 344, 346, 351, 352, 356, 362, + 364, 368, 370, 375, 379, 381, 388, 390, 393, 395, + 403, 404, 405, 406, 407, 411, 412, 413, 414, 418, + 419, 430, 431, 432, 433, 437, 438, 439, 440, 441, + 446, 449, 452, 455, 461, 465, 471, 475, 481, 484, + 489, 492, 495, 498, 504, 507, 510, 513, 516, 521, + 524, 530, 534, 538, 542, 546, 551, 558, 564, 569, + 570, 574, 575, 579, 580, 584, 590, 593, 599, 606, + 611, 618, 621, 627, 630, 633, 639, 644, 652, 655, + 659, 664, 669, 675, 678, 684, 690, 697, 698, 702, + 703, 711, 717, 722, 731, 732, 756, 759, 765, 769, + 772, 778, 779, 780, 784, 785, 789, 795, 804, 812, + 818, 824, 827, 831, 847, 867, 873, 874, 875, 879, + 884, 891, 897, 907, 919, 932, 940, 948, 951, 964, + 970, 978, 990, 991, 992, 996, 1007, 1018, 1023, 1029, + 1037, 1049, 1052, 1055, 1058, 1061, 1064, 1070, 1071, 1075, + 1100, 1115, 1133, 1151, 1170, 1185, 1188, 1193, 1196, 1199, + 1202, 1205, 1211, 1214, 1217, 1220, 1223, 1228, 1231, 1237, + 1251, 1263, 1267, 1274, 1279, 1284, 1289, 1294, 1301, 1307, + 1308, 1312, 1317, 1331, 1337, 1340, 1343, 1349, 1350, 1351, + 1352, 1358, 1359, 1360, 1361, 1362, 1363, 1365, 1368, 1371, + 1375, 1376, 1377, 1378, 1379, 1380, 1381, 1382, 1383, 1384, + 1385, 1386, 1387, 1388, 1389, 1390, 1391, 1392, 1393, 1394, + 1398, 1406, 1415, 1431, 1432, 1439, 1442, 1448, 1451, 1457, + 1458, 1462, 1468, 1474, 1492, 1493, 1497, 1498 }; #endif @@ -725,28 +771,27 @@ static const yytype_uint16 yyrline[] = First, the terminals, then, starting at YYNTOKENS, nonterminals. */ static const char *const yytname[] = { - "TOKEN_EOF", "error", "$undefined", "LOWEST_PREC", "UNIMPORTANT_TOK", - "WHITESPACE", "SGML_CD", "INCLUDES", "DASHMATCH", "BEGINSWITH", - "ENDSWITH", "CONTAINS", "STRING", "IDENT", "NTH", "HEX", "IDSEL", "':'", - "'.'", "'['", "'*'", "'|'", "IMPORT_SYM", "PAGE_SYM", "MEDIA_SYM", - "FONT_FACE_SYM", "CHARSET_SYM", "NAMESPACE_SYM", "WEBKIT_RULE_SYM", - "WEBKIT_DECLS_SYM", "WEBKIT_KEYFRAME_RULE_SYM", "WEBKIT_KEYFRAMES_SYM", - "WEBKIT_VALUE_SYM", "WEBKIT_MEDIAQUERY_SYM", "WEBKIT_SELECTOR_SYM", - "WEBKIT_VARIABLES_SYM", "WEBKIT_DEFINE_SYM", "VARIABLES_FOR", - "WEBKIT_VARIABLES_DECLS_SYM", "ATKEYWORD", "IMPORTANT_SYM", "MEDIA_ONLY", - "MEDIA_NOT", "MEDIA_AND", "QEMS", "EMS", "EXS", "PXS", "CMS", "MMS", - "INS", "PTS", "PCS", "DEGS", "RADS", "GRADS", "TURNS", "MSECS", "SECS", - "HERZ", "KHERZ", "DIMEN", "PERCENTAGE", "FLOATTOKEN", "INTEGER", "URI", - "FUNCTION", "NOTFUNCTION", "UNICODERANGE", "VARCALL", "'{'", "'}'", - "';'", "'('", "')'", "','", "'+'", "'~'", "'>'", "'-'", "']'", "'='", - "'/'", "'#'", "'%'", "$accept", "stylesheet", "valid_rule_or_import", - "webkit_rule", "webkit_keyframe_rule", "webkit_decls", - "webkit_variables_decls", "webkit_value", "webkit_mediaquery", - "webkit_selector", "maybe_space", "maybe_sgml", "maybe_charset", - "closing_brace", "charset", "import_list", "variables_list", - "namespace_list", "rule_list", "valid_rule", "rule", "block_rule_list", - "block_valid_rule", "block_rule", "import", "variables_rule", - "variables_media_list", "variables_declaration_list", + "TOKEN_EOF", "error", "$undefined", "UNIMPORTANT_TOK", "WHITESPACE", + "SGML_CD", "INCLUDES", "DASHMATCH", "BEGINSWITH", "ENDSWITH", "CONTAINS", + "STRING", "IDENT", "NTH", "HEX", "IDSEL", "':'", "'.'", "'['", "'*'", + "'|'", "IMPORT_SYM", "PAGE_SYM", "MEDIA_SYM", "FONT_FACE_SYM", + "CHARSET_SYM", "NAMESPACE_SYM", "WEBKIT_RULE_SYM", "WEBKIT_DECLS_SYM", + "WEBKIT_KEYFRAME_RULE_SYM", "WEBKIT_KEYFRAMES_SYM", "WEBKIT_VALUE_SYM", + "WEBKIT_MEDIAQUERY_SYM", "WEBKIT_SELECTOR_SYM", "WEBKIT_VARIABLES_SYM", + "WEBKIT_DEFINE_SYM", "VARIABLES_FOR", "WEBKIT_VARIABLES_DECLS_SYM", + "ATKEYWORD", "IMPORTANT_SYM", "MEDIA_ONLY", "MEDIA_NOT", "MEDIA_AND", + "QEMS", "EMS", "EXS", "PXS", "CMS", "MMS", "INS", "PTS", "PCS", "DEGS", + "RADS", "GRADS", "TURNS", "MSECS", "SECS", "HERZ", "KHERZ", "DIMEN", + "PERCENTAGE", "FLOATTOKEN", "INTEGER", "URI", "FUNCTION", "NOTFUNCTION", + "UNICODERANGE", "VARCALL", "'{'", "'}'", "';'", "'('", "')'", "','", + "'+'", "'~'", "'>'", "'-'", "']'", "'='", "'/'", "'#'", "'%'", "$accept", + "stylesheet", "valid_rule_or_import", "webkit_rule", + "webkit_keyframe_rule", "webkit_decls", "webkit_variables_decls", + "webkit_value", "webkit_mediaquery", "webkit_selector", "maybe_space", + "maybe_sgml", "maybe_charset", "closing_brace", "charset", "import_list", + "variables_list", "namespace_list", "rule_list", "valid_rule", "rule", + "block_rule_list", "block_valid_rule", "block_rule", "import", + "variables_rule", "variables_media_list", "variables_declaration_list", "variables_decl_list", "variables_declaration", "variable_name", "namespace", "maybe_ns_prefix", "string_or_uri", "media_feature", "maybe_media_value", "media_query_exp", "media_query_exp_list", @@ -771,47 +816,47 @@ static const char *const yytname[] = static const yytype_uint16 yytoknum[] = { 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, - 265, 266, 267, 268, 269, 270, 271, 58, 46, 91, - 42, 124, 272, 273, 274, 275, 276, 277, 278, 279, + 265, 266, 267, 268, 269, 270, 58, 46, 91, 42, + 124, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, - 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, - 123, 125, 59, 40, 41, 44, 43, 126, 62, 45, - 93, 61, 47, 35, 37 + 310, 311, 312, 313, 314, 315, 316, 317, 318, 123, + 125, 59, 40, 41, 44, 43, 126, 62, 45, 93, + 61, 47, 35, 37 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint8 yyr1[] = { - 0, 85, 86, 86, 86, 86, 86, 86, 86, 86, - 87, 87, 88, 89, 90, 91, 92, 93, 94, 95, - 95, 96, 96, 96, 97, 97, 98, 98, 99, 99, - 99, 100, 100, 100, 101, 101, 102, 102, 103, 103, - 104, 104, 104, 104, 104, 105, 105, 105, 105, 106, - 106, 107, 107, 107, 107, 108, 108, 108, 108, 108, - 109, 109, 109, 109, 110, 110, 111, 111, 112, 112, - 112, 112, 112, 112, 113, 113, 113, 113, 113, 113, - 113, 114, 114, 114, 114, 114, 114, 115, 116, 116, - 116, 117, 117, 118, 118, 119, 120, 120, 121, 122, - 122, 123, 123, 124, 124, 124, 125, 125, 126, 126, - 127, 127, 127, 128, 128, 129, 130, 131, 131, 132, - 132, 133, 134, 134, 135, 135, 136, 136, 137, 137, - 137, 138, 138, 138, 139, 139, 140, 141, 141, 141, - 142, 143, 143, 143, 143, 143, 144, 144, 144, 145, - 145, 145, 145, 145, 145, 146, 146, 147, 147, 147, - 148, 148, 148, 148, 148, 149, 150, 151, 151, 151, - 151, 152, 152, 152, 152, 152, 152, 153, 153, 154, - 154, 154, 154, 154, 154, 155, 155, 155, 155, 155, - 155, 155, 156, 156, 156, 156, 156, 156, 156, 157, - 157, 157, 157, 157, 157, 157, 157, 157, 158, 159, - 159, 160, 160, 160, 161, 161, 161, 162, 162, 162, + 0, 84, 85, 85, 85, 85, 85, 85, 85, 85, + 86, 86, 87, 88, 89, 90, 91, 92, 93, 94, + 94, 95, 95, 95, 96, 96, 97, 97, 98, 98, + 98, 99, 99, 99, 100, 100, 101, 101, 102, 102, + 103, 103, 103, 103, 103, 104, 104, 104, 104, 105, + 105, 106, 106, 106, 106, 107, 107, 107, 107, 107, + 108, 108, 108, 108, 109, 109, 110, 110, 111, 111, + 111, 111, 111, 111, 112, 112, 112, 112, 112, 112, + 112, 113, 113, 113, 113, 113, 113, 114, 115, 115, + 115, 116, 116, 117, 117, 118, 119, 119, 120, 121, + 121, 122, 122, 123, 123, 123, 124, 124, 125, 125, + 126, 126, 126, 127, 127, 128, 129, 130, 130, 131, + 131, 132, 133, 133, 134, 134, 135, 135, 136, 136, + 136, 137, 137, 137, 138, 138, 139, 140, 140, 140, + 141, 142, 142, 142, 142, 142, 143, 143, 143, 144, + 144, 144, 144, 144, 144, 145, 145, 146, 146, 146, + 147, 147, 147, 147, 147, 148, 149, 150, 150, 150, + 150, 151, 151, 151, 151, 151, 151, 152, 152, 153, + 153, 153, 153, 153, 153, 154, 154, 154, 154, 154, + 154, 154, 155, 155, 155, 155, 155, 155, 155, 156, + 156, 156, 156, 156, 156, 156, 156, 156, 157, 158, + 158, 159, 159, 159, 160, 160, 160, 161, 161, 161, + 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, + 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 164, 165, 165, 166, 166, 167, 167, 168, 168, 169, - 169, 170, 171, 172, 173, 173, 174, 174 + 163, 164, 164, 165, 165, 166, 166, 167, 167, 168, + 168, 169, 170, 171, 172, 172, 173, 173 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -921,75 +966,75 @@ static const yytype_int16 yydefgoto[] = /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -435 +#define YYPACT_NINF -299 static const yytype_int16 yypact[] = { - 818, 44, -36, -18, 112, 127, 66, 141, 162, 243, - -435, -435, -435, -435, -435, -435, -435, -435, -435, 239, - 43, -435, -435, -435, -435, -435, -435, -435, -435, 250, - 250, 250, 250, 250, 250, 250, 37, 304, -435, -435, - -435, -435, 763, 354, 31, 1114, 144, 622, 49, -435, - -435, 346, 344, -435, 332, 27, 23, 358, -435, -435, - 401, 370, -435, 371, -435, 381, 406, -435, 193, -435, - -435, -435, -435, -435, -435, -435, -435, -435, 171, 702, - 143, 631, -435, 756, 159, -435, -435, -435, -435, 240, - -435, -435, -435, 329, 303, 254, 199, -435, -435, -435, - -435, -435, -435, -435, -435, -435, -435, -435, -435, -435, - -435, -435, -435, -435, -435, -435, -435, -435, -435, -435, - -435, -435, -435, -435, -435, -435, -435, -435, -435, -435, - -435, -435, -435, -435, -435, 949, 903, -435, -435, -435, - -435, -435, -435, -435, -435, -435, 34, -435, 342, 4, - 274, -435, 353, 59, 291, 223, 331, 395, -435, 438, - -435, -435, -435, -435, -435, 437, -435, -435, -435, 448, - 24, -435, -435, 415, -435, 349, 295, 377, 375, 399, - 198, 421, 190, -435, -435, -435, -435, -435, -435, -435, - -435, -435, 702, -435, -435, 756, 334, 380, -435, -435, - -435, 463, 250, 250, -435, 409, 398, 180, -435, 15, - -435, -435, -435, 250, 221, 182, 250, 250, 250, 250, - 250, 250, 250, 250, 250, 250, 250, 250, 250, 250, - 250, 250, 250, 250, 250, 250, 250, 250, 250, 250, - 250, 250, 1052, 250, 250, 250, -435, -435, -435, -435, - -435, -435, 1172, 250, 188, 166, 301, -435, -435, -435, - 472, 250, -435, 412, 404, -435, 62, -435, -435, 220, - -435, -435, -435, -435, 458, -435, 438, 438, 27, -435, - 413, 417, 430, 622, 358, 371, 473, 158, -435, -435, - -435, -435, -435, -435, -435, -435, -435, 172, -435, -435, - -435, -435, -435, -435, -435, 354, 622, 250, 250, 250, - -435, 555, 250, 420, -435, 502, -435, 459, 250, -435, - 535, -435, -435, -435, -435, 976, 250, 250, 250, -435, - -435, -435, -435, -435, 496, 250, 423, -435, 541, -435, - 250, -435, 754, -435, 424, 36, 552, 685, -435, 438, - -435, -435, -435, -435, -435, -435, 250, -435, 277, -435, - -435, -435, -435, -435, -435, -435, -435, 856, 250, -435, - -435, -435, 354, 226, 65, 203, -435, 250, 428, 250, - 250, 1172, 462, 354, 31, -435, 250, 53, 186, 250, - -435, -435, -435, 250, 429, 250, 250, 1172, 608, 354, - 479, 83, 538, 485, 482, 320, 459, -435, -435, -435, - -435, -435, -435, 438, 78, -435, -435, 447, 489, 1244, - 250, 144, 487, -435, -435, 250, -435, 462, -435, 205, - 491, -435, 250, -435, 492, -435, 186, 250, -435, 681, - 497, -435, 5, -435, -435, -435, 558, 150, -435, 438, - -435, 447, -435, -435, -435, -435, -435, 27, -435, -435, - -435, -435, -435, -435, -435, -435, -435, -435, -435, -435, - -435, 1244, -435, -435, 250, 250, -435, 250, -435, -435, - 1114, -435, 34, 250, -435, 49, 178, 49, -435, -435, - -435, 1, -435, 438, -435, 250, 306, 827, 250, 250, - 498, 504, 151, 14, -435, -435, -435, 250, -435, -435, - -435, -435, 250 + 466, 425, -26, -20, 75, 118, 189, 139, 151, 263, + -299, -299, -299, -299, -299, -299, -299, -299, -299, 359, + 300, -299, -299, -299, -299, -299, -299, -299, -299, 278, + 278, 278, 278, 278, 278, 278, 33, 338, -299, -299, + -299, -299, 749, 313, 32, 1074, 12, 545, 44, -299, + -299, 345, 346, -299, 335, 223, 194, 354, -299, -299, + 419, 380, -299, 383, -299, 403, 408, -299, 163, -299, + -299, -299, -299, -299, -299, -299, -299, -299, 86, 561, + 199, 620, -299, 626, 161, -299, -299, -299, -299, 374, + -299, -299, -299, 351, 239, 378, 179, -299, -299, -299, + -299, -299, -299, -299, -299, -299, -299, -299, -299, -299, + -299, -299, -299, -299, -299, -299, -299, -299, -299, -299, + -299, -299, -299, -299, -299, -299, -299, -299, -299, -299, + -299, -299, -299, -299, -299, 645, 882, -299, -299, -299, + -299, -299, -299, -299, -299, -299, 30, -299, 363, 82, + 402, -299, 364, 185, 410, 190, 421, 28, -299, 301, + -299, -299, -299, -299, -299, 423, -299, -299, -299, 426, + 337, -299, -299, 35, -299, 542, 397, 640, 1, 691, + 26, 448, 220, -299, -299, -299, -299, -299, -299, -299, + -299, -299, 561, -299, -299, 626, 343, 381, -299, -299, + -299, 443, 278, 278, -299, 705, 377, 27, -299, 59, + -299, -299, -299, 278, 242, 178, 278, 278, 278, 278, + 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, + 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, + 278, 278, 1012, 278, 278, 278, -299, -299, -299, -299, + -299, -299, 1132, 278, 201, 368, 312, -299, -299, -299, + 464, 278, -299, 706, 395, -299, 87, -299, -299, 188, + -299, -299, -299, -299, 442, -299, 301, 301, 223, -299, + 409, 413, 414, 545, 354, 383, 488, 69, -299, -299, + -299, -299, -299, -299, -299, -299, -299, 135, -299, -299, + -299, -299, -299, -299, -299, 313, 545, 278, 278, 278, + -299, 554, 278, 709, -299, 475, -299, 432, 278, -299, + 539, -299, -299, -299, -299, 947, 278, 278, 278, -299, + -299, -299, -299, -299, 462, 278, 712, -299, 528, -299, + 278, -299, 744, -299, 294, 165, 382, 1229, -299, 301, + -299, -299, -299, -299, -299, -299, 278, -299, 209, -299, + -299, -299, -299, -299, -299, -299, -299, 339, 278, -299, + -299, -299, 313, 257, 174, 210, -299, 278, 713, 278, + 278, 1132, 463, 313, 32, -299, 278, 42, 181, 278, + -299, -299, -299, 278, 754, 278, 278, 1132, 604, 313, + 467, 97, 531, 473, 764, 329, 432, -299, -299, -299, + -299, -299, -299, 301, 61, -299, -299, 458, 765, 1204, + 278, 12, 477, -299, -299, 278, -299, 463, -299, 172, + 478, -299, 278, -299, 479, -299, 181, 278, -299, 669, + 486, -299, 10, -299, -299, -299, 562, 217, -299, 301, + -299, 458, -299, -299, -299, -299, -299, 223, -299, -299, + -299, -299, -299, -299, -299, -299, -299, -299, -299, -299, + -299, 1204, -299, -299, 278, 278, -299, 278, -299, -299, + 1074, -299, 30, 278, -299, 44, 152, 44, -299, -299, + -299, 2, -299, 301, -299, 278, 307, 817, 278, 278, + 497, 504, 225, 15, -299, -299, -299, 278, -299, -299, + -299, -299, 278 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -435, -435, -435, -435, -435, -435, -435, -435, -435, -435, - -1, -21, -435, -51, -435, -435, -435, -435, -435, 229, - -435, 147, -435, -435, 256, -435, -435, -434, -435, 425, - -435, -435, -435, 130, -435, -435, 214, 174, -435, -435, - -45, 241, -176, -389, -435, -227, -435, -435, 116, -435, - 231, -154, -137, -435, -435, -130, 566, -435, 310, 449, - -61, 547, -50, -55, -435, 348, -435, 278, 194, -435, - -298, -435, 581, -435, 261, -185, -435, 443, 546, -35, - -435, -435, 218, -19, -435, 352, -435, 364, -16, -3 + -299, -299, -299, -299, -299, -299, -299, -299, -299, -299, + -1, -21, -299, -51, -299, -299, -299, -299, -299, 265, + -299, 200, -299, -299, 258, -299, -299, 352, -299, 472, + -299, -299, -299, 186, -299, -299, 238, 240, -299, -299, + -45, 279, -176, -238, -299, -194, -299, -299, 149, -299, + 293, -116, -66, -299, -299, -48, 663, -299, 429, 568, + -61, 661, -50, -55, -299, 460, -299, 391, 303, -299, + -298, -299, 692, -299, 330, -185, -299, 533, 675, -35, + -299, -299, 349, -19, -299, 469, -299, 470, -16, -3 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -999,332 +1044,324 @@ static const yytype_int16 yypgoto[] = #define YYTABLE_NINF -217 static const yytype_int16 yytable[] = { - 20, 148, 297, 39, 163, 183, 40, 374, 97, 29, - 30, 31, 32, 33, 34, 35, 317, 53, 186, 40, - 42, 43, 44, 45, 46, 47, 48, 161, 40, 199, - 461, 196, 159, 197, 21, 160, 40, 280, 281, -19, - 56, 40, 49, 50, 98, 19, 142, 143, 40, -19, - 150, 500, 22, 501, 40, 41, -19, 325, 40, 97, - 263, 173, 151, 317, 176, 161, 178, 180, 181, 182, - 433, 25, 151, 402, 422, 258, 51, -19, 144, 185, - 212, 504, 461, 40, 369, 430, 201, 319, 282, 202, - 203, 207, 209, 99, 511, 166, 213, 37, 162, 214, + 20, 148, 297, 39, 163, 40, 40, 374, 97, 29, + 30, 31, 32, 33, 34, 35, 40, 53, 186, 40, + 42, 43, 44, 45, 46, 47, 48, -191, 317, 199, + 40, 196, 159, 197, -19, 160, 40, 49, 50, 40, + 56, 142, 143, 21, 98, 150, 40, 284, 40, 22, + 142, 143, 142, 143, 285, 64, 151, 325, 433, 97, + 317, 173, 272, 273, 176, 40, 178, 180, 181, 182, + 295, 51, -19, 144, 422, 359, 360, 361, 362, 363, + 212, 504, 144, 183, 144, 430, 201, 183, 317, 202, + 203, 207, 209, 99, 511, 300, 213, -191, 369, 214, 215, 440, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, - -70, 310, 244, 245, 341, 382, 162, 276, 253, 277, - 271, 199, 199, 254, 187, 311, 256, 260, 188, 40, - 261, 266, 450, -109, 269, -109, 40, 398, 371, 289, - 198, 294, 290, 299, -151, 359, 360, 361, 362, 363, - 283, 40, 183, 369, 58, 59, 60, 61, 62, 369, - -191, 317, 23, 305, 306, 142, 143, 40, 307, 308, - 309, 40, 462, 40, 179, 40, 427, 24, -19, 312, - 210, 330, 315, 40, 187, -199, 478, 318, 188, 332, - 320, 26, 439, -137, -137, 291, 211, 144, -137, 189, - 190, 191, 355, 510, 267, 40, 40, 350, -19, -151, - -151, 40, 27, -151, -151, -151, -151, -151, 364, 365, - 268, 184, 370, 28, 462, 326, 185, 371, -67, 327, - 328, -191, 322, 371, 349, 40, 199, 323, 335, 144, - 338, 304, 351, -19, 340, 463, 486, 342, 300, 37, - 97, 344, 345, -138, -138, -199, -199, -199, -138, 189, - 190, 191, 464, 356, 359, 360, 361, 362, 363, 465, - 343, 367, 321, -19, 368, 497, 423, 351, 72, 372, - 40, 351, 373, -187, 205, 55, 40, 290, 158, 37, - 37, 38, 200, 377, 333, 379, 90, 463, 380, 98, - 351, 383, 384, 424, 37, 40, 208, 413, 410, 386, - 387, 388, 389, 446, 464, 198, 393, 97, 395, -154, - 396, 465, 399, 91, 37, 405, 259, 156, 97, 58, - 59, 60, 61, 62, 414, 89, 356, 415, 365, 40, - 291, 37, 351, 265, 97, 417, 65, 90, 99, 420, - 421, 51, 92, 37, -187, 425, 472, 505, 351, 167, - 40, 198, 175, 172, 432, -150, -19, 449, 445, 436, - 448, 437, 174, -19, 91, 58, 59, 60, 61, 62, - 204, 37, 456, 270, -154, -154, 492, 177, -154, -154, - -154, -154, -154, 257, 168, 451, 142, 143, 169, 37, - 40, 288, 474, 92, 262, 475, 40, 477, 284, 40, - 272, 273, 480, 301, 302, 285, 64, 483, 278, 493, - 485, 448, 487, 49, 50, 295, -19, 37, 144, 293, - -150, -150, 40, 491, -150, -150, -150, -150, -150, 452, - 453, 279, -210, 248, 313, 142, 143, 170, 171, 37, - 316, 298, 495, 336, -216, -216, 339, -216, -216, 37, - 498, 314, 37, 499, 337, 346, 357, 352, 502, 503, - 37, 353, 376, 37, -108, 392, 507, 144, 37, 37, - 426, 438, 428, 378, 354, 512, -216, -216, -216, -216, + 319, 310, 244, 245, 450, 382, 369, 276, 253, 277, + 271, 199, 199, 254, 23, 311, 256, 260, 364, 365, + 261, 266, 258, 369, 269, 184, 185, 398, 341, 289, + 185, 294, 198, 299, 179, -151, -109, -19, -109, 40, + 283, 371, -199, 478, 161, 58, 59, 60, 61, 62, + 210, 461, 40, 305, 306, 40, 263, 24, 307, 308, + 309, 267, 40, 25, -19, 211, 427, 151, 40, 312, + 187, 402, 315, 188, 370, 40, 268, 318, 26, 371, + 320, 187, 439, 330, 188, 359, 360, 361, 362, 363, + 27, -67, 355, 161, 40, 462, 371, 350, 290, 40, + -151, -151, -19, 461, -151, -151, -151, -151, -151, -187, + 205, -199, -199, -199, 162, 326, 40, 322, 37, 327, + 328, 90, 323, 144, 349, -70, 199, 343, 335, -19, + 338, 40, 351, 28, 340, 166, 486, 342, -137, -137, + 97, 344, 345, -137, 189, 190, 191, 462, 91, -138, + -138, 291, 40, 356, -138, 189, 190, 191, 415, 365, + 304, 367, 37, 162, 368, 497, 510, 351, 40, 372, + 72, 351, 373, 463, 40, 49, 50, 92, 37, -187, + 158, 41, 321, 377, 89, 379, 40, 40, 380, 98, + 351, 383, 384, 424, 333, 90, 423, 413, 410, 386, + 387, 388, 389, 40, 142, 143, 393, 97, 395, 55, + 396, 446, 399, 40, 198, 405, 156, -154, 97, 280, + 281, -103, 91, 464, 414, 463, 356, 58, 59, 60, + 61, 62, 351, -108, 97, 417, 144, 65, 99, 420, + 421, 465, 40, 51, 167, 425, 472, 505, 351, 142, + 143, 92, 198, 404, 432, -150, -19, 449, 445, 436, + 448, 437, 172, -19, -19, 58, 59, 60, 61, 62, + 282, 40, 456, 174, 175, 464, 492, -19, 290, 177, + 332, 144, -154, -154, -19, 451, -154, -154, -154, -154, + -154, 204, 474, 465, 278, 475, 19, 477, 37, -19, + 38, 168, 480, 257, 262, 169, -19, 483, 279, 493, + 485, 448, 487, 37, 313, 200, -19, 37, 316, 208, + -150, -150, 40, 491, -150, -150, -150, -150, -150, 301, + 302, 291, 40, -210, 248, 336, 339, -19, 346, 452, + 453, 37, 495, 259, -216, -216, 378, -216, -216, 37, + 498, 265, 352, 499, 170, 171, 353, 354, 502, 503, + 37, 1, 270, 2, 3, 4, 507, 5, 6, 7, + 357, 37, 428, 8, 390, 512, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, - -216, -216, -216, -216, -216, -216, -216, -216, -216, 37, - -216, -216, -210, -210, -210, -205, 381, 250, -216, 390, - 40, -216, 394, 442, 251, -216, -216, 103, 104, 441, - 105, 106, 37, 404, 444, 443, 198, -19, 473, 37, - -153, 455, 479, 488, -19, -19, 481, 471, 484, 508, - 58, 59, 60, 61, 62, 509, 407, 489, 264, 107, - 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, - 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, - 128, 129, 435, 130, 92, -205, -205, -205, 418, 248, - 482, 131, 506, 149, 132, 431, 375, -19, 133, 134, - -216, -216, 286, -216, -216, -153, -153, 40, 195, -153, - -153, -153, -153, -153, 358, 57, 416, 58, 59, 60, - 61, 62, 63, 64, 193, 490, 58, 59, 60, 61, - 62, 194, -216, -216, -216, -216, -216, -216, -216, -216, + -216, -216, -216, -216, -216, -216, -216, -216, -216, 394, + -216, -216, -210, -210, -210, 442, 441, 250, -216, -205, + 381, -216, 443, 40, 251, -216, -216, 473, 479, 40, + 103, 104, 481, 105, 106, 198, 484, 57, -153, 58, + 59, 60, 61, 62, 63, 64, 488, 508, 58, 59, + 60, 61, 62, 57, 509, 58, 59, 60, 61, 62, + 63, 64, 107, 108, 109, 110, 111, 112, 113, 114, + 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, + 125, 126, 127, 128, 129, 248, 130, 92, -205, -205, + -205, 37, 407, 288, 131, -216, -216, 132, -216, -216, + 471, 133, 134, -153, -153, 264, 435, -153, -153, -153, + -153, -153, 193, 489, 58, 59, 60, 61, 62, 194, + 58, 59, 60, 61, 62, 506, 418, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, - -216, -216, -216, -216, -216, 206, -216, -216, -81, -81, - -81, 247, 248, 250, -216, -2, 406, -216, 476, 494, - 251, -216, -216, -216, -216, 329, -216, -216, 57, 411, - 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, - 68, 412, 0, 0, 0, 57, 69, 58, 59, 60, - 61, 62, 63, 64, 51, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, - -216, -216, -216, -216, -216, -216, -216, -216, 0, -216, - -216, -84, -84, -84, 0, 397, 250, -216, 0, 40, - -216, 0, 0, 251, -216, -216, 103, 104, 40, 105, - 106, 58, 59, 60, 61, 62, 57, 0, 58, 59, - 60, 61, 62, 63, 64, 65, 66, 67, 68, 0, - 0, 0, 0, 0, 69, 0, 0, 0, 107, 108, + 248, -216, -216, -81, -81, -81, 482, 431, 250, -216, + -216, -216, -216, -216, -216, 251, -216, -216, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, - 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, - 129, 0, 130, 92, -85, -85, -85, 0, 248, 0, - 131, 0, -19, 132, 0, 0, 0, 133, 134, -216, - -216, 0, -216, -216, 1, 0, 2, 3, 4, 0, - 5, 6, 7, 0, 0, 0, 8, 0, 0, 0, - 0, 40, 0, 0, 0, 0, 0, 0, 0, -103, - 0, -216, -216, -216, -216, -216, -216, -216, -216, -216, + 119, 120, 121, 122, 123, 246, 125, 126, 127, 37, + 149, 293, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, - -216, -216, -216, -216, 0, -216, -216, 142, 143, 0, - 0, -19, 250, -216, 248, 0, -216, 0, 0, 251, - -216, -216, 0, 0, 0, -216, -216, 0, -216, -216, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 144, + -216, -216, -216, -216, -216, 375, -216, -216, -84, -84, + -84, 286, 195, 250, -216, 397, 358, -216, 40, 416, + 251, -216, -216, 40, 490, 103, 104, 476, 105, 106, + 37, 57, 298, 58, 59, 60, 61, 62, 63, 64, + 65, 66, 67, 68, 37, 37, 314, 337, 37, 69, + 376, 37, 37, 392, 426, 329, 206, 107, 108, 109, + 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, + 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, + 247, 130, 92, -85, -85, -85, 411, 412, 248, 131, + 494, -19, 132, 37, 0, 438, 133, 134, -216, -216, + 0, -216, -216, 37, 37, 444, 455, 500, 0, 501, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, -216, -216, -216, - -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, - -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, - 0, -216, -216, 0, 249, 0, 0, 248, 250, -216, - 0, 0, -216, 0, 0, 251, -216, -216, -216, -216, - 0, -216, -216, 107, 108, 109, 110, 111, 112, 113, - 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, - 246, 125, 126, 127, 0, 0, 0, 0, 0, 0, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, - -216, -216, -216, 0, -216, -216, 0, 0, 0, 0, - 385, 250, -216, 324, 0, -216, 0, 40, 251, -216, - -216, 0, 0, 0, 103, 104, 0, 105, 106, 0, + -216, -216, -216, 248, -216, -216, 0, 0, 0, 0, + -19, 250, -216, -216, -216, -216, -216, -216, 251, -216, + -216, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, -216, -216, -216, -216, -216, + -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, + -216, -216, -216, -216, -216, -216, -216, -216, 248, -216, + -216, 0, 249, 0, 0, 0, 250, -216, -216, -216, + -216, -216, -216, 251, -216, -216, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 107, 108, 109, 110, - 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, - 121, 122, 123, 124, 125, 126, 127, 128, 129, 40, - 130, 92, 0, 0, 0, 0, 103, 104, 131, 105, - 106, 132, 0, 0, 0, 133, 134, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 107, 108, - 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, - 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, - 129, 0, 130, 92, 103, 104, 0, 105, 106, 0, - 131, 0, 0, 132, 0, 0, 0, 133, 134, 0, + -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, + -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, + -216, -216, -216, 324, -216, -216, 40, 0, 0, 0, + 385, 250, -216, 103, 104, -216, 105, 106, 251, -216, + -216, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 107, 108, 109, 110, - 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, - 121, 122, 123, 124, 125, 126, 127, 128, 129, 0, - 130, 92, 0, 0, 161, 457, 0, 0, 131, 0, - 0, 132, 0, 0, 0, 133, 134, 57, 0, 58, - 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, - 0, 0, 0, 0, 0, 69, 0, 0, 0, 0, - 0, 0, 0, 51, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 107, 108, 109, 110, 111, + 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, + 122, 123, 124, 125, 126, 127, 128, 129, 40, 130, + 92, 0, 0, 0, 0, 103, 104, 131, 105, 106, + 132, 0, 0, 0, 133, 134, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 107, 108, 109, + 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, + 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, + 0, 130, 92, 103, 104, 0, 105, 106, 0, 131, + 0, 0, 132, 0, 0, 0, 133, 134, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 162 + 0, 0, 0, 0, 0, 107, 108, 109, 110, 111, + 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, + 122, 123, 124, 125, 126, 127, 128, 129, 0, 130, + 92, 0, 0, 0, 161, 457, 0, 131, 0, 0, + 132, 0, 0, 0, 133, 134, 57, 0, 58, 59, + 60, 61, 62, 63, 64, 65, 66, 67, 68, -2, + 406, 0, 0, 0, 69, 0, 0, 0, 0, 0, + 0, 57, 51, 58, 59, 60, 61, 62, 63, 64, + 65, 66, 67, 68, 0, 0, 0, 0, 0, 69, + 0, 0, 0, 0, 0, 0, 0, 51, 0, 0, + 0, 0, 0, 0, 162 }; static const yytype_int16 yycheck[] = { - 1, 46, 178, 19, 55, 1, 5, 305, 43, 10, - 11, 12, 13, 14, 15, 16, 1, 36, 79, 5, - 21, 22, 23, 24, 25, 26, 27, 0, 5, 84, - 419, 81, 53, 83, 70, 54, 5, 13, 14, 5, - 41, 5, 5, 6, 13, 1, 41, 42, 5, 5, - 1, 485, 70, 487, 5, 12, 12, 242, 5, 94, - 1, 62, 13, 1, 65, 0, 67, 68, 69, 70, - 17, 5, 13, 37, 372, 71, 39, 43, 73, 75, - 96, 80, 471, 5, 1, 383, 89, 72, 64, 90, - 91, 94, 95, 62, 80, 72, 97, 70, 71, 100, + 1, 46, 178, 19, 55, 4, 4, 305, 43, 10, + 11, 12, 13, 14, 15, 16, 4, 36, 79, 4, + 21, 22, 23, 24, 25, 26, 27, 0, 1, 84, + 4, 81, 53, 83, 4, 54, 4, 4, 5, 4, + 41, 40, 41, 69, 12, 1, 4, 12, 4, 69, + 40, 41, 40, 41, 19, 20, 12, 242, 16, 94, + 1, 62, 34, 35, 65, 4, 67, 68, 69, 70, + 69, 38, 42, 72, 372, 6, 7, 8, 9, 10, + 96, 79, 72, 1, 72, 383, 89, 1, 1, 90, + 91, 94, 95, 61, 79, 69, 97, 70, 1, 100, 101, 399, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, - 71, 192, 133, 134, 72, 320, 71, 158, 139, 160, - 156, 196, 197, 144, 1, 195, 147, 150, 5, 5, - 151, 154, 74, 70, 155, 72, 5, 342, 75, 175, - 1, 177, 12, 179, 5, 7, 8, 9, 10, 11, - 171, 5, 1, 1, 15, 16, 17, 18, 19, 1, - 0, 1, 70, 184, 185, 41, 42, 5, 189, 190, - 191, 5, 419, 5, 1, 5, 381, 70, 5, 200, - 1, 13, 205, 5, 1, 0, 1, 208, 5, 43, - 211, 70, 397, 70, 71, 65, 17, 73, 75, 76, - 77, 78, 283, 72, 1, 5, 5, 278, 5, 70, - 71, 5, 70, 74, 75, 76, 77, 78, 80, 81, - 17, 70, 70, 0, 471, 246, 75, 75, 70, 250, - 251, 71, 70, 75, 275, 5, 311, 75, 259, 73, - 263, 71, 278, 70, 265, 419, 442, 268, 70, 70, - 305, 272, 273, 70, 71, 70, 71, 72, 75, 76, - 77, 78, 419, 284, 7, 8, 9, 10, 11, 419, - 70, 292, 71, 70, 295, 480, 70, 313, 42, 300, - 5, 317, 303, 0, 1, 1, 5, 12, 52, 70, - 70, 72, 72, 314, 13, 316, 13, 471, 319, 13, - 336, 322, 323, 374, 70, 5, 72, 348, 347, 330, - 331, 332, 333, 13, 471, 1, 337, 372, 339, 5, - 341, 471, 343, 40, 70, 346, 72, 1, 383, 15, - 16, 17, 18, 19, 355, 1, 357, 80, 81, 5, - 65, 70, 378, 72, 399, 366, 22, 13, 62, 370, - 371, 39, 69, 70, 71, 376, 421, 71, 394, 21, - 5, 1, 1, 13, 385, 5, 5, 408, 404, 390, - 406, 392, 21, 12, 40, 15, 16, 17, 18, 19, - 71, 70, 418, 72, 70, 71, 457, 1, 74, 75, - 76, 77, 78, 71, 13, 416, 41, 42, 17, 70, - 5, 72, 423, 69, 71, 426, 5, 428, 13, 5, - 35, 36, 433, 12, 13, 20, 21, 438, 1, 460, - 441, 457, 443, 5, 6, 70, 65, 70, 73, 72, - 70, 71, 5, 454, 74, 75, 76, 77, 78, 12, - 13, 13, 0, 1, 1, 41, 42, 66, 67, 70, - 72, 72, 473, 1, 12, 13, 72, 15, 16, 70, - 481, 72, 70, 484, 72, 27, 13, 74, 489, 490, - 70, 74, 72, 70, 70, 72, 497, 73, 70, 70, - 72, 72, 40, 1, 74, 506, 44, 45, 46, 47, - 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, - 58, 59, 60, 61, 62, 63, 64, 65, 66, 70, - 68, 69, 70, 71, 72, 0, 1, 75, 76, 43, - 5, 79, 1, 5, 82, 83, 84, 12, 13, 70, - 15, 16, 70, 1, 72, 70, 1, 5, 71, 70, - 5, 72, 71, 5, 12, 13, 74, 420, 71, 71, - 15, 16, 17, 18, 19, 71, 347, 447, 153, 44, + 71, 192, 133, 134, 73, 320, 1, 158, 139, 160, + 156, 196, 197, 144, 69, 195, 147, 150, 79, 80, + 151, 154, 70, 1, 155, 69, 74, 342, 71, 175, + 74, 177, 1, 179, 1, 4, 69, 4, 71, 4, + 171, 74, 0, 1, 0, 14, 15, 16, 17, 18, + 1, 419, 4, 184, 185, 4, 1, 69, 189, 190, + 191, 1, 4, 4, 4, 16, 381, 12, 4, 200, + 1, 36, 205, 4, 69, 4, 16, 208, 69, 74, + 211, 1, 397, 12, 4, 6, 7, 8, 9, 10, + 69, 69, 283, 0, 4, 419, 74, 278, 11, 4, + 69, 70, 69, 471, 73, 74, 75, 76, 77, 0, + 1, 69, 70, 71, 70, 246, 4, 69, 69, 250, + 251, 12, 74, 72, 275, 70, 311, 69, 259, 69, + 263, 4, 278, 0, 265, 71, 442, 268, 69, 70, + 305, 272, 273, 74, 75, 76, 77, 471, 39, 69, + 70, 64, 4, 284, 74, 75, 76, 77, 79, 80, + 70, 292, 69, 70, 295, 480, 71, 313, 4, 300, + 42, 317, 303, 419, 4, 4, 5, 68, 69, 70, + 52, 11, 70, 314, 1, 316, 4, 4, 319, 12, + 336, 322, 323, 374, 12, 12, 69, 348, 347, 330, + 331, 332, 333, 4, 40, 41, 337, 372, 339, 1, + 341, 12, 343, 4, 1, 346, 1, 4, 383, 12, + 13, 12, 39, 419, 355, 471, 357, 14, 15, 16, + 17, 18, 378, 69, 399, 366, 72, 21, 61, 370, + 371, 419, 4, 38, 20, 376, 421, 70, 394, 40, + 41, 68, 1, 1, 385, 4, 4, 408, 404, 390, + 406, 392, 12, 11, 12, 14, 15, 16, 17, 18, + 63, 4, 418, 20, 1, 471, 457, 4, 11, 1, + 42, 72, 69, 70, 11, 416, 73, 74, 75, 76, + 77, 70, 423, 471, 1, 426, 1, 428, 69, 4, + 71, 12, 433, 70, 70, 16, 11, 438, 12, 460, + 441, 457, 443, 69, 1, 71, 64, 69, 71, 71, + 69, 70, 4, 454, 73, 74, 75, 76, 77, 11, + 12, 64, 4, 0, 1, 1, 71, 64, 26, 11, + 12, 69, 473, 71, 11, 12, 1, 14, 15, 69, + 481, 71, 73, 484, 65, 66, 73, 73, 489, 490, + 69, 25, 71, 27, 28, 29, 497, 31, 32, 33, + 12, 69, 39, 37, 42, 506, 43, 44, 45, 46, + 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, + 57, 58, 59, 60, 61, 62, 63, 64, 65, 1, + 67, 68, 69, 70, 71, 4, 69, 74, 75, 0, + 1, 78, 69, 4, 81, 82, 83, 70, 70, 4, + 11, 12, 73, 14, 15, 1, 70, 12, 4, 14, + 15, 16, 17, 18, 19, 20, 4, 70, 14, 15, + 16, 17, 18, 12, 70, 14, 15, 16, 17, 18, + 19, 20, 43, 44, 45, 46, 47, 48, 49, 50, + 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, + 61, 62, 63, 64, 65, 1, 67, 68, 69, 70, + 71, 69, 347, 71, 75, 11, 12, 78, 14, 15, + 420, 82, 83, 69, 70, 153, 388, 73, 74, 75, + 76, 77, 12, 447, 14, 15, 16, 17, 18, 19, + 14, 15, 16, 17, 18, 496, 367, 43, 44, 45, + 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, + 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, + 1, 67, 68, 69, 70, 71, 436, 384, 74, 75, + 11, 12, 78, 14, 15, 81, 82, 83, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, - 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, - 65, 66, 388, 68, 69, 70, 71, 72, 367, 1, - 436, 76, 496, 47, 79, 384, 306, 65, 83, 84, - 12, 13, 173, 15, 16, 70, 71, 5, 81, 74, - 75, 76, 77, 78, 286, 13, 358, 15, 16, 17, - 18, 19, 20, 21, 13, 451, 15, 16, 17, 18, - 19, 20, 44, 45, 46, 47, 48, 49, 50, 51, - 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, - 62, 63, 64, 65, 66, 94, 68, 69, 70, 71, - 72, 135, 1, 75, 76, 0, 1, 79, 427, 471, - 82, 83, 84, 12, 13, 252, 15, 16, 13, 347, - 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, - 25, 347, -1, -1, -1, 13, 31, 15, 16, 17, - 18, 19, 20, 21, 39, 44, 45, 46, 47, 48, - 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, - 59, 60, 61, 62, 63, 64, 65, 66, -1, 68, - 69, 70, 71, 72, -1, 1, 75, 76, -1, 5, - 79, -1, -1, 82, 83, 84, 12, 13, 5, 15, - 16, 15, 16, 17, 18, 19, 13, -1, 15, 16, - 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, - -1, -1, -1, -1, 31, -1, -1, -1, 44, 45, + 55, 56, 57, 58, 59, 60, 61, 62, 63, 69, + 47, 71, 43, 44, 45, 46, 47, 48, 49, 50, + 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, + 61, 62, 63, 64, 65, 306, 67, 68, 69, 70, + 71, 173, 81, 74, 75, 1, 286, 78, 4, 358, + 81, 82, 83, 4, 451, 11, 12, 427, 14, 15, + 69, 12, 71, 14, 15, 16, 17, 18, 19, 20, + 21, 22, 23, 24, 69, 69, 71, 71, 69, 30, + 71, 69, 69, 71, 71, 252, 94, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, - 66, -1, 68, 69, 70, 71, 72, -1, 1, -1, - 76, -1, 5, 79, -1, -1, -1, 83, 84, 12, - 13, -1, 15, 16, 26, -1, 28, 29, 30, -1, - 32, 33, 34, -1, -1, -1, 38, -1, -1, -1, - -1, 5, -1, -1, -1, -1, -1, -1, -1, 13, - -1, 44, 45, 46, 47, 48, 49, 50, 51, 52, + 135, 67, 68, 69, 70, 71, 347, 347, 1, 75, + 471, 4, 78, 69, -1, 71, 82, 83, 11, 12, + -1, 14, 15, 69, 69, 71, 71, 485, -1, 487, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, - 63, 64, 65, 66, -1, 68, 69, 41, 42, -1, - -1, 74, 75, 76, 1, -1, 79, -1, -1, 82, - 83, 84, -1, -1, -1, 12, 13, -1, 15, 16, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 73, + 63, 64, 65, 1, 67, 68, -1, -1, -1, -1, + 73, 74, 75, 11, 12, 78, 14, 15, 81, 82, + 83, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 43, 44, 45, 46, 47, + 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, + 58, 59, 60, 61, 62, 63, 64, 65, 1, 67, + 68, -1, 70, -1, -1, -1, 74, 75, 11, 12, + 78, 14, 15, 81, 82, 83, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 44, 45, 46, - 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, - 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, - -1, 68, 69, -1, 71, -1, -1, 1, 75, 76, - -1, -1, 79, -1, -1, 82, 83, 84, 12, 13, - -1, 15, 16, 44, 45, 46, 47, 48, 49, 50, - 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, - 61, 62, 63, 64, -1, -1, -1, -1, -1, -1, - 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, - 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, - 64, 65, 66, -1, 68, 69, -1, -1, -1, -1, - 74, 75, 76, 1, -1, 79, -1, 5, 82, 83, - 84, -1, -1, -1, 12, 13, -1, 15, 16, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, + 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, + 63, 64, 65, 1, 67, 68, 4, -1, -1, -1, + 73, 74, 75, 11, 12, 78, 14, 15, 81, 82, + 83, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 44, 45, 46, 47, + -1, -1, -1, -1, -1, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, - 58, 59, 60, 61, 62, 63, 64, 65, 66, 5, - 68, 69, -1, -1, -1, -1, 12, 13, 76, 15, - 16, 79, -1, -1, -1, 83, 84, -1, -1, -1, + 58, 59, 60, 61, 62, 63, 64, 65, 4, 67, + 68, -1, -1, -1, -1, 11, 12, 75, 14, 15, + 78, -1, -1, -1, 82, 83, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 44, 45, + -1, -1, -1, -1, -1, -1, -1, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, - 66, -1, 68, 69, 12, 13, -1, 15, 16, -1, - 76, -1, -1, 79, -1, -1, -1, 83, 84, -1, + -1, 67, 68, 11, 12, -1, 14, 15, -1, 75, + -1, -1, 78, -1, -1, -1, 82, 83, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 44, 45, 46, 47, + -1, -1, -1, -1, -1, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, - 58, 59, 60, 61, 62, 63, 64, 65, 66, -1, - 68, 69, -1, -1, 0, 1, -1, -1, 76, -1, - -1, 79, -1, -1, -1, 83, 84, 13, -1, 15, - 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, - -1, -1, -1, -1, -1, 31, -1, -1, -1, -1, - -1, -1, -1, 39, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 71 + 58, 59, 60, 61, 62, 63, 64, 65, -1, 67, + 68, -1, -1, -1, 0, 1, -1, 75, -1, -1, + 78, -1, -1, -1, 82, 83, 12, -1, 14, 15, + 16, 17, 18, 19, 20, 21, 22, 23, 24, 0, + 1, -1, -1, -1, 30, -1, -1, -1, -1, -1, + -1, 12, 38, 14, 15, 16, 17, 18, 19, 20, + 21, 22, 23, 24, -1, -1, -1, -1, -1, 30, + -1, -1, -1, -1, -1, -1, -1, 38, -1, -1, + -1, -1, -1, -1, 70 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const yytype_uint8 yystos[] = { - 0, 26, 28, 29, 30, 32, 33, 34, 38, 86, - 88, 89, 90, 91, 92, 93, 94, 97, 99, 1, - 95, 70, 70, 70, 70, 5, 70, 70, 0, 95, - 95, 95, 95, 95, 95, 95, 96, 70, 72, 173, - 5, 12, 95, 95, 95, 95, 95, 95, 95, 5, - 6, 39, 100, 168, 169, 1, 95, 13, 15, 16, - 17, 18, 19, 20, 21, 22, 23, 24, 25, 31, - 87, 104, 109, 128, 130, 136, 137, 140, 141, 142, - 143, 144, 145, 146, 147, 148, 149, 151, 154, 1, - 13, 40, 69, 155, 156, 157, 158, 164, 13, 62, - 133, 134, 135, 12, 13, 15, 16, 44, 45, 46, - 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, - 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, - 68, 76, 79, 83, 84, 139, 160, 162, 163, 164, - 165, 166, 41, 42, 73, 121, 122, 124, 125, 141, - 1, 13, 112, 113, 114, 115, 1, 101, 109, 96, - 168, 0, 71, 98, 173, 174, 72, 21, 13, 17, - 66, 67, 13, 95, 21, 1, 95, 1, 95, 1, - 95, 95, 95, 1, 70, 75, 145, 1, 5, 76, - 77, 78, 138, 13, 20, 146, 147, 147, 1, 148, - 72, 174, 95, 95, 71, 1, 157, 174, 72, 174, - 1, 17, 173, 95, 95, 95, 95, 95, 95, 95, - 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, - 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, - 95, 95, 95, 95, 95, 95, 61, 163, 1, 71, - 75, 82, 161, 95, 95, 95, 95, 71, 71, 72, - 174, 95, 71, 1, 114, 72, 174, 1, 17, 95, - 72, 173, 35, 36, 102, 110, 96, 96, 1, 13, - 13, 14, 64, 95, 13, 20, 144, 150, 72, 173, - 12, 65, 118, 72, 173, 70, 125, 127, 72, 173, - 70, 12, 13, 131, 71, 95, 95, 95, 95, 95, - 145, 147, 95, 1, 72, 174, 72, 1, 95, 72, - 95, 71, 70, 75, 1, 160, 95, 95, 95, 162, - 13, 119, 43, 13, 129, 95, 1, 72, 174, 72, - 95, 72, 95, 70, 95, 95, 27, 103, 116, 96, - 98, 173, 74, 74, 74, 145, 95, 13, 150, 7, - 8, 9, 10, 11, 80, 81, 152, 95, 95, 1, - 70, 75, 95, 95, 155, 143, 72, 95, 1, 95, - 95, 1, 160, 95, 95, 74, 95, 95, 95, 95, - 43, 123, 72, 95, 1, 95, 95, 1, 160, 95, - 126, 127, 37, 111, 1, 95, 1, 104, 105, 109, - 168, 170, 172, 96, 95, 80, 152, 95, 126, 106, - 95, 95, 155, 70, 98, 95, 72, 160, 40, 159, - 155, 135, 95, 17, 120, 121, 95, 95, 72, 160, - 155, 70, 5, 70, 72, 173, 13, 117, 173, 96, - 74, 95, 12, 13, 153, 72, 173, 1, 98, 107, - 108, 128, 130, 136, 137, 140, 167, 168, 170, 171, - 172, 106, 125, 71, 95, 95, 159, 95, 1, 71, - 95, 74, 122, 95, 71, 95, 127, 95, 5, 118, - 153, 95, 98, 96, 167, 95, 132, 160, 95, 95, - 112, 112, 95, 95, 80, 71, 133, 95, 71, 71, - 72, 80, 95 + 0, 25, 27, 28, 29, 31, 32, 33, 37, 85, + 87, 88, 89, 90, 91, 92, 93, 96, 98, 1, + 94, 69, 69, 69, 69, 4, 69, 69, 0, 94, + 94, 94, 94, 94, 94, 94, 95, 69, 71, 172, + 4, 11, 94, 94, 94, 94, 94, 94, 94, 4, + 5, 38, 99, 167, 168, 1, 94, 12, 14, 15, + 16, 17, 18, 19, 20, 21, 22, 23, 24, 30, + 86, 103, 108, 127, 129, 135, 136, 139, 140, 141, + 142, 143, 144, 145, 146, 147, 148, 150, 153, 1, + 12, 39, 68, 154, 155, 156, 157, 163, 12, 61, + 132, 133, 134, 11, 12, 14, 15, 43, 44, 45, + 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, + 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, + 67, 75, 78, 82, 83, 138, 159, 161, 162, 163, + 164, 165, 40, 41, 72, 120, 121, 123, 124, 140, + 1, 12, 111, 112, 113, 114, 1, 100, 108, 95, + 167, 0, 70, 97, 172, 173, 71, 20, 12, 16, + 65, 66, 12, 94, 20, 1, 94, 1, 94, 1, + 94, 94, 94, 1, 69, 74, 144, 1, 4, 75, + 76, 77, 137, 12, 19, 145, 146, 146, 1, 147, + 71, 173, 94, 94, 70, 1, 156, 173, 71, 173, + 1, 16, 172, 94, 94, 94, 94, 94, 94, 94, + 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, + 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, + 94, 94, 94, 94, 94, 94, 60, 162, 1, 70, + 74, 81, 160, 94, 94, 94, 94, 70, 70, 71, + 173, 94, 70, 1, 113, 71, 173, 1, 16, 94, + 71, 172, 34, 35, 101, 109, 95, 95, 1, 12, + 12, 13, 63, 94, 12, 19, 143, 149, 71, 172, + 11, 64, 117, 71, 172, 69, 124, 126, 71, 172, + 69, 11, 12, 130, 70, 94, 94, 94, 94, 94, + 144, 146, 94, 1, 71, 173, 71, 1, 94, 71, + 94, 70, 69, 74, 1, 159, 94, 94, 94, 161, + 12, 118, 42, 12, 128, 94, 1, 71, 173, 71, + 94, 71, 94, 69, 94, 94, 26, 102, 115, 95, + 97, 172, 73, 73, 73, 144, 94, 12, 149, 6, + 7, 8, 9, 10, 79, 80, 151, 94, 94, 1, + 69, 74, 94, 94, 154, 142, 71, 94, 1, 94, + 94, 1, 159, 94, 94, 73, 94, 94, 94, 94, + 42, 122, 71, 94, 1, 94, 94, 1, 159, 94, + 125, 126, 36, 110, 1, 94, 1, 103, 104, 108, + 167, 169, 171, 95, 94, 79, 151, 94, 125, 105, + 94, 94, 154, 69, 97, 94, 71, 159, 39, 158, + 154, 134, 94, 16, 119, 120, 94, 94, 71, 159, + 154, 69, 4, 69, 71, 172, 12, 116, 172, 95, + 73, 94, 11, 12, 152, 71, 172, 1, 97, 106, + 107, 127, 129, 135, 136, 139, 166, 167, 169, 170, + 171, 105, 124, 70, 94, 94, 158, 94, 1, 70, + 94, 73, 121, 94, 70, 94, 126, 94, 4, 117, + 152, 94, 97, 95, 166, 94, 131, 159, 94, 94, + 111, 111, 94, 94, 79, 70, 132, 94, 70, 70, + 71, 79, 94 }; #define yyerrok (yyerrstatus = 0) @@ -1509,20 +1546,17 @@ yy_symbol_print (yyoutput, yytype, yyvaluep) #if (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) static void -yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop) +yy_stack_print (yytype_int16 *bottom, yytype_int16 *top) #else static void -yy_stack_print (yybottom, yytop) - yytype_int16 *yybottom; - yytype_int16 *yytop; +yy_stack_print (bottom, top) + yytype_int16 *bottom; + yytype_int16 *top; #endif { YYFPRINTF (stderr, "Stack now"); - for (; yybottom <= yytop; yybottom++) - { - int yybot = *yybottom; - YYFPRINTF (stderr, " %d", yybot); - } + for (; bottom <= top; ++bottom) + YYFPRINTF (stderr, " %d", *bottom); YYFPRINTF (stderr, "\n"); } @@ -1556,11 +1590,11 @@ yy_reduce_print (yyvsp, yyrule) /* The symbols being reduced. */ for (yyi = 0; yyi < yynrhs; yyi++) { - YYFPRINTF (stderr, " $%d = ", yyi + 1); + fprintf (stderr, " $%d = ", yyi + 1); yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi], &(yyvsp[(yyi + 1) - (yynrhs)]) ); - YYFPRINTF (stderr, "\n"); + fprintf (stderr, "\n"); } } @@ -1840,8 +1874,10 @@ yydestruct (yymsg, yytype, yyvaluep) break; } } + /* Prevent warnings from -Wmissing-prototypes. */ + #ifdef YYPARSE_PARAM #if defined __STDC__ || defined __cplusplus int yyparse (void *YYPARSE_PARAM); @@ -1860,9 +1896,10 @@ int yyparse (); -/*-------------------------. -| yyparse or yypush_parse. | -`-------------------------*/ + +/*----------. +| yyparse. | +`----------*/ #ifdef YYPARSE_PARAM #if (defined __STDC__ || defined __C99__FUNC__ \ @@ -1886,46 +1923,22 @@ yyparse () #endif #endif { -/* The lookahead symbol. */ + /* The look-ahead symbol. */ int yychar; -/* The semantic value of the lookahead symbol. */ +/* The semantic value of the look-ahead symbol. */ YYSTYPE yylval; - /* Number of syntax errors so far. */ - int yynerrs; - - int yystate; - /* Number of tokens to shift before error messages enabled. */ - int yyerrstatus; - - /* The stacks and their tools: - `yyss': related to states. - `yyvs': related to semantic values. - - Refer to the stacks thru separate pointers, to allow yyoverflow - to reallocate them elsewhere. */ - - /* The state stack. */ - yytype_int16 yyssa[YYINITDEPTH]; - yytype_int16 *yyss; - yytype_int16 *yyssp; - - /* The semantic value stack. */ - YYSTYPE yyvsa[YYINITDEPTH]; - YYSTYPE *yyvs; - YYSTYPE *yyvsp; - - YYSIZE_T yystacksize; +/* Number of syntax errors so far. */ +int yynerrs; + int yystate; int yyn; int yyresult; - /* Lookahead token as an internal (translated) token number. */ - int yytoken; - /* The variables used to return semantic value and location from the - action routines. */ - YYSTYPE yyval; - + /* Number of tokens to shift before error messages enabled. */ + int yyerrstatus; + /* Look-ahead token as an internal (translated) token number. */ + int yytoken = 0; #if YYERROR_VERBOSE /* Buffer for error messages, and its allocated size. */ char yymsgbuf[128]; @@ -1933,28 +1946,51 @@ YYSTYPE yylval; YYSIZE_T yymsg_alloc = sizeof yymsgbuf; #endif + /* Three stacks and their tools: + `yyss': related to states, + `yyvs': related to semantic values, + `yyls': related to locations. + + Refer to the stacks thru separate pointers, to allow yyoverflow + to reallocate them elsewhere. */ + + /* The state stack. */ + yytype_int16 yyssa[YYINITDEPTH]; + yytype_int16 *yyss = yyssa; + yytype_int16 *yyssp; + + /* The semantic value stack. */ + YYSTYPE yyvsa[YYINITDEPTH]; + YYSTYPE *yyvs = yyvsa; + YYSTYPE *yyvsp; + + + #define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)) + YYSIZE_T yystacksize = YYINITDEPTH; + + /* The variables used to return semantic value and location from the + action routines. */ + YYSTYPE yyval; + + /* The number of symbols on the RHS of the reduced rule. Keep to zero when no symbol should be popped. */ int yylen = 0; - yytoken = 0; - yyss = yyssa; - yyvs = yyvsa; - yystacksize = YYINITDEPTH; - YYDPRINTF ((stderr, "Starting parse\n")); yystate = 0; yyerrstatus = 0; yynerrs = 0; - yychar = YYEMPTY; /* Cause a token to be read. */ + yychar = YYEMPTY; /* Cause a token to be read. */ /* Initialize stack pointers. Waste one element of value and location stack so that they stay on the same level as the state stack. The wasted elements are never initialized. */ + yyssp = yyss; yyvsp = yyvs; @@ -1984,6 +2020,7 @@ YYSTYPE yylval; YYSTYPE *yyvs1 = yyvs; yytype_int16 *yyss1 = yyss; + /* Each stack pointer address is followed by the size of the data in use in that stack, in bytes. This used to be a conditional around just the two extra args, but that might @@ -1991,6 +2028,7 @@ YYSTYPE yylval; yyoverflow (YY_("memory exhausted"), &yyss1, yysize * sizeof (*yyssp), &yyvs1, yysize * sizeof (*yyvsp), + &yystacksize); yyss = yyss1; @@ -2013,8 +2051,9 @@ YYSTYPE yylval; (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); if (! yyptr) goto yyexhaustedlab; - YYSTACK_RELOCATE (yyss_alloc, yyss); - YYSTACK_RELOCATE (yyvs_alloc, yyvs); + YYSTACK_RELOCATE (yyss); + YYSTACK_RELOCATE (yyvs); + # undef YYSTACK_RELOCATE if (yyss1 != yyssa) YYSTACK_FREE (yyss1); @@ -2025,6 +2064,7 @@ YYSTYPE yylval; yyssp = yyss + yysize - 1; yyvsp = yyvs + yysize - 1; + YYDPRINTF ((stderr, "Stack size increased to %lu\n", (unsigned long int) yystacksize)); @@ -2034,9 +2074,6 @@ YYSTYPE yylval; YYDPRINTF ((stderr, "Entering state %d\n", yystate)); - if (yystate == YYFINAL) - YYACCEPT; - goto yybackup; /*-----------. @@ -2045,16 +2082,16 @@ YYSTYPE yylval; yybackup: /* Do appropriate processing given the current state. Read a - lookahead token if we need one and don't already have one. */ + look-ahead token if we need one and don't already have one. */ - /* First try to decide what to do without reference to lookahead token. */ + /* First try to decide what to do without reference to look-ahead token. */ yyn = yypact[yystate]; if (yyn == YYPACT_NINF) goto yydefault; - /* Not known => get a lookahead token if don't already have one. */ + /* Not known => get a look-ahead token if don't already have one. */ - /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */ + /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */ if (yychar == YYEMPTY) { YYDPRINTF ((stderr, "Reading a token: ")); @@ -2086,16 +2123,20 @@ yybackup: goto yyreduce; } + if (yyn == YYFINAL) + YYACCEPT; + /* Count tokens shifted since error; after three, turn off error status. */ if (yyerrstatus) yyerrstatus--; - /* Shift the lookahead token. */ + /* Shift the look-ahead token. */ YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); - /* Discard the shifted token. */ - yychar = YYEMPTY; + /* Discard the shifted token unless it is eof. */ + if (yychar != YYEOF) + yychar = YYEMPTY; yystate = yyn; *++yyvsp = yylval; @@ -2135,45 +2176,35 @@ yyreduce: switch (yyn) { case 12: - -/* Line 1455 of yacc.c */ -#line 281 "../css/CSSGrammar.y" +#line 279 "../css/CSSGrammar.y" { static_cast(parser)->m_rule = (yyvsp[(4) - (6)].rule); ;} break; case 13: - -/* Line 1455 of yacc.c */ -#line 287 "../css/CSSGrammar.y" +#line 285 "../css/CSSGrammar.y" { static_cast(parser)->m_keyframe = (yyvsp[(4) - (6)].keyframeRule); ;} break; case 14: - -/* Line 1455 of yacc.c */ -#line 293 "../css/CSSGrammar.y" +#line 291 "../css/CSSGrammar.y" { /* can be empty */ ;} break; case 15: - -/* Line 1455 of yacc.c */ -#line 299 "../css/CSSGrammar.y" +#line 297 "../css/CSSGrammar.y" { /* can be empty */ ;} break; case 16: - -/* Line 1455 of yacc.c */ -#line 305 "../css/CSSGrammar.y" +#line 303 "../css/CSSGrammar.y" { CSSParser* p = static_cast(parser); if ((yyvsp[(4) - (5)].valueList)) { @@ -2188,9 +2219,7 @@ yyreduce: break; case 17: - -/* Line 1455 of yacc.c */ -#line 319 "../css/CSSGrammar.y" +#line 317 "../css/CSSGrammar.y" { CSSParser* p = static_cast(parser); p->m_mediaQuery = p->sinkFloatingMediaQuery((yyvsp[(4) - (5)].mediaQuery)); @@ -2198,9 +2227,7 @@ yyreduce: break; case 18: - -/* Line 1455 of yacc.c */ -#line 326 "../css/CSSGrammar.y" +#line 324 "../css/CSSGrammar.y" { if ((yyvsp[(4) - (5)].selectorList)) { CSSParser* p = static_cast(parser); @@ -2211,17 +2238,13 @@ yyreduce: break; case 25: - -/* Line 1455 of yacc.c */ -#line 348 "../css/CSSGrammar.y" +#line 346 "../css/CSSGrammar.y" { ;} break; case 28: - -/* Line 1455 of yacc.c */ -#line 358 "../css/CSSGrammar.y" +#line 356 "../css/CSSGrammar.y" { CSSParser* p = static_cast(parser); (yyval.rule) = static_cast(parser)->createCharsetRule((yyvsp[(3) - (5)].string)); @@ -2231,25 +2254,19 @@ yyreduce: break; case 29: - -/* Line 1455 of yacc.c */ -#line 364 "../css/CSSGrammar.y" +#line 362 "../css/CSSGrammar.y" { ;} break; case 30: - -/* Line 1455 of yacc.c */ -#line 366 "../css/CSSGrammar.y" +#line 364 "../css/CSSGrammar.y" { ;} break; case 32: - -/* Line 1455 of yacc.c */ -#line 372 "../css/CSSGrammar.y" +#line 370 "../css/CSSGrammar.y" { CSSParser* p = static_cast(parser); if ((yyvsp[(2) - (3)].rule) && p->m_styleSheet) @@ -2258,17 +2275,13 @@ yyreduce: break; case 33: - -/* Line 1455 of yacc.c */ -#line 377 "../css/CSSGrammar.y" +#line 375 "../css/CSSGrammar.y" { ;} break; case 35: - -/* Line 1455 of yacc.c */ -#line 383 "../css/CSSGrammar.y" +#line 381 "../css/CSSGrammar.y" { CSSParser* p = static_cast(parser); if ((yyvsp[(2) - (3)].rule) && p->m_styleSheet) @@ -2277,9 +2290,7 @@ yyreduce: break; case 39: - -/* Line 1455 of yacc.c */ -#line 397 "../css/CSSGrammar.y" +#line 395 "../css/CSSGrammar.y" { CSSParser* p = static_cast(parser); if ((yyvsp[(2) - (3)].rule) && p->m_styleSheet) @@ -2288,16 +2299,12 @@ yyreduce: break; case 49: - -/* Line 1455 of yacc.c */ -#line 420 "../css/CSSGrammar.y" +#line 418 "../css/CSSGrammar.y" { (yyval.ruleList) = 0; ;} break; case 50: - -/* Line 1455 of yacc.c */ -#line 421 "../css/CSSGrammar.y" +#line 419 "../css/CSSGrammar.y" { (yyval.ruleList) = (yyvsp[(1) - (3)].ruleList); if ((yyvsp[(2) - (3)].rule)) { @@ -2309,90 +2316,70 @@ yyreduce: break; case 60: - -/* Line 1455 of yacc.c */ -#line 448 "../css/CSSGrammar.y" +#line 446 "../css/CSSGrammar.y" { (yyval.rule) = static_cast(parser)->createImportRule((yyvsp[(3) - (6)].string), (yyvsp[(5) - (6)].mediaList)); ;} break; case 61: - -/* Line 1455 of yacc.c */ -#line 451 "../css/CSSGrammar.y" +#line 449 "../css/CSSGrammar.y" { (yyval.rule) = 0; ;} break; case 62: - -/* Line 1455 of yacc.c */ -#line 454 "../css/CSSGrammar.y" +#line 452 "../css/CSSGrammar.y" { (yyval.rule) = 0; ;} break; case 63: - -/* Line 1455 of yacc.c */ -#line 457 "../css/CSSGrammar.y" +#line 455 "../css/CSSGrammar.y" { (yyval.rule) = 0; ;} break; case 64: - -/* Line 1455 of yacc.c */ -#line 463 "../css/CSSGrammar.y" +#line 461 "../css/CSSGrammar.y" { (yyval.rule) = static_cast(parser)->createVariablesRule((yyvsp[(3) - (7)].mediaList), true); ;} break; case 65: - -/* Line 1455 of yacc.c */ -#line 467 "../css/CSSGrammar.y" +#line 465 "../css/CSSGrammar.y" { (yyval.rule) = static_cast(parser)->createVariablesRule((yyvsp[(3) - (7)].mediaList), false); ;} break; case 66: - -/* Line 1455 of yacc.c */ -#line 473 "../css/CSSGrammar.y" +#line 471 "../css/CSSGrammar.y" { (yyval.mediaList) = static_cast(parser)->createMediaList(); ;} break; case 67: - -/* Line 1455 of yacc.c */ -#line 477 "../css/CSSGrammar.y" +#line 475 "../css/CSSGrammar.y" { (yyval.mediaList) = (yyvsp[(3) - (3)].mediaList); ;} break; case 68: - -/* Line 1455 of yacc.c */ -#line 483 "../css/CSSGrammar.y" +#line 481 "../css/CSSGrammar.y" { (yyval.boolean) = (yyvsp[(1) - (1)].boolean); ;} break; case 69: - -/* Line 1455 of yacc.c */ -#line 486 "../css/CSSGrammar.y" +#line 484 "../css/CSSGrammar.y" { (yyval.boolean) = (yyvsp[(1) - (2)].boolean); if ((yyvsp[(2) - (2)].boolean)) @@ -2401,81 +2388,63 @@ yyreduce: break; case 70: - -/* Line 1455 of yacc.c */ -#line 491 "../css/CSSGrammar.y" +#line 489 "../css/CSSGrammar.y" { (yyval.boolean) = (yyvsp[(1) - (1)].boolean); ;} break; case 71: - -/* Line 1455 of yacc.c */ -#line 494 "../css/CSSGrammar.y" +#line 492 "../css/CSSGrammar.y" { (yyval.boolean) = false; ;} break; case 72: - -/* Line 1455 of yacc.c */ -#line 497 "../css/CSSGrammar.y" +#line 495 "../css/CSSGrammar.y" { (yyval.boolean) = false; ;} break; case 73: - -/* Line 1455 of yacc.c */ -#line 500 "../css/CSSGrammar.y" +#line 498 "../css/CSSGrammar.y" { (yyval.boolean) = (yyvsp[(1) - (2)].boolean); ;} break; case 74: - -/* Line 1455 of yacc.c */ -#line 506 "../css/CSSGrammar.y" +#line 504 "../css/CSSGrammar.y" { (yyval.boolean) = (yyvsp[(1) - (3)].boolean); ;} break; case 75: - -/* Line 1455 of yacc.c */ -#line 509 "../css/CSSGrammar.y" +#line 507 "../css/CSSGrammar.y" { (yyval.boolean) = false; ;} break; case 76: - -/* Line 1455 of yacc.c */ -#line 512 "../css/CSSGrammar.y" +#line 510 "../css/CSSGrammar.y" { (yyval.boolean) = false; ;} break; case 77: - -/* Line 1455 of yacc.c */ -#line 515 "../css/CSSGrammar.y" +#line 513 "../css/CSSGrammar.y" { (yyval.boolean) = false; ;} break; case 78: - -/* Line 1455 of yacc.c */ -#line 518 "../css/CSSGrammar.y" +#line 516 "../css/CSSGrammar.y" { (yyval.boolean) = (yyvsp[(1) - (4)].boolean); if ((yyvsp[(2) - (4)].boolean)) @@ -2484,63 +2453,49 @@ yyreduce: break; case 79: - -/* Line 1455 of yacc.c */ -#line 523 "../css/CSSGrammar.y" +#line 521 "../css/CSSGrammar.y" { (yyval.boolean) = (yyvsp[(1) - (4)].boolean); ;} break; case 80: - -/* Line 1455 of yacc.c */ -#line 526 "../css/CSSGrammar.y" +#line 524 "../css/CSSGrammar.y" { (yyval.boolean) = (yyvsp[(1) - (6)].boolean); ;} break; case 81: - -/* Line 1455 of yacc.c */ -#line 532 "../css/CSSGrammar.y" +#line 530 "../css/CSSGrammar.y" { (yyval.boolean) = static_cast(parser)->addVariable((yyvsp[(1) - (4)].string), (yyvsp[(4) - (4)].valueList)); ;} break; case 82: - -/* Line 1455 of yacc.c */ -#line 536 "../css/CSSGrammar.y" +#line 534 "../css/CSSGrammar.y" { (yyval.boolean) = static_cast(parser)->addVariableDeclarationBlock((yyvsp[(1) - (7)].string)); ;} break; case 83: - -/* Line 1455 of yacc.c */ -#line 540 "../css/CSSGrammar.y" +#line 538 "../css/CSSGrammar.y" { (yyval.boolean) = false; ;} break; case 84: - -/* Line 1455 of yacc.c */ -#line 544 "../css/CSSGrammar.y" +#line 542 "../css/CSSGrammar.y" { (yyval.boolean) = false; ;} break; case 85: - -/* Line 1455 of yacc.c */ -#line 548 "../css/CSSGrammar.y" +#line 546 "../css/CSSGrammar.y" { /* @variables { varname: } Just reduce away this variable with no value. */ (yyval.boolean) = false; @@ -2548,9 +2503,7 @@ yyreduce: break; case 86: - -/* Line 1455 of yacc.c */ -#line 553 "../css/CSSGrammar.y" +#line 551 "../css/CSSGrammar.y" { /* if we come across rules with invalid values like this case: @variables { varname: *; }, just discard the property/value pair */ (yyval.boolean) = false; @@ -2558,18 +2511,14 @@ yyreduce: break; case 87: - -/* Line 1455 of yacc.c */ -#line 560 "../css/CSSGrammar.y" +#line 558 "../css/CSSGrammar.y" { (yyval.string) = (yyvsp[(1) - (2)].string); ;} break; case 88: - -/* Line 1455 of yacc.c */ -#line 566 "../css/CSSGrammar.y" +#line 564 "../css/CSSGrammar.y" { CSSParser* p = static_cast(parser); if (p->m_styleSheet) @@ -2578,50 +2527,38 @@ yyreduce: break; case 91: - -/* Line 1455 of yacc.c */ -#line 576 "../css/CSSGrammar.y" +#line 574 "../css/CSSGrammar.y" { (yyval.string).characters = 0; ;} break; case 92: - -/* Line 1455 of yacc.c */ -#line 577 "../css/CSSGrammar.y" +#line 575 "../css/CSSGrammar.y" { (yyval.string) = (yyvsp[(1) - (2)].string); ;} break; case 95: - -/* Line 1455 of yacc.c */ -#line 586 "../css/CSSGrammar.y" +#line 584 "../css/CSSGrammar.y" { (yyval.string) = (yyvsp[(1) - (2)].string); ;} break; case 96: - -/* Line 1455 of yacc.c */ -#line 592 "../css/CSSGrammar.y" +#line 590 "../css/CSSGrammar.y" { (yyval.valueList) = 0; ;} break; case 97: - -/* Line 1455 of yacc.c */ -#line 595 "../css/CSSGrammar.y" +#line 593 "../css/CSSGrammar.y" { (yyval.valueList) = (yyvsp[(3) - (4)].valueList); ;} break; case 98: - -/* Line 1455 of yacc.c */ -#line 601 "../css/CSSGrammar.y" +#line 599 "../css/CSSGrammar.y" { (yyvsp[(3) - (7)].string).lower(); (yyval.mediaQueryExp) = static_cast(parser)->createFloatingMediaQueryExp((yyvsp[(3) - (7)].string), (yyvsp[(5) - (7)].valueList)); @@ -2629,9 +2566,7 @@ yyreduce: break; case 99: - -/* Line 1455 of yacc.c */ -#line 608 "../css/CSSGrammar.y" +#line 606 "../css/CSSGrammar.y" { CSSParser* p = static_cast(parser); (yyval.mediaQueryExpList) = p->createFloatingMediaQueryExpList(); @@ -2640,9 +2575,7 @@ yyreduce: break; case 100: - -/* Line 1455 of yacc.c */ -#line 613 "../css/CSSGrammar.y" +#line 611 "../css/CSSGrammar.y" { (yyval.mediaQueryExpList) = (yyvsp[(1) - (5)].mediaQueryExpList); (yyval.mediaQueryExpList)->append(static_cast(parser)->sinkFloatingMediaQueryExp((yyvsp[(5) - (5)].mediaQueryExp))); @@ -2650,54 +2583,42 @@ yyreduce: break; case 101: - -/* Line 1455 of yacc.c */ -#line 620 "../css/CSSGrammar.y" +#line 618 "../css/CSSGrammar.y" { (yyval.mediaQueryExpList) = static_cast(parser)->createFloatingMediaQueryExpList(); ;} break; case 102: - -/* Line 1455 of yacc.c */ -#line 623 "../css/CSSGrammar.y" +#line 621 "../css/CSSGrammar.y" { (yyval.mediaQueryExpList) = (yyvsp[(3) - (3)].mediaQueryExpList); ;} break; case 103: - -/* Line 1455 of yacc.c */ -#line 629 "../css/CSSGrammar.y" +#line 627 "../css/CSSGrammar.y" { (yyval.mediaQueryRestrictor) = MediaQuery::None; ;} break; case 104: - -/* Line 1455 of yacc.c */ -#line 632 "../css/CSSGrammar.y" +#line 630 "../css/CSSGrammar.y" { (yyval.mediaQueryRestrictor) = MediaQuery::Only; ;} break; case 105: - -/* Line 1455 of yacc.c */ -#line 635 "../css/CSSGrammar.y" +#line 633 "../css/CSSGrammar.y" { (yyval.mediaQueryRestrictor) = MediaQuery::Not; ;} break; case 106: - -/* Line 1455 of yacc.c */ -#line 641 "../css/CSSGrammar.y" +#line 639 "../css/CSSGrammar.y" { CSSParser* p = static_cast(parser); (yyval.mediaQuery) = p->createFloatingMediaQuery(p->sinkFloatingMediaQueryExpList((yyvsp[(1) - (1)].mediaQueryExpList))); @@ -2705,9 +2626,7 @@ yyreduce: break; case 107: - -/* Line 1455 of yacc.c */ -#line 646 "../css/CSSGrammar.y" +#line 644 "../css/CSSGrammar.y" { CSSParser* p = static_cast(parser); (yyvsp[(3) - (4)].string).lower(); @@ -2716,18 +2635,14 @@ yyreduce: break; case 108: - -/* Line 1455 of yacc.c */ -#line 654 "../css/CSSGrammar.y" +#line 652 "../css/CSSGrammar.y" { (yyval.mediaList) = static_cast(parser)->createMediaList(); ;} break; case 110: - -/* Line 1455 of yacc.c */ -#line 661 "../css/CSSGrammar.y" +#line 659 "../css/CSSGrammar.y" { CSSParser* p = static_cast(parser); (yyval.mediaList) = p->createMediaList(); @@ -2736,9 +2651,7 @@ yyreduce: break; case 111: - -/* Line 1455 of yacc.c */ -#line 666 "../css/CSSGrammar.y" +#line 664 "../css/CSSGrammar.y" { (yyval.mediaList) = (yyvsp[(1) - (4)].mediaList); if ((yyval.mediaList)) @@ -2747,45 +2660,35 @@ yyreduce: break; case 112: - -/* Line 1455 of yacc.c */ -#line 671 "../css/CSSGrammar.y" +#line 669 "../css/CSSGrammar.y" { (yyval.mediaList) = 0; ;} break; case 113: - -/* Line 1455 of yacc.c */ -#line 677 "../css/CSSGrammar.y" +#line 675 "../css/CSSGrammar.y" { (yyval.rule) = static_cast(parser)->createMediaRule((yyvsp[(3) - (7)].mediaList), (yyvsp[(6) - (7)].ruleList)); ;} break; case 114: - -/* Line 1455 of yacc.c */ -#line 680 "../css/CSSGrammar.y" +#line 678 "../css/CSSGrammar.y" { (yyval.rule) = static_cast(parser)->createMediaRule(0, (yyvsp[(5) - (6)].ruleList)); ;} break; case 115: - -/* Line 1455 of yacc.c */ -#line 686 "../css/CSSGrammar.y" +#line 684 "../css/CSSGrammar.y" { (yyval.string) = (yyvsp[(1) - (2)].string); ;} break; case 116: - -/* Line 1455 of yacc.c */ -#line 692 "../css/CSSGrammar.y" +#line 690 "../css/CSSGrammar.y" { (yyval.rule) = (yyvsp[(7) - (8)].keyframesRule); (yyvsp[(7) - (8)].keyframesRule)->setNameInternal((yyvsp[(3) - (8)].string)); @@ -2793,16 +2696,12 @@ yyreduce: break; case 119: - -/* Line 1455 of yacc.c */ -#line 704 "../css/CSSGrammar.y" +#line 702 "../css/CSSGrammar.y" { (yyval.keyframesRule) = static_cast(parser)->createKeyframesRule(); ;} break; case 120: - -/* Line 1455 of yacc.c */ -#line 705 "../css/CSSGrammar.y" +#line 703 "../css/CSSGrammar.y" { (yyval.keyframesRule) = (yyvsp[(1) - (3)].keyframesRule); if ((yyvsp[(2) - (3)].keyframeRule)) @@ -2811,18 +2710,14 @@ yyreduce: break; case 121: - -/* Line 1455 of yacc.c */ -#line 713 "../css/CSSGrammar.y" +#line 711 "../css/CSSGrammar.y" { (yyval.keyframeRule) = static_cast(parser)->createKeyframeRule((yyvsp[(1) - (6)].valueList)); ;} break; case 122: - -/* Line 1455 of yacc.c */ -#line 719 "../css/CSSGrammar.y" +#line 717 "../css/CSSGrammar.y" { CSSParser* p = static_cast(parser); (yyval.valueList) = p->createFloatingValueList(); @@ -2831,9 +2726,7 @@ yyreduce: break; case 123: - -/* Line 1455 of yacc.c */ -#line 724 "../css/CSSGrammar.y" +#line 722 "../css/CSSGrammar.y" { CSSParser* p = static_cast(parser); (yyval.valueList) = (yyvsp[(1) - (5)].valueList); @@ -2843,16 +2736,12 @@ yyreduce: break; case 124: - -/* Line 1455 of yacc.c */ -#line 733 "../css/CSSGrammar.y" +#line 731 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).isInt = false; (yyval.value).fValue = (yyvsp[(1) - (1)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_NUMBER; ;} break; case 125: - -/* Line 1455 of yacc.c */ -#line 734 "../css/CSSGrammar.y" +#line 732 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).isInt = false; (yyval.value).unit = CSSPrimitiveValue::CSS_NUMBER; CSSParserString& str = (yyvsp[(1) - (1)].string); @@ -2866,98 +2755,74 @@ yyreduce: break; case 126: - -/* Line 1455 of yacc.c */ -#line 758 "../css/CSSGrammar.y" +#line 756 "../css/CSSGrammar.y" { (yyval.rule) = 0; ;} break; case 127: - -/* Line 1455 of yacc.c */ -#line 761 "../css/CSSGrammar.y" +#line 759 "../css/CSSGrammar.y" { (yyval.rule) = 0; ;} break; case 128: - -/* Line 1455 of yacc.c */ -#line 768 "../css/CSSGrammar.y" +#line 766 "../css/CSSGrammar.y" { (yyval.rule) = static_cast(parser)->createFontFaceRule(); ;} break; case 129: - -/* Line 1455 of yacc.c */ -#line 771 "../css/CSSGrammar.y" +#line 769 "../css/CSSGrammar.y" { (yyval.rule) = 0; ;} break; case 130: - -/* Line 1455 of yacc.c */ -#line 774 "../css/CSSGrammar.y" +#line 772 "../css/CSSGrammar.y" { (yyval.rule) = 0; ;} break; case 131: - -/* Line 1455 of yacc.c */ -#line 780 "../css/CSSGrammar.y" +#line 778 "../css/CSSGrammar.y" { (yyval.relation) = CSSSelector::DirectAdjacent; ;} break; case 132: - -/* Line 1455 of yacc.c */ -#line 781 "../css/CSSGrammar.y" +#line 779 "../css/CSSGrammar.y" { (yyval.relation) = CSSSelector::IndirectAdjacent; ;} break; case 133: - -/* Line 1455 of yacc.c */ -#line 782 "../css/CSSGrammar.y" +#line 780 "../css/CSSGrammar.y" { (yyval.relation) = CSSSelector::Child; ;} break; case 134: - -/* Line 1455 of yacc.c */ -#line 786 "../css/CSSGrammar.y" +#line 784 "../css/CSSGrammar.y" { (yyval.integer) = -1; ;} break; case 135: - -/* Line 1455 of yacc.c */ -#line 787 "../css/CSSGrammar.y" +#line 785 "../css/CSSGrammar.y" { (yyval.integer) = 1; ;} break; case 136: - -/* Line 1455 of yacc.c */ -#line 791 "../css/CSSGrammar.y" +#line 789 "../css/CSSGrammar.y" { (yyval.rule) = static_cast(parser)->createStyleRule((yyvsp[(1) - (5)].selectorList)); ;} break; case 137: - -/* Line 1455 of yacc.c */ -#line 797 "../css/CSSGrammar.y" +#line 795 "../css/CSSGrammar.y" { if ((yyvsp[(1) - (1)].selector)) { CSSParser* p = static_cast(parser); @@ -2970,9 +2835,7 @@ yyreduce: break; case 138: - -/* Line 1455 of yacc.c */ -#line 806 "../css/CSSGrammar.y" +#line 804 "../css/CSSGrammar.y" { if ((yyvsp[(1) - (4)].selectorList) && (yyvsp[(4) - (4)].selector)) { CSSParser* p = static_cast(parser); @@ -2984,45 +2847,35 @@ yyreduce: break; case 139: - -/* Line 1455 of yacc.c */ -#line 814 "../css/CSSGrammar.y" +#line 812 "../css/CSSGrammar.y" { (yyval.selectorList) = 0; ;} break; case 140: - -/* Line 1455 of yacc.c */ -#line 820 "../css/CSSGrammar.y" +#line 818 "../css/CSSGrammar.y" { (yyval.selector) = (yyvsp[(1) - (2)].selector); ;} break; case 141: - -/* Line 1455 of yacc.c */ -#line 826 "../css/CSSGrammar.y" +#line 824 "../css/CSSGrammar.y" { (yyval.selector) = (yyvsp[(1) - (1)].selector); ;} break; case 142: - -/* Line 1455 of yacc.c */ -#line 830 "../css/CSSGrammar.y" +#line 828 "../css/CSSGrammar.y" { (yyval.selector) = (yyvsp[(1) - (1)].selector); ;} break; case 143: - -/* Line 1455 of yacc.c */ -#line 834 "../css/CSSGrammar.y" +#line 832 "../css/CSSGrammar.y" { (yyval.selector) = (yyvsp[(2) - (2)].selector); if (!(yyvsp[(1) - (2)].selector)) @@ -3041,9 +2894,7 @@ yyreduce: break; case 144: - -/* Line 1455 of yacc.c */ -#line 849 "../css/CSSGrammar.y" +#line 847 "../css/CSSGrammar.y" { (yyval.selector) = (yyvsp[(3) - (3)].selector); if (!(yyvsp[(1) - (3)].selector)) @@ -3067,39 +2918,29 @@ yyreduce: break; case 145: - -/* Line 1455 of yacc.c */ -#line 869 "../css/CSSGrammar.y" +#line 867 "../css/CSSGrammar.y" { (yyval.selector) = 0; ;} break; case 146: - -/* Line 1455 of yacc.c */ -#line 875 "../css/CSSGrammar.y" +#line 873 "../css/CSSGrammar.y" { (yyval.string).characters = 0; (yyval.string).length = 0; ;} break; case 147: - -/* Line 1455 of yacc.c */ -#line 876 "../css/CSSGrammar.y" +#line 874 "../css/CSSGrammar.y" { static UChar star = '*'; (yyval.string).characters = ☆ (yyval.string).length = 1; ;} break; case 148: - -/* Line 1455 of yacc.c */ -#line 877 "../css/CSSGrammar.y" +#line 875 "../css/CSSGrammar.y" { (yyval.string) = (yyvsp[(1) - (2)].string); ;} break; case 149: - -/* Line 1455 of yacc.c */ -#line 881 "../css/CSSGrammar.y" +#line 879 "../css/CSSGrammar.y" { CSSParser* p = static_cast(parser); (yyval.selector) = p->createFloatingSelector(); @@ -3108,9 +2949,7 @@ yyreduce: break; case 150: - -/* Line 1455 of yacc.c */ -#line 886 "../css/CSSGrammar.y" +#line 884 "../css/CSSGrammar.y" { (yyval.selector) = (yyvsp[(2) - (2)].selector); if ((yyval.selector)) { @@ -3121,9 +2960,7 @@ yyreduce: break; case 151: - -/* Line 1455 of yacc.c */ -#line 893 "../css/CSSGrammar.y" +#line 891 "../css/CSSGrammar.y" { (yyval.selector) = (yyvsp[(1) - (1)].selector); CSSParser* p = static_cast(parser); @@ -3133,9 +2970,7 @@ yyreduce: break; case 152: - -/* Line 1455 of yacc.c */ -#line 899 "../css/CSSGrammar.y" +#line 897 "../css/CSSGrammar.y" { AtomicString namespacePrefix = (yyvsp[(1) - (2)].string); CSSParser* p = static_cast(parser); @@ -3149,9 +2984,7 @@ yyreduce: break; case 153: - -/* Line 1455 of yacc.c */ -#line 909 "../css/CSSGrammar.y" +#line 907 "../css/CSSGrammar.y" { (yyval.selector) = (yyvsp[(3) - (3)].selector); if ((yyval.selector)) { @@ -3167,9 +3000,7 @@ yyreduce: break; case 154: - -/* Line 1455 of yacc.c */ -#line 921 "../css/CSSGrammar.y" +#line 919 "../css/CSSGrammar.y" { (yyval.selector) = (yyvsp[(2) - (2)].selector); if ((yyval.selector)) { @@ -3183,9 +3014,7 @@ yyreduce: break; case 155: - -/* Line 1455 of yacc.c */ -#line 934 "../css/CSSGrammar.y" +#line 932 "../css/CSSGrammar.y" { CSSParserString& str = (yyvsp[(1) - (1)].string); CSSParser* p = static_cast(parser); @@ -3197,9 +3026,7 @@ yyreduce: break; case 156: - -/* Line 1455 of yacc.c */ -#line 942 "../css/CSSGrammar.y" +#line 940 "../css/CSSGrammar.y" { static UChar star = '*'; (yyval.string).characters = ☆ @@ -3208,18 +3035,14 @@ yyreduce: break; case 157: - -/* Line 1455 of yacc.c */ -#line 950 "../css/CSSGrammar.y" +#line 948 "../css/CSSGrammar.y" { (yyval.selector) = (yyvsp[(1) - (1)].selector); ;} break; case 158: - -/* Line 1455 of yacc.c */ -#line 953 "../css/CSSGrammar.y" +#line 951 "../css/CSSGrammar.y" { if (!(yyvsp[(2) - (2)].selector)) (yyval.selector) = 0; @@ -3236,18 +3059,14 @@ yyreduce: break; case 159: - -/* Line 1455 of yacc.c */ -#line 966 "../css/CSSGrammar.y" +#line 964 "../css/CSSGrammar.y" { (yyval.selector) = 0; ;} break; case 160: - -/* Line 1455 of yacc.c */ -#line 972 "../css/CSSGrammar.y" +#line 970 "../css/CSSGrammar.y" { CSSParser* p = static_cast(parser); (yyval.selector) = p->createFloatingSelector(); @@ -3259,9 +3078,7 @@ yyreduce: break; case 161: - -/* Line 1455 of yacc.c */ -#line 980 "../css/CSSGrammar.y" +#line 978 "../css/CSSGrammar.y" { if ((yyvsp[(1) - (1)].string).characters[0] >= '0' && (yyvsp[(1) - (1)].string).characters[0] <= '9') { (yyval.selector) = 0; @@ -3277,9 +3094,7 @@ yyreduce: break; case 165: - -/* Line 1455 of yacc.c */ -#line 998 "../css/CSSGrammar.y" +#line 996 "../css/CSSGrammar.y" { CSSParser* p = static_cast(parser); (yyval.selector) = p->createFloatingSelector(); @@ -3291,9 +3106,7 @@ yyreduce: break; case 166: - -/* Line 1455 of yacc.c */ -#line 1009 "../css/CSSGrammar.y" +#line 1007 "../css/CSSGrammar.y" { CSSParserString& str = (yyvsp[(1) - (2)].string); CSSParser* p = static_cast(parser); @@ -3305,9 +3118,7 @@ yyreduce: break; case 167: - -/* Line 1455 of yacc.c */ -#line 1020 "../css/CSSGrammar.y" +#line 1018 "../css/CSSGrammar.y" { (yyval.selector) = static_cast(parser)->createFloatingSelector(); (yyval.selector)->setAttribute(QualifiedName(nullAtom, (yyvsp[(3) - (4)].string), nullAtom)); @@ -3316,9 +3127,7 @@ yyreduce: break; case 168: - -/* Line 1455 of yacc.c */ -#line 1025 "../css/CSSGrammar.y" +#line 1023 "../css/CSSGrammar.y" { (yyval.selector) = static_cast(parser)->createFloatingSelector(); (yyval.selector)->setAttribute(QualifiedName(nullAtom, (yyvsp[(3) - (8)].string), nullAtom)); @@ -3328,9 +3137,7 @@ yyreduce: break; case 169: - -/* Line 1455 of yacc.c */ -#line 1031 "../css/CSSGrammar.y" +#line 1029 "../css/CSSGrammar.y" { AtomicString namespacePrefix = (yyvsp[(3) - (5)].string); CSSParser* p = static_cast(parser); @@ -3342,9 +3149,7 @@ yyreduce: break; case 170: - -/* Line 1455 of yacc.c */ -#line 1039 "../css/CSSGrammar.y" +#line 1037 "../css/CSSGrammar.y" { AtomicString namespacePrefix = (yyvsp[(3) - (9)].string); CSSParser* p = static_cast(parser); @@ -3357,63 +3162,49 @@ yyreduce: break; case 171: - -/* Line 1455 of yacc.c */ -#line 1051 "../css/CSSGrammar.y" +#line 1049 "../css/CSSGrammar.y" { (yyval.integer) = CSSSelector::Exact; ;} break; case 172: - -/* Line 1455 of yacc.c */ -#line 1054 "../css/CSSGrammar.y" +#line 1052 "../css/CSSGrammar.y" { (yyval.integer) = CSSSelector::List; ;} break; case 173: - -/* Line 1455 of yacc.c */ -#line 1057 "../css/CSSGrammar.y" +#line 1055 "../css/CSSGrammar.y" { (yyval.integer) = CSSSelector::Hyphen; ;} break; case 174: - -/* Line 1455 of yacc.c */ -#line 1060 "../css/CSSGrammar.y" +#line 1058 "../css/CSSGrammar.y" { (yyval.integer) = CSSSelector::Begin; ;} break; case 175: - -/* Line 1455 of yacc.c */ -#line 1063 "../css/CSSGrammar.y" +#line 1061 "../css/CSSGrammar.y" { (yyval.integer) = CSSSelector::End; ;} break; case 176: - -/* Line 1455 of yacc.c */ -#line 1066 "../css/CSSGrammar.y" +#line 1064 "../css/CSSGrammar.y" { (yyval.integer) = CSSSelector::Contain; ;} break; case 179: - -/* Line 1455 of yacc.c */ -#line 1077 "../css/CSSGrammar.y" +#line 1075 "../css/CSSGrammar.y" { (yyval.selector) = static_cast(parser)->createFloatingSelector(); (yyval.selector)->m_match = CSSSelector::PseudoClass; @@ -3442,9 +3233,7 @@ yyreduce: break; case 180: - -/* Line 1455 of yacc.c */ -#line 1102 "../css/CSSGrammar.y" +#line 1100 "../css/CSSGrammar.y" { (yyval.selector) = static_cast(parser)->createFloatingSelector(); (yyval.selector)->m_match = CSSSelector::PseudoElement; @@ -3462,9 +3251,7 @@ yyreduce: break; case 181: - -/* Line 1455 of yacc.c */ -#line 1117 "../css/CSSGrammar.y" +#line 1115 "../css/CSSGrammar.y" { CSSParser *p = static_cast(parser); (yyval.selector) = p->createFloatingSelector(); @@ -3485,9 +3272,7 @@ yyreduce: break; case 182: - -/* Line 1455 of yacc.c */ -#line 1135 "../css/CSSGrammar.y" +#line 1133 "../css/CSSGrammar.y" { CSSParser *p = static_cast(parser); (yyval.selector) = p->createFloatingSelector(); @@ -3508,9 +3293,7 @@ yyreduce: break; case 183: - -/* Line 1455 of yacc.c */ -#line 1153 "../css/CSSGrammar.y" +#line 1151 "../css/CSSGrammar.y" { CSSParser *p = static_cast(parser); (yyval.selector) = p->createFloatingSelector(); @@ -3532,9 +3315,7 @@ yyreduce: break; case 184: - -/* Line 1455 of yacc.c */ -#line 1172 "../css/CSSGrammar.y" +#line 1170 "../css/CSSGrammar.y" { if (!(yyvsp[(4) - (6)].selector)) (yyval.selector) = 0; @@ -3550,18 +3331,14 @@ yyreduce: break; case 185: - -/* Line 1455 of yacc.c */ -#line 1187 "../css/CSSGrammar.y" +#line 1185 "../css/CSSGrammar.y" { (yyval.boolean) = (yyvsp[(1) - (1)].boolean); ;} break; case 186: - -/* Line 1455 of yacc.c */ -#line 1190 "../css/CSSGrammar.y" +#line 1188 "../css/CSSGrammar.y" { (yyval.boolean) = (yyvsp[(1) - (2)].boolean); if ( (yyvsp[(2) - (2)].boolean) ) @@ -3570,90 +3347,70 @@ yyreduce: break; case 187: - -/* Line 1455 of yacc.c */ -#line 1195 "../css/CSSGrammar.y" +#line 1193 "../css/CSSGrammar.y" { (yyval.boolean) = (yyvsp[(1) - (1)].boolean); ;} break; case 188: - -/* Line 1455 of yacc.c */ -#line 1198 "../css/CSSGrammar.y" +#line 1196 "../css/CSSGrammar.y" { (yyval.boolean) = false; ;} break; case 189: - -/* Line 1455 of yacc.c */ -#line 1201 "../css/CSSGrammar.y" +#line 1199 "../css/CSSGrammar.y" { (yyval.boolean) = false; ;} break; case 190: - -/* Line 1455 of yacc.c */ -#line 1204 "../css/CSSGrammar.y" +#line 1202 "../css/CSSGrammar.y" { (yyval.boolean) = (yyvsp[(1) - (2)].boolean); ;} break; case 191: - -/* Line 1455 of yacc.c */ -#line 1207 "../css/CSSGrammar.y" +#line 1205 "../css/CSSGrammar.y" { (yyval.boolean) = (yyvsp[(1) - (2)].boolean); ;} break; case 192: - -/* Line 1455 of yacc.c */ -#line 1213 "../css/CSSGrammar.y" +#line 1211 "../css/CSSGrammar.y" { (yyval.boolean) = (yyvsp[(1) - (3)].boolean); ;} break; case 193: - -/* Line 1455 of yacc.c */ -#line 1216 "../css/CSSGrammar.y" +#line 1214 "../css/CSSGrammar.y" { (yyval.boolean) = false; ;} break; case 194: - -/* Line 1455 of yacc.c */ -#line 1219 "../css/CSSGrammar.y" +#line 1217 "../css/CSSGrammar.y" { (yyval.boolean) = false; ;} break; case 195: - -/* Line 1455 of yacc.c */ -#line 1222 "../css/CSSGrammar.y" +#line 1220 "../css/CSSGrammar.y" { (yyval.boolean) = false; ;} break; case 196: - -/* Line 1455 of yacc.c */ -#line 1225 "../css/CSSGrammar.y" +#line 1223 "../css/CSSGrammar.y" { (yyval.boolean) = (yyvsp[(1) - (4)].boolean); if ((yyvsp[(2) - (4)].boolean)) @@ -3662,27 +3419,21 @@ yyreduce: break; case 197: - -/* Line 1455 of yacc.c */ -#line 1230 "../css/CSSGrammar.y" +#line 1228 "../css/CSSGrammar.y" { (yyval.boolean) = (yyvsp[(1) - (4)].boolean); ;} break; case 198: - -/* Line 1455 of yacc.c */ -#line 1233 "../css/CSSGrammar.y" +#line 1231 "../css/CSSGrammar.y" { (yyval.boolean) = (yyvsp[(1) - (6)].boolean); ;} break; case 199: - -/* Line 1455 of yacc.c */ -#line 1239 "../css/CSSGrammar.y" +#line 1237 "../css/CSSGrammar.y" { (yyval.boolean) = false; CSSParser* p = static_cast(parser); @@ -3699,9 +3450,7 @@ yyreduce: break; case 200: - -/* Line 1455 of yacc.c */ -#line 1253 "../css/CSSGrammar.y" +#line 1251 "../css/CSSGrammar.y" { CSSParser* p = static_cast(parser); p->m_valueList = new CSSParserValueList; @@ -3716,18 +3465,14 @@ yyreduce: break; case 201: - -/* Line 1455 of yacc.c */ -#line 1265 "../css/CSSGrammar.y" +#line 1263 "../css/CSSGrammar.y" { (yyval.boolean) = false; ;} break; case 202: - -/* Line 1455 of yacc.c */ -#line 1269 "../css/CSSGrammar.y" +#line 1267 "../css/CSSGrammar.y" { /* The default movable type template has letter-spacing: .none; Handle this by looking for error tokens at the start of an expr, recover the expr and then treat as an error, cleaning @@ -3737,9 +3482,7 @@ yyreduce: break; case 203: - -/* Line 1455 of yacc.c */ -#line 1276 "../css/CSSGrammar.y" +#line 1274 "../css/CSSGrammar.y" { /* When we encounter something like p {color: red !important fail;} we should drop the declaration */ (yyval.boolean) = false; @@ -3747,9 +3490,7 @@ yyreduce: break; case 204: - -/* Line 1455 of yacc.c */ -#line 1281 "../css/CSSGrammar.y" +#line 1279 "../css/CSSGrammar.y" { /* Handle this case: div { text-align: center; !important } Just reduce away the stray !important. */ (yyval.boolean) = false; @@ -3757,9 +3498,7 @@ yyreduce: break; case 205: - -/* Line 1455 of yacc.c */ -#line 1286 "../css/CSSGrammar.y" +#line 1284 "../css/CSSGrammar.y" { /* div { font-family: } Just reduce away this property with no value. */ (yyval.boolean) = false; @@ -3767,9 +3506,7 @@ yyreduce: break; case 206: - -/* Line 1455 of yacc.c */ -#line 1291 "../css/CSSGrammar.y" +#line 1289 "../css/CSSGrammar.y" { /* if we come across rules with invalid values like this case: p { weight: *; }, just discard the rule */ (yyval.boolean) = false; @@ -3777,9 +3514,7 @@ yyreduce: break; case 207: - -/* Line 1455 of yacc.c */ -#line 1296 "../css/CSSGrammar.y" +#line 1294 "../css/CSSGrammar.y" { /* if we come across: div { color{;color:maroon} }, ignore everything within curly brackets */ (yyval.boolean) = false; @@ -3787,32 +3522,24 @@ yyreduce: break; case 208: - -/* Line 1455 of yacc.c */ -#line 1303 "../css/CSSGrammar.y" +#line 1301 "../css/CSSGrammar.y" { (yyval.integer) = cssPropertyID((yyvsp[(1) - (2)].string)); ;} break; case 209: - -/* Line 1455 of yacc.c */ -#line 1309 "../css/CSSGrammar.y" +#line 1307 "../css/CSSGrammar.y" { (yyval.boolean) = true; ;} break; case 210: - -/* Line 1455 of yacc.c */ -#line 1310 "../css/CSSGrammar.y" +#line 1308 "../css/CSSGrammar.y" { (yyval.boolean) = false; ;} break; case 211: - -/* Line 1455 of yacc.c */ -#line 1314 "../css/CSSGrammar.y" +#line 1312 "../css/CSSGrammar.y" { CSSParser* p = static_cast(parser); (yyval.valueList) = p->createFloatingValueList(); @@ -3821,9 +3548,7 @@ yyreduce: break; case 212: - -/* Line 1455 of yacc.c */ -#line 1319 "../css/CSSGrammar.y" +#line 1317 "../css/CSSGrammar.y" { CSSParser* p = static_cast(parser); (yyval.valueList) = (yyvsp[(1) - (3)].valueList); @@ -3841,66 +3566,50 @@ yyreduce: break; case 213: - -/* Line 1455 of yacc.c */ -#line 1333 "../css/CSSGrammar.y" +#line 1331 "../css/CSSGrammar.y" { (yyval.valueList) = 0; ;} break; case 214: - -/* Line 1455 of yacc.c */ -#line 1339 "../css/CSSGrammar.y" +#line 1337 "../css/CSSGrammar.y" { (yyval.character) = '/'; ;} break; case 215: - -/* Line 1455 of yacc.c */ -#line 1342 "../css/CSSGrammar.y" +#line 1340 "../css/CSSGrammar.y" { (yyval.character) = ','; ;} break; case 216: - -/* Line 1455 of yacc.c */ -#line 1345 "../css/CSSGrammar.y" +#line 1343 "../css/CSSGrammar.y" { (yyval.character) = 0; ;} break; case 217: - -/* Line 1455 of yacc.c */ -#line 1351 "../css/CSSGrammar.y" +#line 1349 "../css/CSSGrammar.y" { (yyval.value) = (yyvsp[(1) - (1)].value); ;} break; case 218: - -/* Line 1455 of yacc.c */ -#line 1352 "../css/CSSGrammar.y" +#line 1350 "../css/CSSGrammar.y" { (yyval.value) = (yyvsp[(2) - (2)].value); (yyval.value).fValue *= (yyvsp[(1) - (2)].integer); ;} break; case 219: - -/* Line 1455 of yacc.c */ -#line 1353 "../css/CSSGrammar.y" +#line 1351 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).string = (yyvsp[(1) - (2)].string); (yyval.value).unit = CSSPrimitiveValue::CSS_STRING; ;} break; case 220: - -/* Line 1455 of yacc.c */ -#line 1354 "../css/CSSGrammar.y" +#line 1352 "../css/CSSGrammar.y" { (yyval.value).id = cssValueKeywordID((yyvsp[(1) - (2)].string)); (yyval.value).unit = CSSPrimitiveValue::CSS_IDENT; @@ -3909,216 +3618,156 @@ yyreduce: break; case 221: - -/* Line 1455 of yacc.c */ -#line 1360 "../css/CSSGrammar.y" - { (yyval.value).id = 0; (yyval.value).string = (yyvsp[(1) - (2)].string); (yyval.value).unit = CSSPrimitiveValue::CSS_DIMENSION; ;} +#line 1358 "../css/CSSGrammar.y" + { (yyval.value).id = 0; (yyval.value).string = (yyvsp[(1) - (2)].string); (yyval.value).unit = CSSPrimitiveValue::CSS_DIMENSION ;} break; case 222: - -/* Line 1455 of yacc.c */ -#line 1361 "../css/CSSGrammar.y" - { (yyval.value).id = 0; (yyval.value).string = (yyvsp[(2) - (3)].string); (yyval.value).unit = CSSPrimitiveValue::CSS_DIMENSION; ;} +#line 1359 "../css/CSSGrammar.y" + { (yyval.value).id = 0; (yyval.value).string = (yyvsp[(2) - (3)].string); (yyval.value).unit = CSSPrimitiveValue::CSS_DIMENSION ;} break; case 223: - -/* Line 1455 of yacc.c */ -#line 1362 "../css/CSSGrammar.y" +#line 1360 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).string = (yyvsp[(1) - (2)].string); (yyval.value).unit = CSSPrimitiveValue::CSS_URI; ;} break; case 224: - -/* Line 1455 of yacc.c */ -#line 1363 "../css/CSSGrammar.y" - { (yyval.value).id = 0; (yyval.value).string = (yyvsp[(1) - (2)].string); (yyval.value).unit = CSSPrimitiveValue::CSS_UNICODE_RANGE; ;} +#line 1361 "../css/CSSGrammar.y" + { (yyval.value).id = 0; (yyval.value).string = (yyvsp[(1) - (2)].string); (yyval.value).unit = CSSPrimitiveValue::CSS_UNICODE_RANGE ;} break; case 225: - -/* Line 1455 of yacc.c */ -#line 1364 "../css/CSSGrammar.y" +#line 1362 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).string = (yyvsp[(1) - (1)].string); (yyval.value).unit = CSSPrimitiveValue::CSS_PARSER_HEXCOLOR; ;} break; case 226: - -/* Line 1455 of yacc.c */ -#line 1365 "../css/CSSGrammar.y" +#line 1363 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).string = CSSParserString(); (yyval.value).unit = CSSPrimitiveValue::CSS_PARSER_HEXCOLOR; ;} break; case 227: - -/* Line 1455 of yacc.c */ -#line 1367 "../css/CSSGrammar.y" +#line 1365 "../css/CSSGrammar.y" { (yyval.value) = (yyvsp[(1) - (1)].value); ;} break; case 228: - -/* Line 1455 of yacc.c */ -#line 1370 "../css/CSSGrammar.y" +#line 1368 "../css/CSSGrammar.y" { (yyval.value) = (yyvsp[(1) - (2)].value); ;} break; case 229: - -/* Line 1455 of yacc.c */ -#line 1373 "../css/CSSGrammar.y" +#line 1371 "../css/CSSGrammar.y" {;} break; case 230: - -/* Line 1455 of yacc.c */ -#line 1377 "../css/CSSGrammar.y" +#line 1375 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).isInt = true; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_NUMBER; ;} break; case 231: - -/* Line 1455 of yacc.c */ -#line 1378 "../css/CSSGrammar.y" +#line 1376 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).isInt = false; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_NUMBER; ;} break; case 232: - -/* Line 1455 of yacc.c */ -#line 1379 "../css/CSSGrammar.y" +#line 1377 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_PERCENTAGE; ;} break; case 233: - -/* Line 1455 of yacc.c */ -#line 1380 "../css/CSSGrammar.y" +#line 1378 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_PX; ;} break; case 234: - -/* Line 1455 of yacc.c */ -#line 1381 "../css/CSSGrammar.y" +#line 1379 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_CM; ;} break; case 235: - -/* Line 1455 of yacc.c */ -#line 1382 "../css/CSSGrammar.y" +#line 1380 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_MM; ;} break; case 236: - -/* Line 1455 of yacc.c */ -#line 1383 "../css/CSSGrammar.y" +#line 1381 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_IN; ;} break; case 237: - -/* Line 1455 of yacc.c */ -#line 1384 "../css/CSSGrammar.y" +#line 1382 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_PT; ;} break; case 238: - -/* Line 1455 of yacc.c */ -#line 1385 "../css/CSSGrammar.y" +#line 1383 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_PC; ;} break; case 239: - -/* Line 1455 of yacc.c */ -#line 1386 "../css/CSSGrammar.y" +#line 1384 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_DEG; ;} break; case 240: - -/* Line 1455 of yacc.c */ -#line 1387 "../css/CSSGrammar.y" +#line 1385 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_RAD; ;} break; case 241: - -/* Line 1455 of yacc.c */ -#line 1388 "../css/CSSGrammar.y" +#line 1386 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_GRAD; ;} break; case 242: - -/* Line 1455 of yacc.c */ -#line 1389 "../css/CSSGrammar.y" +#line 1387 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_TURN; ;} break; case 243: - -/* Line 1455 of yacc.c */ -#line 1390 "../css/CSSGrammar.y" +#line 1388 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_MS; ;} break; case 244: - -/* Line 1455 of yacc.c */ -#line 1391 "../css/CSSGrammar.y" +#line 1389 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_S; ;} break; case 245: - -/* Line 1455 of yacc.c */ -#line 1392 "../css/CSSGrammar.y" +#line 1390 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_HZ; ;} break; case 246: - -/* Line 1455 of yacc.c */ -#line 1393 "../css/CSSGrammar.y" +#line 1391 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_KHZ; ;} break; case 247: - -/* Line 1455 of yacc.c */ -#line 1394 "../css/CSSGrammar.y" +#line 1392 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_EMS; ;} break; case 248: - -/* Line 1455 of yacc.c */ -#line 1395 "../css/CSSGrammar.y" +#line 1393 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSParserValue::Q_EMS; ;} break; case 249: - -/* Line 1455 of yacc.c */ -#line 1396 "../css/CSSGrammar.y" +#line 1394 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_EXS; ;} break; case 250: - -/* Line 1455 of yacc.c */ -#line 1400 "../css/CSSGrammar.y" +#line 1398 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).string = (yyvsp[(1) - (1)].string); @@ -4127,9 +3776,7 @@ yyreduce: break; case 251: - -/* Line 1455 of yacc.c */ -#line 1408 "../css/CSSGrammar.y" +#line 1406 "../css/CSSGrammar.y" { CSSParser* p = static_cast(parser); CSSParserFunction* f = p->createFloatingFunction(); @@ -4142,9 +3789,7 @@ yyreduce: break; case 252: - -/* Line 1455 of yacc.c */ -#line 1417 "../css/CSSGrammar.y" +#line 1415 "../css/CSSGrammar.y" { CSSParser* p = static_cast(parser); CSSParserFunction* f = p->createFloatingFunction(); @@ -4157,86 +3802,67 @@ yyreduce: break; case 253: - -/* Line 1455 of yacc.c */ -#line 1433 "../css/CSSGrammar.y" +#line 1431 "../css/CSSGrammar.y" { (yyval.string) = (yyvsp[(1) - (2)].string); ;} break; case 254: - -/* Line 1455 of yacc.c */ -#line 1434 "../css/CSSGrammar.y" +#line 1432 "../css/CSSGrammar.y" { (yyval.string) = (yyvsp[(1) - (2)].string); ;} break; case 255: - -/* Line 1455 of yacc.c */ -#line 1441 "../css/CSSGrammar.y" +#line 1439 "../css/CSSGrammar.y" { (yyval.rule) = 0; ;} break; case 256: - -/* Line 1455 of yacc.c */ -#line 1444 "../css/CSSGrammar.y" +#line 1442 "../css/CSSGrammar.y" { (yyval.rule) = 0; ;} break; case 257: - -/* Line 1455 of yacc.c */ -#line 1450 "../css/CSSGrammar.y" +#line 1448 "../css/CSSGrammar.y" { (yyval.rule) = 0; ;} break; case 258: - -/* Line 1455 of yacc.c */ -#line 1453 "../css/CSSGrammar.y" +#line 1451 "../css/CSSGrammar.y" { (yyval.rule) = 0; ;} break; case 261: - -/* Line 1455 of yacc.c */ -#line 1464 "../css/CSSGrammar.y" +#line 1462 "../css/CSSGrammar.y" { (yyval.rule) = 0; ;} break; case 262: - -/* Line 1455 of yacc.c */ -#line 1470 "../css/CSSGrammar.y" +#line 1468 "../css/CSSGrammar.y" { (yyval.rule) = 0; ;} break; case 263: - -/* Line 1455 of yacc.c */ -#line 1476 "../css/CSSGrammar.y" +#line 1474 "../css/CSSGrammar.y" { (yyval.rule) = 0; ;} break; - -/* Line 1455 of yacc.c */ -#line 4240 "WebCore/tmp/../generated/CSSGrammar.tab.c" +/* Line 1267 of yacc.c. */ +#line 3866 "WebCore/tmp/../generated/CSSGrammar.tab.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -4247,6 +3873,7 @@ yyreduce: *++yyvsp = yyval; + /* Now `shift' the result of the reduction. Determine what state that goes to, based on the state we popped back to and the rule number reduced by. */ @@ -4311,7 +3938,7 @@ yyerrlab: if (yyerrstatus == 3) { - /* If just tried and failed to reuse lookahead token after an + /* If just tried and failed to reuse look-ahead token after an error, discard it. */ if (yychar <= YYEOF) @@ -4328,7 +3955,7 @@ yyerrlab: } } - /* Else will try to reuse lookahead token after shifting the error + /* Else will try to reuse look-ahead token after shifting the error token. */ goto yyerrlab1; @@ -4385,6 +4012,9 @@ yyerrlab1: YY_STACK_PRINT (yyss, yyssp); } + if (yyn == YYFINAL) + YYACCEPT; + *++yyvsp = yylval; @@ -4409,7 +4039,7 @@ yyabortlab: yyresult = 1; goto yyreturn; -#if !defined(yyoverflow) || YYERROR_VERBOSE +#ifndef yyoverflow /*-------------------------------------------------. | yyexhaustedlab -- memory exhaustion comes here. | `-------------------------------------------------*/ @@ -4420,7 +4050,7 @@ yyexhaustedlab: #endif yyreturn: - if (yychar != YYEMPTY) + if (yychar != YYEOF && yychar != YYEMPTY) yydestruct ("Cleanup: discarding lookahead", yytoken, &yylval); /* Do not reclaim the symbols of the rule which action triggered @@ -4446,8 +4076,6 @@ yyreturn: } - -/* Line 1675 of yacc.c */ -#line 1503 "../css/CSSGrammar.y" +#line 1501 "../css/CSSGrammar.y" diff --git a/src/3rdparty/webkit/WebCore/generated/CSSGrammar.h b/src/3rdparty/webkit/WebCore/generated/CSSGrammar.h index 84ad511..1b60c68 100644 --- a/src/3rdparty/webkit/WebCore/generated/CSSGrammar.h +++ b/src/3rdparty/webkit/WebCore/generated/CSSGrammar.h @@ -1,25 +1,26 @@ #ifndef CSSGRAMMAR_H #define CSSGRAMMAR_H - -/* A Bison parser, made by GNU Bison 2.4.1. */ +/* A Bison parser, made by GNU Bison 2.3. */ /* Skeleton interface for Bison's Yacc-like parsers in C - - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 + + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - - This program is free software: you can redistribute it and/or modify + + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - + the Free Software Foundation; either version 2, or (at your option) + any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ /* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work @@ -30,11 +31,10 @@ special exception, which will cause the skeleton and the resulting Bison output files to be licensed under the GNU General Public License without this special exception. - + This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ - /* Tokens. */ #ifndef YYTOKENTYPE # define YYTOKENTYPE @@ -42,80 +42,140 @@ know about them. */ enum yytokentype { TOKEN_EOF = 0, - LOWEST_PREC = 258, - UNIMPORTANT_TOK = 259, - WHITESPACE = 260, - SGML_CD = 261, - INCLUDES = 262, - DASHMATCH = 263, - BEGINSWITH = 264, - ENDSWITH = 265, - CONTAINS = 266, - STRING = 267, - IDENT = 268, - NTH = 269, - HEX = 270, - IDSEL = 271, - IMPORT_SYM = 272, - PAGE_SYM = 273, - MEDIA_SYM = 274, - FONT_FACE_SYM = 275, - CHARSET_SYM = 276, - NAMESPACE_SYM = 277, - WEBKIT_RULE_SYM = 278, - WEBKIT_DECLS_SYM = 279, - WEBKIT_KEYFRAME_RULE_SYM = 280, - WEBKIT_KEYFRAMES_SYM = 281, - WEBKIT_VALUE_SYM = 282, - WEBKIT_MEDIAQUERY_SYM = 283, - WEBKIT_SELECTOR_SYM = 284, - WEBKIT_VARIABLES_SYM = 285, - WEBKIT_DEFINE_SYM = 286, - VARIABLES_FOR = 287, - WEBKIT_VARIABLES_DECLS_SYM = 288, - ATKEYWORD = 289, - IMPORTANT_SYM = 290, - MEDIA_ONLY = 291, - MEDIA_NOT = 292, - MEDIA_AND = 293, - QEMS = 294, - EMS = 295, - EXS = 296, - PXS = 297, - CMS = 298, - MMS = 299, - INS = 300, - PTS = 301, - PCS = 302, - DEGS = 303, - RADS = 304, - GRADS = 305, - TURNS = 306, - MSECS = 307, - SECS = 308, - HERZ = 309, - KHERZ = 310, - DIMEN = 311, - PERCENTAGE = 312, - FLOATTOKEN = 313, - INTEGER = 314, - URI = 315, - FUNCTION = 316, - NOTFUNCTION = 317, - UNICODERANGE = 318, - VARCALL = 319 + UNIMPORTANT_TOK = 258, + WHITESPACE = 259, + SGML_CD = 260, + INCLUDES = 261, + DASHMATCH = 262, + BEGINSWITH = 263, + ENDSWITH = 264, + CONTAINS = 265, + STRING = 266, + IDENT = 267, + NTH = 268, + HEX = 269, + IDSEL = 270, + IMPORT_SYM = 271, + PAGE_SYM = 272, + MEDIA_SYM = 273, + FONT_FACE_SYM = 274, + CHARSET_SYM = 275, + NAMESPACE_SYM = 276, + WEBKIT_RULE_SYM = 277, + WEBKIT_DECLS_SYM = 278, + WEBKIT_KEYFRAME_RULE_SYM = 279, + WEBKIT_KEYFRAMES_SYM = 280, + WEBKIT_VALUE_SYM = 281, + WEBKIT_MEDIAQUERY_SYM = 282, + WEBKIT_SELECTOR_SYM = 283, + WEBKIT_VARIABLES_SYM = 284, + WEBKIT_DEFINE_SYM = 285, + VARIABLES_FOR = 286, + WEBKIT_VARIABLES_DECLS_SYM = 287, + ATKEYWORD = 288, + IMPORTANT_SYM = 289, + MEDIA_ONLY = 290, + MEDIA_NOT = 291, + MEDIA_AND = 292, + QEMS = 293, + EMS = 294, + EXS = 295, + PXS = 296, + CMS = 297, + MMS = 298, + INS = 299, + PTS = 300, + PCS = 301, + DEGS = 302, + RADS = 303, + GRADS = 304, + TURNS = 305, + MSECS = 306, + SECS = 307, + HERZ = 308, + KHERZ = 309, + DIMEN = 310, + PERCENTAGE = 311, + FLOATTOKEN = 312, + INTEGER = 313, + URI = 314, + FUNCTION = 315, + NOTFUNCTION = 316, + UNICODERANGE = 317, + VARCALL = 318 }; #endif +/* Tokens. */ +#define TOKEN_EOF 0 +#define UNIMPORTANT_TOK 258 +#define WHITESPACE 259 +#define SGML_CD 260 +#define INCLUDES 261 +#define DASHMATCH 262 +#define BEGINSWITH 263 +#define ENDSWITH 264 +#define CONTAINS 265 +#define STRING 266 +#define IDENT 267 +#define NTH 268 +#define HEX 269 +#define IDSEL 270 +#define IMPORT_SYM 271 +#define PAGE_SYM 272 +#define MEDIA_SYM 273 +#define FONT_FACE_SYM 274 +#define CHARSET_SYM 275 +#define NAMESPACE_SYM 276 +#define WEBKIT_RULE_SYM 277 +#define WEBKIT_DECLS_SYM 278 +#define WEBKIT_KEYFRAME_RULE_SYM 279 +#define WEBKIT_KEYFRAMES_SYM 280 +#define WEBKIT_VALUE_SYM 281 +#define WEBKIT_MEDIAQUERY_SYM 282 +#define WEBKIT_SELECTOR_SYM 283 +#define WEBKIT_VARIABLES_SYM 284 +#define WEBKIT_DEFINE_SYM 285 +#define VARIABLES_FOR 286 +#define WEBKIT_VARIABLES_DECLS_SYM 287 +#define ATKEYWORD 288 +#define IMPORTANT_SYM 289 +#define MEDIA_ONLY 290 +#define MEDIA_NOT 291 +#define MEDIA_AND 292 +#define QEMS 293 +#define EMS 294 +#define EXS 295 +#define PXS 296 +#define CMS 297 +#define MMS 298 +#define INS 299 +#define PTS 300 +#define PCS 301 +#define DEGS 302 +#define RADS 303 +#define GRADS 304 +#define TURNS 305 +#define MSECS 306 +#define SECS 307 +#define HERZ 308 +#define KHERZ 309 +#define DIMEN 310 +#define PERCENTAGE 311 +#define FLOATTOKEN 312 +#define INTEGER 313 +#define URI 314 +#define FUNCTION 315 +#define NOTFUNCTION 316 +#define UNICODERANGE 317 +#define VARCALL 318 + #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -{ - -/* Line 1676 of yacc.c */ #line 57 "../css/CSSGrammar.y" - +{ bool boolean; char character; int integer; @@ -137,18 +197,15 @@ typedef union YYSTYPE WebKitCSSKeyframeRule* keyframeRule; WebKitCSSKeyframesRule* keyframesRule; float val; - - - -/* Line 1676 of yacc.c */ -#line 143 "WebCore/tmp/../generated/CSSGrammar.tab.h" -} YYSTYPE; -# define YYSTYPE_IS_TRIVIAL 1 +} +/* Line 1489 of yacc.c. */ +#line 201 "WebCore/tmp/../generated/CSSGrammar.tab.h" + YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 +# define YYSTYPE_IS_TRIVIAL 1 #endif - #endif -- cgit v0.12 From dcbba3c0b603ad3b38c0d3ed128b230857cb38be Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Wed, 30 Sep 2009 14:37:29 +0200 Subject: qdoc: Modified the support for \sincelist. It now finds a lot more \since 4.6 stuff. --- doc/src/qt4-intro.qdoc | 17 ++---- tools/qdoc3/htmlgenerator.cpp | 132 ++++++++++++++++++++++++++++++++++-------- tools/qdoc3/htmlgenerator.h | 8 ++- tools/qdoc3/node.cpp | 17 ++++++ tools/qdoc3/node.h | 9 ++- 5 files changed, 141 insertions(+), 42 deletions(-) diff --git a/doc/src/qt4-intro.qdoc b/doc/src/qt4-intro.qdoc index 03d9b29..eafae14 100644 --- a/doc/src/qt4-intro.qdoc +++ b/doc/src/qt4-intro.qdoc @@ -605,21 +605,12 @@ functions to query audio devices for which audio formats they support. - \section1 Classes and Functions Introduced in 4.6 + \section1 Classes, functions, and other items introduced in 4.6 - Links to class, function, and macro documentation. + Links to classes, function, and other items that were added in + 4.6. - \section2 Classes - - Classes introduced in Qt 4.6. - - \sincelist classes - - \section2 Functions & Macros - - Fuctions and macros introduced in Qt 4.6. - - \sincelist functions + \sincelist 4.6 */ diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index 5406017..2757cd8 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -330,7 +330,65 @@ void HtmlGenerator::generateTree(const Tree *tree, CodeMarker *marker) #ifdef ZZZ_QDOC_QML findAllQmlClasses(tree->root()); #endif - findAllSince(tree->root(),tree->version()); + findAllSince(tree->root()); + +#if 0 + if (!sinceVersions.isEmpty()) { + SinceVersionMap::const_iterator v = sinceVersions.constEnd(); + do { + --v; + qDebug() << "SINCE:" << v.key(); + if (!v.value().isEmpty()) { + QString type; + SinceNodeMultiMap::const_iterator n = v.value().constBegin(); + while (n != v.value().constEnd()) { + switch (n.value()->type()) { + case Node::Namespace: + type = "namespace"; + break; + case Node::Class: + type = "class"; + break; + case Node::Fake: + type = "fake"; + break; + case Node::Enum: + type = "enum"; + break; + case Node::Typedef: + type = "typedef"; + break; + case Node::Function: + type = "function"; + break; + case Node::Property: + type = "property"; + break; + case Node::Variable: + type = "variable"; + break; + case Node::Target: + type = "target"; + break; + case Node::QmlProperty: + type = "QML property"; + break; + case Node::QmlSignal: + type = "QML signal"; + break; + case Node::QmlMethod: + type = "QML method"; + break; + default: + type = "No type"; + } + qDebug() << " " << type << n.key(); + ++n; + } + } + } while (v != sinceVersions.constBegin()); + } +#endif PageGenerator::generateTree(tree, marker); @@ -655,21 +713,32 @@ int HtmlGenerator::generateAtom(const Atom *atom, break; case Atom::SinceList: { - QList values; - if (atom->string() == "classes") { - values = sinceClasses.values(); - } - else if (atom->string() == "functions") { - values = sinceFunctions.values(); - } - if (!values.isEmpty()) { - QMap nodeMap; - for (int i=0; inameForLists(),n); + QList nodes; + SinceVersionMap::const_iterator v; + v = sinceVersions.find(atom->string()); + if ((v != sinceVersions.constEnd()) && !v.value().isEmpty()) { + for (int i=0; !Node::typeName(i).isEmpty(); i++) { + Node::Type t = (Node::Type) i; + SinceNodeMultiMap::const_iterator n=v.value().constBegin(); + QMultiMap nodeMap; + while (n != v.value().constEnd()) { + const Node* node = n.value(); + if (node->type() == t) + nodeMap.insert(node->nameForLists(),node); + ++n; + } + if (!nodeMap.isEmpty()) { + out() << "

" + << Node::typeName(i) + << " new in Qt " + << atom->string() + << "

"; + generateAnnotatedList(relative, marker, nodeMap); + nodeMap.clear(); + } } - generateAnnotatedList(relative, marker, nodeMap); } + } break; case Atom::Image: @@ -3517,22 +3586,21 @@ void HtmlGenerator::findAllClasses(const InnerNode *node) /*! For generating the "Since x.y" page. */ -void HtmlGenerator::findAllSince(const InnerNode *node, QString version) +void HtmlGenerator::findAllSince(const InnerNode *node) { - const QRegExp versionSeparator("[\\-\\.]"); - const int minorIndex = version.indexOf(versionSeparator); - const int patchIndex = version.indexOf(versionSeparator, minorIndex+1); - version = version.left(patchIndex); - NodeList::const_iterator c = node->childNodes().constBegin(); while (c != node->childNodes().constEnd()) { - if (((*c)->access() != Node::Private) && ((*c)->since() == version)) { + QString sinceVersion = (*c)->since(); + if (((*c)->access() != Node::Private) && !sinceVersion.isEmpty()) { + SinceVersionMap::iterator vmap = sinceVersions.find(sinceVersion); + if (vmap == sinceVersions.end()) + vmap = sinceVersions.insert(sinceVersion,SinceNodeMultiMap()); if ((*c)->type() == Node::Function) { FunctionNode *func = static_cast(*c); if ((func->status() > Node::Obsolete) && (func->metaness() != FunctionNode::Ctor) && (func->metaness() != FunctionNode::Dtor)) { - sinceFunctions.insert(func->name(), func); + vmap.value().insert(func->name(),(*c)); } } else if ((*c)->url().isEmpty()) { @@ -3542,17 +3610,33 @@ void HtmlGenerator::findAllSince(const InnerNode *node, QString version) (*c)->parent()->type() == Node::Namespace && !(*c)->parent()->name().isEmpty()) className = (*c)->parent()->name()+"::"+className; - sinceClasses.insert(className, *c); + vmap.value().insert(className,(*c)); } } + else { + QString name = (*c)->name(); + if ((*c)->parent() && + (*c)->parent()->type() == Node::Namespace && + !(*c)->parent()->name().isEmpty()) + name = (*c)->parent()->name()+"::"+name; + vmap.value().insert(name,(*c)); + qDebug() << "GOT HEAH" << name; + } if ((*c)->isInnerNode()) { - findAllSince(static_cast(*c),version); + findAllSince(static_cast(*c)); } } ++c; } } +#if 0 + const QRegExp versionSeparator("[\\-\\.]"); + const int minorIndex = version.indexOf(versionSeparator); + const int patchIndex = version.indexOf(versionSeparator, minorIndex+1); + version = version.left(patchIndex); +#endif + void HtmlGenerator::findAllFunctions(const InnerNode *node) { NodeList::ConstIterator c = node->childNodes().begin(); diff --git a/tools/qdoc3/htmlgenerator.h b/tools/qdoc3/htmlgenerator.h index 24e2986..3f6e564 100644 --- a/tools/qdoc3/htmlgenerator.h +++ b/tools/qdoc3/htmlgenerator.h @@ -67,6 +67,9 @@ struct NavigationBar }; #endif +typedef QMultiMap SinceNodeMultiMap; +typedef QMap SinceVersionMap; + class HelpProjectWriter; class HtmlGenerator : public PageGenerator @@ -216,7 +219,7 @@ class HtmlGenerator : public PageGenerator #ifdef ZZZ_QDOC_QML void findAllQmlClasses(const InnerNode *node); #endif - void findAllSince(const InnerNode *node, QString version); + void findAllSince(const InnerNode *node); static int hOffset(const Node *node); static bool isThreeColumnEnumValueTable(const Atom *atom); virtual QString getLink(const Atom *atom, @@ -286,8 +289,7 @@ class HtmlGenerator : public PageGenerator #endif QMap > funcIndex; QMap legaleseTexts; - QMap sinceClasses; - QMap sinceFunctions; + SinceVersionMap sinceVersions; }; #define HTMLGENERATOR_ADDRESS "address" diff --git a/tools/qdoc3/node.cpp b/tools/qdoc3/node.cpp index b44ede0..d547d20 100644 --- a/tools/qdoc3/node.cpp +++ b/tools/qdoc3/node.cpp @@ -48,6 +48,23 @@ QT_BEGIN_NAMESPACE +QString Node::typeNames[] = + { + "Namespaces", + "Classes", + "Fake", + "Enums", + "Typedefs", + "Functions and Macros", + "Properties", + "Variables", + "Targets", + "Qml Properties", + "Qml Signals", + "Qml Methods", + "" + }; + /*! \class Node \brief A node in a Tree. diff --git a/tools/qdoc3/node.h b/tools/qdoc3/node.h index fdef920..09f38d2 100644 --- a/tools/qdoc3/node.h +++ b/tools/qdoc3/node.h @@ -76,9 +76,11 @@ class Node Target, QmlProperty, QmlSignal, - QmlMethod + QmlMethod, + LastType #else - Target + Target, + LastType #endif }; @@ -173,10 +175,13 @@ class Node virtual QString fileBase() const; + static QString typeName(int i) { return typeNames[i]; } + protected: Node(Type type, InnerNode *parent, const QString& name); private: + static QString typeNames[]; #ifdef Q_WS_WIN Type typ; Access acc; -- cgit v0.12 From 59623e45ee31892c9ef210f8d7e396ccb0fe31a5 Mon Sep 17 00:00:00 2001 From: Peter Hartmann Date: Wed, 30 Sep 2009 14:38:03 +0200 Subject: Google Chat example: state that SSL is required MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit bail out if SSL is not supported; before it only showed "service unavailable", which was somewhat confusing. Reviewed-by: Tor Arne Vestbø --- examples/webkit/googlechat/main.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/examples/webkit/googlechat/main.cpp b/examples/webkit/googlechat/main.cpp index fd08114..9e235a9 100644 --- a/examples/webkit/googlechat/main.cpp +++ b/examples/webkit/googlechat/main.cpp @@ -43,10 +43,25 @@ #include #include "googlechat.h" +#ifndef QT_NO_OPENSSL +#include +#endif + int main(int argc, char * argv[]) { QApplication app(argc, argv); +#ifndef QT_NO_OPENSSL + if (!QSslSocket::supportsSsl()) { +#endif + QMessageBox::information(0, "Google Talk client", + "Your system does not support SSL, " + "which is required to run this example."); + return -1; +#ifndef QT_NO_OPENSSL + } +#endif + QNetworkProxyFactory::setUseSystemConfigurationEnabled(true); GoogleChat *chat = new GoogleChat; -- cgit v0.12