Regenerate TDEHTML flex/bison/gperf generated files

pull/16/head
Timothy Pearson 12 years ago
parent 43636e0371
commit 1b57c46705

@ -308,9 +308,10 @@ bool CSSStyleDeclarationImpl::setProperty(int id, const DOMString &value, bool i
CSSParser parser( strictParsing ); CSSParser parser( strictParsing );
bool success = parser.parseValue( this, id, value, important, nonCSSHint ); bool success = parser.parseValue( this, id, value, important, nonCSSHint );
if(!success) if(!success) {
kdDebug( 6080 ) << "CSSStyleDeclarationImpl::setProperty invalid property: [" << getPropertyName(id).string() kdDebug( 6080 ) << "CSSStyleDeclarationImpl::setProperty invalid property: [" << getPropertyName(id).string()
<< "] value: [" << value.string() << "]"<< endl; << "] value: [" << value.string() << "]"<< endl;
}
else else
setChanged(); setChanged();
return success; return success;

File diff suppressed because it is too large Load Diff

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
# This file is part of the KDE libraries # This file is part of the KDE libraries
# #
# Copyright (C) 1999 Waldo Bastian (bastian@kde.org) # Copyright (C) 1999 Waldo Bastian (bastian@kde.org)

File diff suppressed because it is too large Load Diff

@ -1,28 +1,35 @@
/* A Bison parser, made by GNU Bison 1.875d. */ /* A Bison parser, made by GNU Bison 2.5. */
/* Bison interface for Yacc-like parsers in C
Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
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.
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 <http://www.gnu.org/licenses/>. */
/* As a special exception, you may create a larger work that contains
part or all of the Bison parser skeleton and distribute that work
under terms of your choice, so long as that work isn't itself a
parser generator using the skeleton or a modified version thereof
as a parser skeleton. Alternatively, if you modify or redistribute
the parser skeleton itself, you may (at your option) remove this
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. */
/* Skeleton parser for Yacc-like parsing with Bison,
Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
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 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 Library General Public License
along with this library; see the file COPYING.LIB. If not, write to
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
/* As a special exception, when this file is copied by Bison into a
Bison output file, you may use that output file without restriction.
This special exception was added by the Free Software Foundation
in version 1.24 of Bison. */
/* Tokens. */ /* Tokens. */
#ifndef YYTOKENTYPE #ifndef YYTOKENTYPE
@ -78,59 +85,14 @@
UNICODERANGE = 303 UNICODERANGE = 303
}; };
#endif #endif
#define UNIMPORTANT_TOK 258
#define S 259
#define SGML_CD 260
#define INCLUDES 261 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
#define DASHMATCH 262 typedef union YYSTYPE
#define BEGINSWITH 263 {
#define ENDSWITH 264
#define CONTAINS 265
#define STRING 266
#define IDENT 267
#define NTH 268
#define HASH 269
#define IMPORT_SYM 270
#define PAGE_SYM 271
#define MEDIA_SYM 272
#define FONT_FACE_SYM 273
#define CHARSET_SYM 274
#define NAMESPACE_SYM 275
#define TDEHTML_RULE_SYM 276
#define TDEHTML_DECLS_SYM 277
#define TDEHTML_VALUE_SYM 278
#define IMPORTANT_SYM 279
#define QEMS 280
#define EMS 281
#define EXS 282
#define PXS 283
#define CMS 284
#define MMS 285
#define INS 286
#define PTS 287
#define PCS 288
#define DEGS 289
#define RADS 290
#define GRADS 291
#define MSECS 292
#define SECS 293
#define HERZ 294
#define KHERZ 295
#define DIMEN 296
#define PERCENTAGE 297
#define FLOAT 298
#define INTEGER 299
#define URI 300
#define FUNCTION 301
#define NOTFUNCTION 302
#define UNICODERANGE 303
#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
typedef union YYSTYPE {
CSSRuleImpl *rule; CSSRuleImpl *rule;
CSSSelector *selector; CSSSelector *selector;
TQPtrList<CSSSelector> *selectorList; TQPtrList<CSSSelector> *selectorList;
@ -150,15 +112,15 @@ typedef union YYSTYPE {
char tok; char tok;
Value value; Value value;
ValueList *valueList; ValueList *valueList;
} YYSTYPE;
/* Line 1285 of yacc.c. */
} YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1 # define YYSTYPE_IS_DECLARED 1
# define YYSTYPE_IS_TRIVIAL 1
#endif #endif

@ -86,7 +86,7 @@ static inline int getValueID(const char *tagStr, int len)
%union { %union {
CSSRuleImpl *rule; CSSRuleImpl *rule;
CSSSelector *selector; CSSSelector *selector;
QPtrList<CSSSelector> *selectorList; TQPtrList<CSSSelector> *selectorList;
bool ok; bool ok;
MediaListImpl *mediaList; MediaListImpl *mediaList;
CSSMediaRuleImpl *mediaRule; CSSMediaRuleImpl *mediaRule;
@ -525,7 +525,7 @@ ruleset:
selector_list: selector_list:
selector %prec UNIMPORTANT_TOK { selector %prec UNIMPORTANT_TOK {
if ( $1 ) { if ( $1 ) {
$$ = new QPtrList<CSSSelector>; $$ = new TQPtrList<CSSSelector>;
$$->setAutoDelete( true ); $$->setAutoDelete( true );
#ifdef CSS_DEBUG #ifdef CSS_DEBUG
kdDebug( 6080 ) << " got simple selector:" << endl; kdDebug( 6080 ) << " got simple selector:" << endl;

File diff suppressed because it is too large Load Diff

@ -436,8 +436,9 @@ void HTMLElementImpl::addHTMLColor( int id, const DOMString &c )
color.sprintf("#%02x%02x%02x", colors[0], colors[1], colors[2] ); color.sprintf("#%02x%02x%02x", colors[0], colors[1], colors[2] );
// tqDebug( "trying to add fixed color string '%s'", color.latin1() ); // tqDebug( "trying to add fixed color string '%s'", color.latin1() );
if ( m_styleDecls->setProperty(id, DOMString(color), false, true) ) if ( m_styleDecls->setProperty(id, DOMString(color), false, true) ) {
return; return;
}
} }
} }
m_styleDecls->setProperty(id, CSS_VAL_BLACK, false, true); m_styleDecls->setProperty(id, CSS_VAL_BLACK, false, true);

@ -877,7 +877,7 @@ bool RenderBlock::clearLineOfPageBreaks(InlineFlowBox* lineBox)
lineBox->verticallyAlignBoxes(m_height); lineBox->verticallyAlignBoxes(m_height);
} }
#ifdef PAGE_DEBUG #ifdef PAGE_DEBUG
kdDebug(6040) << "Cleared line " << lineBox->yPos() - oldYPos << "px" << endl; kdDebug(6040) << "Cleared line " << lineBox->yPos() << "px" << endl;
#endif #endif
setContainsPageBreak(true); setContainsPageBreak(true);
} }
@ -1254,8 +1254,8 @@ void RenderBlock::bidiReorderLine(const BidiIterator &start, const BidiIterator
} }
#if BIDI_DEBUG > 0 #if BIDI_DEBUG > 0
kdDebug(6041) << "reached end of line current=" << current.obj << "/" << current.pos // kdDebug(6041) << "reached end of line current=" << current.obj << "/" << current.pos
<< ", eor=" << eor.obj << "/" << eor.pos << endl; // << ", eor=" << eor.obj << "/" << eor.pos << endl;
#endif #endif
if ( !emptyRun && bidi.sor != bidi.current ) { if ( !emptyRun && bidi.sor != bidi.current ) {
bidi.eor = bidi.last; bidi.eor = bidi.last;
@ -1286,10 +1286,10 @@ void RenderBlock::bidiReorderLine(const BidiIterator &start, const BidiIterator
#if BIDI_DEBUG > 0 #if BIDI_DEBUG > 0
kdDebug(6041) << "lineLow = " << (uint)levelLow << ", lineHigh = " << (uint)levelHigh << endl; kdDebug(6041) << "lineLow = " << (uint)levelLow << ", lineHigh = " << (uint)levelHigh << endl;
kdDebug(6041) << "logical order is:" << endl; kdDebug(6041) << "logical order is:" << endl;
TQPtrListIterator<BidiRun> it2(runs); // TQPtrListIterator<BidiRun> it2(runs);
BidiRun *r2; // BidiRun *r2;
for ( ; (r2 = it2.current()); ++it2 ) // for ( ; (r2 = it2.current()); ++it2 )
kdDebug(6041) << " " << r2 << " start=" << r2->start << " stop=" << r2->stop << " level=" << (uint)r2->level << endl; // kdDebug(6041) << " " << r2 << " start=" << r2->start << " stop=" << r2->stop << " level=" << (uint)r2->level << endl;
#endif #endif
int count = sBidiRunCount - 1; int count = sBidiRunCount - 1;
@ -1318,8 +1318,8 @@ void RenderBlock::bidiReorderLine(const BidiIterator &start, const BidiIterator
#if BIDI_DEBUG > 0 #if BIDI_DEBUG > 0
kdDebug(6041) << "visual order is:" << endl; kdDebug(6041) << "visual order is:" << endl;
for (BidiRun* curr = sFirstRun; curr; curr = curr->nextRun) // for (BidiRun* curr = sFirstRun; curr; curr = curr->nextRun)
kdDebug(6041) << " " << curr << endl; // kdDebug(6041) << " " << curr << endl;
#endif #endif
} }

@ -26,11 +26,11 @@
* *
*/ */
//#define DEBUG // #define DEBUG
//#define DEBUG_LAYOUT // #define DEBUG_LAYOUT
//#define BOX_DEBUG // #define BOX_DEBUG
//#define FLOAT_DEBUG // #define FLOAT_DEBUG
//#define PAGE_DEBUG // #define PAGE_DEBUG
#include <kdebug.h> #include <kdebug.h>
#include "rendering/render_text.h" #include "rendering/render_text.h"

Loading…
Cancel
Save