From 6e8f112492dec917cdcd9bc50b992eca5d41b998 Mon Sep 17 00:00:00 2001 From: Roberto Raggi Date: Mon, 18 May 2009 17:52:39 +0200 Subject: Fixed #includes --- src/declarative/3rdparty/qlistmodelinterface.h | 6 +++--- src/declarative/canvas/qsimplecanvas.h | 2 +- src/declarative/canvas/qsimplecanvasfilter.h | 6 +++--- src/declarative/canvas/qsimplecanvasitem.h | 2 +- src/declarative/extra/qfxintegermodel.h | 6 +++--- src/declarative/extra/qmlnumberformatter.h | 4 ++-- src/declarative/extra/qmlsqlconnection.h | 4 ++-- src/declarative/extra/qmlsqlquery.h | 4 ++-- src/declarative/extra/qmlxmllistmodel.h | 4 ++-- src/declarative/extra/qnumberformat.h | 6 +++--- src/declarative/fx/qfxanchors.h | 6 +++--- src/declarative/fx/qfxanimatedimageitem.h | 2 +- src/declarative/fx/qfxblendedimage.h | 2 +- src/declarative/fx/qfxblurfilter.h | 4 ++-- src/declarative/fx/qfxcomponentinstance.h | 2 +- src/declarative/fx/qfxcontentwrapper.h | 2 +- src/declarative/fx/qfxevents_p.h | 4 ++-- src/declarative/fx/qfxflickable.h | 2 +- src/declarative/fx/qfxflipable.h | 6 +++--- src/declarative/fx/qfxfocuspanel.h | 2 +- src/declarative/fx/qfxfocusrealm.h | 2 +- src/declarative/fx/qfxgridview.h | 2 +- src/declarative/fx/qfxhighlightfilter.h | 4 ++-- src/declarative/fx/qfximage.h | 2 +- src/declarative/fx/qfxitem.h | 4 ++-- src/declarative/fx/qfxitem_p.h | 6 +++--- src/declarative/fx/qfxkeyactions.h | 8 ++++---- src/declarative/fx/qfxkeyproxy.h | 2 +- src/declarative/fx/qfxlayouts.h | 8 ++++---- src/declarative/fx/qfxlayouts_p.h | 10 +++++----- src/declarative/fx/qfxlistview.h | 2 +- src/declarative/fx/qfxmouseregion.h | 2 +- src/declarative/fx/qfxpainteditem.h | 4 ++-- src/declarative/fx/qfxpainteditem_p.h | 4 ++-- src/declarative/fx/qfxparticles.h | 2 +- src/declarative/fx/qfxpath.h | 8 ++++---- src/declarative/fx/qfxpathview.h | 4 ++-- src/declarative/fx/qfxpixmap.h | 8 ++++---- src/declarative/fx/qfxrect.h | 2 +- src/declarative/fx/qfxreflectionfilter.h | 4 ++-- src/declarative/fx/qfxrepeater.h | 2 +- src/declarative/fx/qfxscalegrid.h | 14 +++++++------- src/declarative/fx/qfxshadowfilter.h | 4 ++-- src/declarative/fx/qfxtext.h | 4 ++-- src/declarative/fx/qfxtextedit.h | 4 ++-- src/declarative/fx/qfxtransform.h | 6 +++--- src/declarative/fx/qfxvisualitemmodel.h | 2 +- src/declarative/fx/qfxwebview.h | 10 +++++----- src/declarative/fx/qfxwidgetcontainer.h | 2 ++ src/declarative/opengl/glheaders.h | 2 +- src/declarative/opengl/glsave.h | 6 +++--- src/declarative/opengl/gltexture.h | 6 +++--- src/declarative/qml/qmlbindablevalue.h | 8 ++++---- src/declarative/qml/qmlbindablevalue_p.h | 4 ++-- src/declarative/qml/qmlboundsignal_p.h | 2 +- src/declarative/qml/qmlcompiledcomponent_p.h | 2 +- src/declarative/qml/qmlcompiler_p.h | 4 ++-- src/declarative/qml/qmlcomponent_p.h | 24 ++++++++++++------------ src/declarative/qml/qmlcompositetypemanager_p.h | 4 ++-- src/declarative/qml/qmlcontext_p.h | 6 +++--- src/declarative/qml/qmlengine_p.h | 16 ++++++++-------- src/declarative/qml/qmlinstruction_p.h | 2 +- src/declarative/qml/qmlmetaproperty.h | 2 +- src/declarative/qml/qmlparser_p.h | 6 +++--- src/declarative/qml/qmlpropertyvaluesource.h | 6 +++--- src/declarative/qml/qmlproxymetaobject_p.h | 6 +++--- src/declarative/qml/qmlrefcount_p.h | 2 +- src/declarative/qml/qmlvme_p.h | 8 ++++---- src/declarative/qml/qmlvmemetaobject_p.h | 6 +++--- src/declarative/qml/script/lexer.h | 2 +- src/declarative/qml/script/qmlbasicscript.h | 6 +++--- src/declarative/test/qfxtestengine.h | 4 ++-- src/declarative/test/qfxtestobjects.h | 8 ++++---- src/declarative/test/qfxtestview.h | 2 +- src/declarative/timeline/qmltimeline.h | 6 +++--- src/declarative/timeline/qmltimelinevalueproxy.h | 2 +- src/declarative/util/qbindablemap.h | 10 +++++----- src/declarative/util/qfxglobal.h | 4 ++-- src/declarative/util/qfxview.h | 4 ++-- src/declarative/util/qmlanimation.h | 10 +++++----- src/declarative/util/qmlanimation_p.h | 16 ++++++++-------- src/declarative/util/qmlbehaviour.h | 6 +++--- src/declarative/util/qmlbind.h | 4 ++-- src/declarative/util/qmlfollow.h | 4 ++-- src/declarative/util/qmlfont.h | 2 +- src/declarative/util/qmllistaccessor.h | 2 +- src/declarative/util/qmllistmodel.h | 16 ++++++++-------- src/declarative/util/qmlopenmetaobject.h | 4 ++-- src/declarative/util/qmlpackage.h | 2 +- src/declarative/util/qmlscript.h | 4 ++-- src/declarative/util/qmlsetproperties.h | 2 +- src/declarative/util/qmlstate.h | 6 +++--- src/declarative/util/qmlstate_p.h | 6 +++--- src/declarative/util/qmlstategroup.h | 2 +- src/declarative/util/qmlstateoperations.h | 2 +- src/declarative/util/qmltransition.h | 6 +++--- src/declarative/widgets/graphicslayouts.h | 6 +++--- src/declarative/widgets/graphicswidgets.h | 10 +++++----- 98 files changed, 247 insertions(+), 245 deletions(-) diff --git a/src/declarative/3rdparty/qlistmodelinterface.h b/src/declarative/3rdparty/qlistmodelinterface.h index 19284ca..44c4a24 100644 --- a/src/declarative/3rdparty/qlistmodelinterface.h +++ b/src/declarative/3rdparty/qlistmodelinterface.h @@ -42,9 +42,9 @@ #ifndef QLISTMODELINTERFACE_H #define QLISTMODELINTERFACE_H -#include -#include -#include +#include +#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/canvas/qsimplecanvas.h b/src/declarative/canvas/qsimplecanvas.h index d57ada4..880fae0 100644 --- a/src/declarative/canvas/qsimplecanvas.h +++ b/src/declarative/canvas/qsimplecanvas.h @@ -42,7 +42,7 @@ #ifndef QSIMPLECANVAS_H #define QSIMPLECANVAS_H -#include +#include #ifdef QFX_RENDER_OPENGL #include diff --git a/src/declarative/canvas/qsimplecanvasfilter.h b/src/declarative/canvas/qsimplecanvasfilter.h index cb75ddf..d05dc7e 100644 --- a/src/declarative/canvas/qsimplecanvasfilter.h +++ b/src/declarative/canvas/qsimplecanvasfilter.h @@ -43,9 +43,9 @@ #define QSIMPLECANVASFILTER_H #include -#include -#include -#include +#include +#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/canvas/qsimplecanvasitem.h b/src/declarative/canvas/qsimplecanvasitem.h index cab8492..63be27b 100644 --- a/src/declarative/canvas/qsimplecanvasitem.h +++ b/src/declarative/canvas/qsimplecanvasitem.h @@ -47,13 +47,13 @@ #include #include #include -class QPainter; QT_BEGIN_HEADER QT_BEGIN_NAMESPACE QT_MODULE(Declarative) +class QPainter; class QRect; class QSimpleCanvas; class QMouseEvent; diff --git a/src/declarative/extra/qfxintegermodel.h b/src/declarative/extra/qfxintegermodel.h index 3a48a56..2f5c756 100644 --- a/src/declarative/extra/qfxintegermodel.h +++ b/src/declarative/extra/qfxintegermodel.h @@ -42,9 +42,9 @@ #ifndef QFXINTMODEL_H #define QFXINTMODEL_H -#include -#include "qml.h" -#include +#include +#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/extra/qmlnumberformatter.h b/src/declarative/extra/qmlnumberformatter.h index e053be5..cdd6b58 100644 --- a/src/declarative/extra/qmlnumberformatter.h +++ b/src/declarative/extra/qmlnumberformatter.h @@ -42,8 +42,8 @@ #ifndef QMLNUMBERFORMATTER_H #define QMLNUMBERFORMATTER_H -#include -#include "qnumberformat.h" +#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/extra/qmlsqlconnection.h b/src/declarative/extra/qmlsqlconnection.h index 2cc5774..0fff1b0 100644 --- a/src/declarative/extra/qmlsqlconnection.h +++ b/src/declarative/extra/qmlsqlconnection.h @@ -42,8 +42,8 @@ #ifndef QMLSQLCONNECTION_H #define QMLSQLCONNECTION_H -#include -#include +#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/extra/qmlsqlquery.h b/src/declarative/extra/qmlsqlquery.h index 984483c..3fff127 100644 --- a/src/declarative/extra/qmlsqlquery.h +++ b/src/declarative/extra/qmlsqlquery.h @@ -42,8 +42,8 @@ #ifndef QMLSQLQUERYMODEL_H #define QMLSQLQUERYMODEL_H -#include -#include +#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/extra/qmlxmllistmodel.h b/src/declarative/extra/qmlxmllistmodel.h index 2e932cb..9371448 100644 --- a/src/declarative/extra/qmlxmllistmodel.h +++ b/src/declarative/extra/qmlxmllistmodel.h @@ -42,8 +42,8 @@ #ifndef QMLXMLLISTMODEL_H #define QMLXMLLISTMODEL_H -#include -#include +#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/extra/qnumberformat.h b/src/declarative/extra/qnumberformat.h index 6ee333c..75224ec 100644 --- a/src/declarative/extra/qnumberformat.h +++ b/src/declarative/extra/qnumberformat.h @@ -42,9 +42,9 @@ #ifndef NUMBERFORMAT_H #define NUMBERFORMAT_H -#include "qml.h" -#include - +#include +#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/fx/qfxanchors.h b/src/declarative/fx/qfxanchors.h index 2c59266..9d776ab 100644 --- a/src/declarative/fx/qfxanchors.h +++ b/src/declarative/fx/qfxanchors.h @@ -42,9 +42,9 @@ #ifndef QFXANCHORS_H #define QFXANCHORS_H -#include -#include -#include +#include +#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/fx/qfxanimatedimageitem.h b/src/declarative/fx/qfxanimatedimageitem.h index 121fe62..a332c8b 100644 --- a/src/declarative/fx/qfxanimatedimageitem.h +++ b/src/declarative/fx/qfxanimatedimageitem.h @@ -42,7 +42,7 @@ #ifndef QFXANIMATEDIMAGEITEM_H #define QFXANIMATEDIMAGEITEM_H -#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/fx/qfxblendedimage.h b/src/declarative/fx/qfxblendedimage.h index 1cf4dc8..2fdf15b 100644 --- a/src/declarative/fx/qfxblendedimage.h +++ b/src/declarative/fx/qfxblendedimage.h @@ -42,7 +42,7 @@ #ifndef QFXBLENDEDIMAGE_H #define QFXBLENDEDIMAGE_H -#include +#include #if defined(QFX_RENDER_OPENGL2) #include #endif diff --git a/src/declarative/fx/qfxblurfilter.h b/src/declarative/fx/qfxblurfilter.h index 7a2b5b9..576debf 100644 --- a/src/declarative/fx/qfxblurfilter.h +++ b/src/declarative/fx/qfxblurfilter.h @@ -42,8 +42,8 @@ #ifndef QFXBLURFILTER_H #define QFXBLURFILTER_H -#include -#include +#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/fx/qfxcomponentinstance.h b/src/declarative/fx/qfxcomponentinstance.h index 64af355..9f84043 100644 --- a/src/declarative/fx/qfxcomponentinstance.h +++ b/src/declarative/fx/qfxcomponentinstance.h @@ -42,7 +42,7 @@ #ifndef QFXCOMPONENTINSTANCE_H #define QFXCOMPONENTINSTANCE_H -#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/fx/qfxcontentwrapper.h b/src/declarative/fx/qfxcontentwrapper.h index 5d5a7e1..0b7253e 100644 --- a/src/declarative/fx/qfxcontentwrapper.h +++ b/src/declarative/fx/qfxcontentwrapper.h @@ -42,7 +42,7 @@ #ifndef QFXCONTENTWRAPPER_H #define QFXCONTENTWRAPPER_H -#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/fx/qfxevents_p.h b/src/declarative/fx/qfxevents_p.h index 30717ef..bcd9f2d 100644 --- a/src/declarative/fx/qfxevents_p.h +++ b/src/declarative/fx/qfxevents_p.h @@ -42,8 +42,8 @@ #ifndef QFXEVENTS_P_H #define QFXEVENTS_P_H -#include -#include +#include +#include #include #include diff --git a/src/declarative/fx/qfxflickable.h b/src/declarative/fx/qfxflickable.h index c5a0593..3857017 100644 --- a/src/declarative/fx/qfxflickable.h +++ b/src/declarative/fx/qfxflickable.h @@ -42,7 +42,7 @@ #ifndef QFXFLICKABLE_H #define QFXFLICKABLE_H -#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/fx/qfxflipable.h b/src/declarative/fx/qfxflipable.h index ef1832e..62b62a5 100644 --- a/src/declarative/fx/qfxflipable.h +++ b/src/declarative/fx/qfxflipable.h @@ -42,12 +42,12 @@ #ifndef QFXFLIPABLE_H #define QFXFLIPABLE_H -#include -#include +#include +#include #if defined(QFX_RENDER_OPENGL) #include #endif -#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/fx/qfxfocuspanel.h b/src/declarative/fx/qfxfocuspanel.h index 38f7a15..cec12a1 100644 --- a/src/declarative/fx/qfxfocuspanel.h +++ b/src/declarative/fx/qfxfocuspanel.h @@ -42,7 +42,7 @@ #ifndef QFXFOCUSPANEL_H #define QFXFOCUSPANEL_H -#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/fx/qfxfocusrealm.h b/src/declarative/fx/qfxfocusrealm.h index 6c35405..fdf1525 100644 --- a/src/declarative/fx/qfxfocusrealm.h +++ b/src/declarative/fx/qfxfocusrealm.h @@ -42,7 +42,7 @@ #ifndef QFXFOCUSREALM_H #define QFXFOCUSREALM_H -#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/fx/qfxgridview.h b/src/declarative/fx/qfxgridview.h index 2bbfc40..ff08831 100644 --- a/src/declarative/fx/qfxgridview.h +++ b/src/declarative/fx/qfxgridview.h @@ -42,7 +42,7 @@ #ifndef QFXGRIDVIEW_H #define QFXGRIDVIEW_H -#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/fx/qfxhighlightfilter.h b/src/declarative/fx/qfxhighlightfilter.h index 218f4e1..92a3dc7 100644 --- a/src/declarative/fx/qfxhighlightfilter.h +++ b/src/declarative/fx/qfxhighlightfilter.h @@ -42,8 +42,8 @@ #ifndef QFXHIGHLIGHTFILTER_H #define QFXHIGHLIGHTFILTER_H -#include -#include +#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/fx/qfximage.h b/src/declarative/fx/qfximage.h index dc13a97..1436551 100644 --- a/src/declarative/fx/qfximage.h +++ b/src/declarative/fx/qfximage.h @@ -42,7 +42,7 @@ #ifndef QFXIMAGE_H #define QFXIMAGE_H -#include +#include #include diff --git a/src/declarative/fx/qfxitem.h b/src/declarative/fx/qfxitem.h index 437709f..d34a9fb 100644 --- a/src/declarative/fx/qfxitem.h +++ b/src/declarative/fx/qfxitem.h @@ -42,9 +42,9 @@ #ifndef QFXITEM_H #define QFXITEM_H -#include +#include #include -#include +#include #include #include #include diff --git a/src/declarative/fx/qfxitem_p.h b/src/declarative/fx/qfxitem_p.h index 8ca7fda..85ce171 100644 --- a/src/declarative/fx/qfxitem_p.h +++ b/src/declarative/fx/qfxitem_p.h @@ -53,11 +53,11 @@ // We mean it. // -#include "qfxitem.h" +#include #include #include -#include -#include +#include +#include #include QT_BEGIN_NAMESPACE diff --git a/src/declarative/fx/qfxkeyactions.h b/src/declarative/fx/qfxkeyactions.h index 7ad323a..a5aec2e 100644 --- a/src/declarative/fx/qfxkeyactions.h +++ b/src/declarative/fx/qfxkeyactions.h @@ -42,10 +42,10 @@ #ifndef QFXKEYACTIONS_H #define QFXKEYACTIONS_H -#include -#include -#include -#include +#include +#include +#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/fx/qfxkeyproxy.h b/src/declarative/fx/qfxkeyproxy.h index ae5fce4..6cf0c0d 100644 --- a/src/declarative/fx/qfxkeyproxy.h +++ b/src/declarative/fx/qfxkeyproxy.h @@ -42,7 +42,7 @@ #ifndef QFXKEYPROXY_H #define QFXKEYPROXY_H -#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/fx/qfxlayouts.h b/src/declarative/fx/qfxlayouts.h index acfc0c4..35e41d8 100644 --- a/src/declarative/fx/qfxlayouts.h +++ b/src/declarative/fx/qfxlayouts.h @@ -42,10 +42,10 @@ #ifndef QFXLAYOUTS_H #define QFXLAYOUTS_H -#include -#include -#include -#include +#include +#include +#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/fx/qfxlayouts_p.h b/src/declarative/fx/qfxlayouts_p.h index 859482f..77b0ea1 100644 --- a/src/declarative/fx/qfxlayouts_p.h +++ b/src/declarative/fx/qfxlayouts_p.h @@ -53,11 +53,11 @@ // We mean it. // -#include "qfxlayouts.h" -#include "qfxitem_p.h" -#include -#include -#include +#include +#include +#include +#include +#include QT_BEGIN_NAMESPACE diff --git a/src/declarative/fx/qfxlistview.h b/src/declarative/fx/qfxlistview.h index 40c2496..6bf2b54 100644 --- a/src/declarative/fx/qfxlistview.h +++ b/src/declarative/fx/qfxlistview.h @@ -42,7 +42,7 @@ #ifndef QFXLISTVIEW_H #define QFXLISTVIEW_H -#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/fx/qfxmouseregion.h b/src/declarative/fx/qfxmouseregion.h index 2ba4a50..1d1ec93 100644 --- a/src/declarative/fx/qfxmouseregion.h +++ b/src/declarative/fx/qfxmouseregion.h @@ -42,7 +42,7 @@ #ifndef QFXMOUSEREGION_H #define QFXMOUSEREGION_H -#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/fx/qfxpainteditem.h b/src/declarative/fx/qfxpainteditem.h index 015a035..6cd21e6 100644 --- a/src/declarative/fx/qfxpainteditem.h +++ b/src/declarative/fx/qfxpainteditem.h @@ -42,8 +42,8 @@ #ifndef QFXIMAGEITEM_H #define QFXIMAGEITEM_H -#include -#include +#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/fx/qfxpainteditem_p.h b/src/declarative/fx/qfxpainteditem_p.h index b0432ac..5d5da6b 100644 --- a/src/declarative/fx/qfxpainteditem_p.h +++ b/src/declarative/fx/qfxpainteditem_p.h @@ -53,8 +53,8 @@ // We mean it. // -#include "qfxitem_p.h" -#include +#include +#include #if defined(QFX_RENDER_OPENGL) #include "gltexture.h" diff --git a/src/declarative/fx/qfxparticles.h b/src/declarative/fx/qfxparticles.h index a879b2d..31a00fb 100644 --- a/src/declarative/fx/qfxparticles.h +++ b/src/declarative/fx/qfxparticles.h @@ -42,7 +42,7 @@ #ifndef QFXPARTICLES_H #define QFXPARTICLES_H -#include +#include #if defined(QFX_RENDER_OPENGL) #include "gltexture.h" diff --git a/src/declarative/fx/qfxpath.h b/src/declarative/fx/qfxpath.h index c594793..10cf252 100644 --- a/src/declarative/fx/qfxpath.h +++ b/src/declarative/fx/qfxpath.h @@ -42,10 +42,10 @@ #ifndef QFXPATH_H #define QFXPATH_H -#include -#include -#include -#include +#include +#include +#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/fx/qfxpathview.h b/src/declarative/fx/qfxpathview.h index 2ecd04e..32e03b8 100644 --- a/src/declarative/fx/qfxpathview.h +++ b/src/declarative/fx/qfxpathview.h @@ -42,8 +42,8 @@ #ifndef QFXPATHVIEW_H #define QFXPATHVIEW_H -#include -#include +#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/fx/qfxpixmap.h b/src/declarative/fx/qfxpixmap.h index 297dba7..fd56ee4 100644 --- a/src/declarative/fx/qfxpixmap.h +++ b/src/declarative/fx/qfxpixmap.h @@ -42,10 +42,10 @@ #ifndef QFXPIXMAP_H #define QFXPIXMAP_H -#include -#include -#include -#include +#include +#include +#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/fx/qfxrect.h b/src/declarative/fx/qfxrect.h index 42e7b2f..f8bff78 100644 --- a/src/declarative/fx/qfxrect.h +++ b/src/declarative/fx/qfxrect.h @@ -42,7 +42,7 @@ #ifndef QFXRECT_H #define QFXRECT_H -#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/fx/qfxreflectionfilter.h b/src/declarative/fx/qfxreflectionfilter.h index b0cc7b2..383e12f 100644 --- a/src/declarative/fx/qfxreflectionfilter.h +++ b/src/declarative/fx/qfxreflectionfilter.h @@ -42,8 +42,8 @@ #ifndef QFXREFLECTIONFILTER_H #define QFXREFLECTIONFILTER_H -#include -#include +#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/fx/qfxrepeater.h b/src/declarative/fx/qfxrepeater.h index 8efd281..362242b 100644 --- a/src/declarative/fx/qfxrepeater.h +++ b/src/declarative/fx/qfxrepeater.h @@ -42,7 +42,7 @@ #ifndef QFXREPEATER_H #define QFXREPEATER_H -#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/fx/qfxscalegrid.h b/src/declarative/fx/qfxscalegrid.h index 9010ce7..d0f735f 100644 --- a/src/declarative/fx/qfxscalegrid.h +++ b/src/declarative/fx/qfxscalegrid.h @@ -42,13 +42,13 @@ #ifndef QFXSCALEGRID_H #define QFXSCALEGRID_H -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/fx/qfxshadowfilter.h b/src/declarative/fx/qfxshadowfilter.h index 9ba3b7b..fc54e01 100644 --- a/src/declarative/fx/qfxshadowfilter.h +++ b/src/declarative/fx/qfxshadowfilter.h @@ -42,8 +42,8 @@ #ifndef QFXSHADOWFILTER_H #define QFXSHADOWFILTER_H -#include -#include +#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/fx/qfxtext.h b/src/declarative/fx/qfxtext.h index 0de884b..ee9082b 100644 --- a/src/declarative/fx/qfxtext.h +++ b/src/declarative/fx/qfxtext.h @@ -42,8 +42,8 @@ #ifndef QFXTEXT_H #define QFXTEXT_H -#include -#include +#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/fx/qfxtextedit.h b/src/declarative/fx/qfxtextedit.h index 0aaa17b..f702101 100644 --- a/src/declarative/fx/qfxtextedit.h +++ b/src/declarative/fx/qfxtextedit.h @@ -42,8 +42,8 @@ #ifndef QFXTEXTEDIT_H #define QFXTEXTEDIT_H -#include -#include +#include +#include #include #include diff --git a/src/declarative/fx/qfxtransform.h b/src/declarative/fx/qfxtransform.h index a3a1a83..6d55cff 100644 --- a/src/declarative/fx/qfxtransform.h +++ b/src/declarative/fx/qfxtransform.h @@ -42,12 +42,12 @@ #ifndef QFXTRANSFORM_H #define QFXTRANSFORM_H -#include -#include +#include +#include #if defined(QFX_RENDER_OPENGL) #include #endif -#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/fx/qfxvisualitemmodel.h b/src/declarative/fx/qfxvisualitemmodel.h index 5db5209..586d837 100644 --- a/src/declarative/fx/qfxvisualitemmodel.h +++ b/src/declarative/fx/qfxvisualitemmodel.h @@ -44,7 +44,7 @@ #include #include -#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/fx/qfxwebview.h b/src/declarative/fx/qfxwebview.h index afd5b0f..6a3dad5 100644 --- a/src/declarative/fx/qfxwebview.h +++ b/src/declarative/fx/qfxwebview.h @@ -42,12 +42,12 @@ #ifndef QFXWEBVIEW_H #define QFXWEBVIEW_H -#include -#include -#include -#include +#include +#include +#include +#include #include -#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/fx/qfxwidgetcontainer.h b/src/declarative/fx/qfxwidgetcontainer.h index 65e4352..3b1f016 100644 --- a/src/declarative/fx/qfxwidgetcontainer.h +++ b/src/declarative/fx/qfxwidgetcontainer.h @@ -48,6 +48,8 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE +QT_MODULE(Declarative) + class QGraphicsWidget; class Q_DECLARATIVE_EXPORT QFxWidgetContainer : public QFxItem diff --git a/src/declarative/opengl/glheaders.h b/src/declarative/opengl/glheaders.h index f0f6a55..fd1da18 100644 --- a/src/declarative/opengl/glheaders.h +++ b/src/declarative/opengl/glheaders.h @@ -42,7 +42,7 @@ #ifndef _GLHEADERS_H_ #define _GLHEADERS_H_ -#include +#include #define GL_GLEXT_PROTOTYPES 1 #include diff --git a/src/declarative/opengl/glsave.h b/src/declarative/opengl/glsave.h index cca3d3c..8256162 100644 --- a/src/declarative/opengl/glsave.h +++ b/src/declarative/opengl/glsave.h @@ -42,9 +42,9 @@ #ifndef _GLSAVE_H_ #define _GLSAVE_H_ -#include -#include -#include +#include +#include +#include #include "glheaders.h" diff --git a/src/declarative/opengl/gltexture.h b/src/declarative/opengl/gltexture.h index f920b60..8704498 100644 --- a/src/declarative/opengl/gltexture.h +++ b/src/declarative/opengl/gltexture.h @@ -42,10 +42,10 @@ #ifndef _GLTEXTURE_H_ #define _GLTEXTURE_H_ -#include +#include -#include -#include +#include +#include #include "glheaders.h" diff --git a/src/declarative/qml/qmlbindablevalue.h b/src/declarative/qml/qmlbindablevalue.h index c4ef64a..7831177 100644 --- a/src/declarative/qml/qmlbindablevalue.h +++ b/src/declarative/qml/qmlbindablevalue.h @@ -42,10 +42,10 @@ #ifndef QMLBINDABLEVALUE_H #define QMLBINDABLEVALUE_H -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/src/declarative/qml/qmlbindablevalue_p.h b/src/declarative/qml/qmlbindablevalue_p.h index d9af0ef..9973bdc 100644 --- a/src/declarative/qml/qmlbindablevalue_p.h +++ b/src/declarative/qml/qmlbindablevalue_p.h @@ -43,8 +43,8 @@ #define QMLBINDABLEVALUE_P_H #include -#include -#include +#include +#include QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlboundsignal_p.h b/src/declarative/qml/qmlboundsignal_p.h index e84f0c1..2c05770 100644 --- a/src/declarative/qml/qmlboundsignal_p.h +++ b/src/declarative/qml/qmlboundsignal_p.h @@ -42,7 +42,7 @@ #ifndef QMLBOUNDSIGNAL_P_H #define QMLBOUNDSIGNAL_P_H -#include +#include #include QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlcompiledcomponent_p.h b/src/declarative/qml/qmlcompiledcomponent_p.h index c5e1226..2201423 100644 --- a/src/declarative/qml/qmlcompiledcomponent_p.h +++ b/src/declarative/qml/qmlcompiledcomponent_p.h @@ -42,7 +42,7 @@ #ifndef QMLCOMPILEDCOMPONENT_P_H #define QMLCOMPILEDCOMPONENT_P_H -#include +#include #include #include #include diff --git a/src/declarative/qml/qmlcompiler_p.h b/src/declarative/qml/qmlcompiler_p.h index 87c1b82..bc04cfa 100644 --- a/src/declarative/qml/qmlcompiler_p.h +++ b/src/declarative/qml/qmlcompiler_p.h @@ -44,8 +44,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/src/declarative/qml/qmlcomponent_p.h b/src/declarative/qml/qmlcomponent_p.h index 4de47c6..254d9ba 100644 --- a/src/declarative/qml/qmlcomponent_p.h +++ b/src/declarative/qml/qmlcomponent_p.h @@ -42,21 +42,21 @@ #ifndef QMLCOMPONENT_P_H #define QMLCOMPONENT_P_H -#include -#include -#include -#include "private/qobject_p.h" -#include "private/qmlengine_p.h" -#include "private/qmlcompositetypemanager_p.h" -#include -#include "qmlcomponent.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include + +QT_BEGIN_NAMESPACE + class QmlComponent; class QmlEngine; class QmlCompiledComponent; -#include "qml.h" - - -QT_BEGIN_NAMESPACE class QmlComponentPrivate : public QObjectPrivate { diff --git a/src/declarative/qml/qmlcompositetypemanager_p.h b/src/declarative/qml/qmlcompositetypemanager_p.h index f03b2cb..9312819 100644 --- a/src/declarative/qml/qmlcompositetypemanager_p.h +++ b/src/declarative/qml/qmlcompositetypemanager_p.h @@ -42,10 +42,10 @@ #ifndef QMLCOMPOSITETYPEMANAGER_P_H #define QMLCOMPOSITETYPEMANAGER_P_H -#include +#include #include #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlcontext_p.h b/src/declarative/qml/qmlcontext_p.h index 6f1e486..4d88fc2 100644 --- a/src/declarative/qml/qmlcontext_p.h +++ b/src/declarative/qml/qmlcontext_p.h @@ -42,11 +42,11 @@ #ifndef QMLCONTEXT_P_H #define QMLCONTEXT_P_H -#include +#include #include #include -#include -#include +#include +#include #include QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlengine_p.h b/src/declarative/qml/qmlengine_p.h index 7cafb59..0dc4736 100644 --- a/src/declarative/qml/qmlengine_p.h +++ b/src/declarative/qml/qmlengine_p.h @@ -42,9 +42,9 @@ #ifndef QMLENGINE_P_H #define QMLENGINE_P_H -#include -#include -#include +#include +#include +#include #include #include #include @@ -52,11 +52,11 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlinstruction_p.h b/src/declarative/qml/qmlinstruction_p.h index 323735b..a21ccee 100644 --- a/src/declarative/qml/qmlinstruction_p.h +++ b/src/declarative/qml/qmlinstruction_p.h @@ -42,7 +42,7 @@ #ifndef QMLINSTRUCTION_P_H #define QMLINSTRUCTION_P_H -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlmetaproperty.h b/src/declarative/qml/qmlmetaproperty.h index 4e59cf7..9daef59 100644 --- a/src/declarative/qml/qmlmetaproperty.h +++ b/src/declarative/qml/qmlmetaproperty.h @@ -43,7 +43,7 @@ #define QMLMETAPROPERTY_H #include -#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/qml/qmlparser_p.h b/src/declarative/qml/qmlparser_p.h index 95b21e6..add5773 100644 --- a/src/declarative/qml/qmlparser_p.h +++ b/src/declarative/qml/qmlparser_p.h @@ -42,10 +42,10 @@ #ifndef QMLPARSER_P_H #define QMLPARSER_P_H -#include -#include +#include +#include #include -#include +#include #include #include diff --git a/src/declarative/qml/qmlpropertyvaluesource.h b/src/declarative/qml/qmlpropertyvaluesource.h index 6ef2e38..736b25f 100644 --- a/src/declarative/qml/qmlpropertyvaluesource.h +++ b/src/declarative/qml/qmlpropertyvaluesource.h @@ -42,9 +42,9 @@ #ifndef QMLPROPERTYVALUESOURCE_H #define QMLPROPERTYVALUESOURCE_H -#include -#include -#include +#include +#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/qml/qmlproxymetaobject_p.h b/src/declarative/qml/qmlproxymetaobject_p.h index 594e7a3..0ffa365 100644 --- a/src/declarative/qml/qmlproxymetaobject_p.h +++ b/src/declarative/qml/qmlproxymetaobject_p.h @@ -42,11 +42,11 @@ #ifndef QMLPROXYMETAOBJECT_P_H #define QMLPROXYMETAOBJECT_P_H -#include +#include +#include #include #include -#include -#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/qml/qmlrefcount_p.h b/src/declarative/qml/qmlrefcount_p.h index 90b50a8..1355c86 100644 --- a/src/declarative/qml/qmlrefcount_p.h +++ b/src/declarative/qml/qmlrefcount_p.h @@ -42,7 +42,7 @@ #ifndef QMLREFCOUNT_P_H #define QMLREFCOUNT_P_H -#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/qml/qmlvme_p.h b/src/declarative/qml/qmlvme_p.h index f7e13d6..4e5c6c1 100644 --- a/src/declarative/qml/qmlvme_p.h +++ b/src/declarative/qml/qmlvme_p.h @@ -42,12 +42,12 @@ #ifndef QMLVME_P_H #define QMLVME_P_H -#include -#include -#include -class QObject; +#include +#include +#include QT_BEGIN_NAMESPACE +class QObject; class QmlInstruction; class QmlCompiledComponent; class QmlCompiledData; diff --git a/src/declarative/qml/qmlvmemetaobject_p.h b/src/declarative/qml/qmlvmemetaobject_p.h index d8ed242..6f1e31b 100644 --- a/src/declarative/qml/qmlvmemetaobject_p.h +++ b/src/declarative/qml/qmlvmemetaobject_p.h @@ -42,9 +42,9 @@ #ifndef QMLVMEMETAOBJECT_P_H #define QMLVMEMETAOBJECT_P_H -#include -#include -#include +#include +#include +#include #include QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/script/lexer.h b/src/declarative/qml/script/lexer.h index 7781ee8..9de4afd 100644 --- a/src/declarative/qml/script/lexer.h +++ b/src/declarative/qml/script/lexer.h @@ -11,7 +11,7 @@ #ifndef LEXER_H #define LEXER_H -#include +#include #include "tokens.h" diff --git a/src/declarative/qml/script/qmlbasicscript.h b/src/declarative/qml/script/qmlbasicscript.h index d465f04..5ef2148 100644 --- a/src/declarative/qml/script/qmlbasicscript.h +++ b/src/declarative/qml/script/qmlbasicscript.h @@ -13,10 +13,10 @@ #define QMLBASICSCRIPT_H #include "instructions.h" -#include -#include +#include +#include #include "lexer.h" -#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/test/qfxtestengine.h b/src/declarative/test/qfxtestengine.h index 6698645..44a140f 100644 --- a/src/declarative/test/qfxtestengine.h +++ b/src/declarative/test/qfxtestengine.h @@ -42,8 +42,7 @@ #ifndef _QFXTESTENGINE_H_ #define _QFXTESTENGINE_H_ -#include -class QSimpleCanvas; +#include QT_BEGIN_HEADER @@ -51,6 +50,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) +class QSimpleCanvas; class QFxTestEnginePrivate; class Q_DECLARATIVE_EXPORT QFxTestEngine : public QObject { diff --git a/src/declarative/test/qfxtestobjects.h b/src/declarative/test/qfxtestobjects.h index 4273d4e..653656e 100644 --- a/src/declarative/test/qfxtestobjects.h +++ b/src/declarative/test/qfxtestobjects.h @@ -42,10 +42,10 @@ #ifndef _QFXTESTOBJECTS_H_ #define _QFXTESTOBJECTS_H_ -#include -#include -#include -#include +#include +#include +#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/test/qfxtestview.h b/src/declarative/test/qfxtestview.h index 33275b9..a8f78bf 100644 --- a/src/declarative/test/qfxtestview.h +++ b/src/declarative/test/qfxtestview.h @@ -42,7 +42,7 @@ #ifndef _QFXTESTVIEW_H_ #define _QFXTESTVIEW_H_ -#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/timeline/qmltimeline.h b/src/declarative/timeline/qmltimeline.h index ce9d1f2..23bdd64 100644 --- a/src/declarative/timeline/qmltimeline.h +++ b/src/declarative/timeline/qmltimeline.h @@ -42,9 +42,9 @@ #ifndef QMLTIMELINE_H #define QMLTIMELINE_H -#include -#include -#include +#include +#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/timeline/qmltimelinevalueproxy.h b/src/declarative/timeline/qmltimelinevalueproxy.h index 853db4e..9ecdba1 100644 --- a/src/declarative/timeline/qmltimelinevalueproxy.h +++ b/src/declarative/timeline/qmltimelinevalueproxy.h @@ -42,7 +42,7 @@ #ifndef QMLTIMELINEVALUEPROXY_H #define QMLTIMELINEVALUEPROXY_H -#include "qmltimeline.h" +#include QT_BEGIN_HEADER diff --git a/src/declarative/util/qbindablemap.h b/src/declarative/util/qbindablemap.h index d617867..c76928d 100644 --- a/src/declarative/util/qbindablemap.h +++ b/src/declarative/util/qbindablemap.h @@ -42,11 +42,11 @@ #ifndef QBINDABLEMAP_H #define QBINDABLEMAP_H -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/util/qfxglobal.h b/src/declarative/util/qfxglobal.h index 887351d..6ba9409 100644 --- a/src/declarative/util/qfxglobal.h +++ b/src/declarative/util/qfxglobal.h @@ -42,8 +42,8 @@ #ifndef QFXGLOBAL_H #define QFXGLOBAL_H -#include -#include +#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/util/qfxview.h b/src/declarative/util/qfxview.h index 8dd9e2c..05bf005 100644 --- a/src/declarative/util/qfxview.h +++ b/src/declarative/util/qfxview.h @@ -42,11 +42,11 @@ #ifndef QFXVIEW_H #define QFXVIEW_H -#include #include #include #include -#include +#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/util/qmlanimation.h b/src/declarative/util/qmlanimation.h index 578631c..8bd53e2 100644 --- a/src/declarative/util/qmlanimation.h +++ b/src/declarative/util/qmlanimation.h @@ -43,12 +43,12 @@ #define QMLANIMATION_H #include +#include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/util/qmlanimation_p.h b/src/declarative/util/qmlanimation_p.h index 00937a6..36b826f 100644 --- a/src/declarative/util/qmlanimation_p.h +++ b/src/declarative/util/qmlanimation_p.h @@ -44,15 +44,15 @@ #include #include -#include -#include -#include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmlbehaviour.h b/src/declarative/util/qmlbehaviour.h index 3d25cd8..7a54d63 100644 --- a/src/declarative/util/qmlbehaviour.h +++ b/src/declarative/util/qmlbehaviour.h @@ -42,9 +42,9 @@ #ifndef QMLBEHAVIOUR_H #define QMLBEHAVIOUR_H -#include -#include -#include +#include +#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/util/qmlbind.h b/src/declarative/util/qmlbind.h index 355edfd..5576957 100644 --- a/src/declarative/util/qmlbind.h +++ b/src/declarative/util/qmlbind.h @@ -42,9 +42,9 @@ #ifndef QMLBIND_H #define QMLBIND_H -#include +#include #include -#include "qml.h" +#include QT_BEGIN_HEADER diff --git a/src/declarative/util/qmlfollow.h b/src/declarative/util/qmlfollow.h index bd9363a..fa0bff8 100644 --- a/src/declarative/util/qmlfollow.h +++ b/src/declarative/util/qmlfollow.h @@ -42,8 +42,8 @@ #ifndef QMLFOLLOW_H #define QMLFOLLOW_H -#include -#include +#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/util/qmlfont.h b/src/declarative/util/qmlfont.h index b6bce7c..3a21c34 100644 --- a/src/declarative/util/qmlfont.h +++ b/src/declarative/util/qmlfont.h @@ -43,7 +43,7 @@ #define QMLFONT_H #include -#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/util/qmllistaccessor.h b/src/declarative/util/qmllistaccessor.h index 29f910d..dd766b2 100644 --- a/src/declarative/util/qmllistaccessor.h +++ b/src/declarative/util/qmllistaccessor.h @@ -42,7 +42,7 @@ #ifndef QMLLISTACCESSOR_H #define QMLLISTACCESSOR_H -#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/util/qmllistmodel.h b/src/declarative/util/qmllistmodel.h index 36aa009..ddf1e13 100644 --- a/src/declarative/util/qmllistmodel.h +++ b/src/declarative/util/qmllistmodel.h @@ -42,14 +42,14 @@ #ifndef QMLLISTMODEL_H #define QMLLISTMODEL_H -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/util/qmlopenmetaobject.h b/src/declarative/util/qmlopenmetaobject.h index f842f96..239276d 100644 --- a/src/declarative/util/qmlopenmetaobject.h +++ b/src/declarative/util/qmlopenmetaobject.h @@ -42,9 +42,9 @@ #ifndef QMLOPENMETAOBJECT_H #define QMLOPENMETAOBJECT_H -#include +#include #include -#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/util/qmlpackage.h b/src/declarative/util/qmlpackage.h index 6652b98..3861890 100644 --- a/src/declarative/util/qmlpackage.h +++ b/src/declarative/util/qmlpackage.h @@ -42,7 +42,7 @@ #ifndef QMLPACKAGE_H #define QMLPACKAGE_H -#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/util/qmlscript.h b/src/declarative/util/qmlscript.h index 8047a88..b739fd7 100644 --- a/src/declarative/util/qmlscript.h +++ b/src/declarative/util/qmlscript.h @@ -42,9 +42,9 @@ #ifndef QMLSCRIPT_H #define QMLSCRIPT_H -#include +#include #include -#include "qml.h" +#include QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmlsetproperties.h b/src/declarative/util/qmlsetproperties.h index bd036c1..41c189f 100644 --- a/src/declarative/util/qmlsetproperties.h +++ b/src/declarative/util/qmlsetproperties.h @@ -42,7 +42,7 @@ #ifndef QMLSETPROPERTIES_H #define QMLSETPROPERTIES_H -#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/util/qmlstate.h b/src/declarative/util/qmlstate.h index 68c43fa..03a27b2 100644 --- a/src/declarative/util/qmlstate.h +++ b/src/declarative/util/qmlstate.h @@ -43,9 +43,9 @@ #define QMLSTATE_H #include -#include -#include -#include +#include +#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/util/qmlstate_p.h b/src/declarative/util/qmlstate_p.h index 28e1781..a2f18eb 100644 --- a/src/declarative/util/qmlstate_p.h +++ b/src/declarative/util/qmlstate_p.h @@ -42,9 +42,9 @@ #ifndef QMLSTATE_P_H #define QMLSTATE_P_H -#include -#include "private/qobject_p.h" -#include "private/qmlanimation_p.h" +#include +#include +#include QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmlstategroup.h b/src/declarative/util/qmlstategroup.h index 55b84eb..cca1015 100644 --- a/src/declarative/util/qmlstategroup.h +++ b/src/declarative/util/qmlstategroup.h @@ -42,7 +42,7 @@ #ifndef QMLSTATEGROUP_H #define QMLSTATEGROUP_H -#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/util/qmlstateoperations.h b/src/declarative/util/qmlstateoperations.h index 8ecdcd2..720c639 100644 --- a/src/declarative/util/qmlstateoperations.h +++ b/src/declarative/util/qmlstateoperations.h @@ -42,7 +42,7 @@ #ifndef QMLSTATEOPERATIONS_H #define QMLSTATEOPERATIONS_H -#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/util/qmltransition.h b/src/declarative/util/qmltransition.h index 0b7ea14..646746e 100644 --- a/src/declarative/util/qmltransition.h +++ b/src/declarative/util/qmltransition.h @@ -43,9 +43,9 @@ #define QMLTRANSITION_H #include -#include -#include -#include +#include +#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/widgets/graphicslayouts.h b/src/declarative/widgets/graphicslayouts.h index beb4b65..e9930f1 100644 --- a/src/declarative/widgets/graphicslayouts.h +++ b/src/declarative/widgets/graphicslayouts.h @@ -42,9 +42,9 @@ #ifndef GRAPHICSLAYOUTS_H #define GRAPHICSLAYOUTS_H -#include "graphicswidgets.h" -#include -#include +#include +#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/widgets/graphicswidgets.h b/src/declarative/widgets/graphicswidgets.h index 47a753a..cec15b6 100644 --- a/src/declarative/widgets/graphicswidgets.h +++ b/src/declarative/widgets/graphicswidgets.h @@ -42,11 +42,11 @@ #ifndef GRAPHICSWIDGETS_H #define GRAPHICSWIDGETS_H -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include QT_BEGIN_NAMESPACE -- cgit v0.12 From 692782c4d11cf7352a7923633cb015c3580e2704 Mon Sep 17 00:00:00 2001 From: Warwick Allison Date: Mon, 18 May 2009 16:46:12 +1000 Subject: Fix pens. Now corresponds to standard Qt painting; in particular, penwidth extends outside rectangle. Task-number: 249318 --- src/declarative/canvas/qsimplecanvasitem.cpp | 10 +- src/declarative/canvas/qsimplecanvasitem.h | 1 + src/declarative/canvas/qsimplecanvasitem_p.h | 3 +- src/declarative/fx/qfxrect.cpp | 157 ++++++++++++++++----------- src/declarative/fx/qfxrect.h | 2 +- 5 files changed, 108 insertions(+), 65 deletions(-) diff --git a/src/declarative/canvas/qsimplecanvasitem.cpp b/src/declarative/canvas/qsimplecanvasitem.cpp index 12c725c..4449e2b 100644 --- a/src/declarative/canvas/qsimplecanvasitem.cpp +++ b/src/declarative/canvas/qsimplecanvasitem.cpp @@ -180,10 +180,18 @@ void QSimpleCanvasItem::childrenChanged() { } +int QSimpleCanvasItem::setPaintMargin(qreal margin) +{ + Q_D(QSimpleCanvasItem); + if (margin < d->paintmargin) + update(); // schedule repaint of old boundingRect + d->paintmargin = margin; +} + QRectF QSimpleCanvasItem::boundingRect() const { Q_D(const QSimpleCanvasItem); - return QRectF(0., 0., d->width, d->height); + return QRectF(-d->paintmargin, -d->paintmargin, d->width+d->paintmargin*2, d->height+d->paintmargin*2); } void QSimpleCanvasItem::paintContents(QPainter &) diff --git a/src/declarative/canvas/qsimplecanvasitem.h b/src/declarative/canvas/qsimplecanvasitem.h index cab8492..1c729b1 100644 --- a/src/declarative/canvas/qsimplecanvasitem.h +++ b/src/declarative/canvas/qsimplecanvasitem.h @@ -183,6 +183,7 @@ public: }; + int setPaintMargin(qreal margin); QRectF boundingRect() const; virtual void paintContents(QPainter &); virtual void paintGLContents(GLPainter &); diff --git a/src/declarative/canvas/qsimplecanvasitem_p.h b/src/declarative/canvas/qsimplecanvasitem_p.h index cfe0bba..7fe16a3 100644 --- a/src/declarative/canvas/qsimplecanvasitem_p.h +++ b/src/declarative/canvas/qsimplecanvasitem_p.h @@ -139,7 +139,7 @@ public: focusable(false), wantsActiveFocusPanelPendingCanvas(false), hasBeenActiveFocusPanel(false), hasFocus(false), hasActiveFocus(false), needsZOrder(false), - widthValid(false), heightValid(false), width(0), height(0), scale(1), + widthValid(false), heightValid(false), width(0), height(0), paintmargin(0), scale(1), graphicsItem(0), data_ptr(0) { } @@ -173,6 +173,7 @@ public: qreal width; qreal height; + qreal paintmargin; qreal scale; QSimpleGraphicsItem *graphicsItem; diff --git a/src/declarative/fx/qfxrect.cpp b/src/declarative/fx/qfxrect.cpp index dafd8a2..cd5a4c3 100644 --- a/src/declarative/fx/qfxrect.cpp +++ b/src/declarative/fx/qfxrect.cpp @@ -86,8 +86,26 @@ QML_DEFINE_TYPE(QFxPen,Pen); void QFxPen::setColor(const QColor &c) { _color = c; - emit updated(); _valid = _color.alpha() ? true : false; + emit updated(); +} + +/*! + \property QFxPen::width + \brief the width of the pen. + + \qml + // rect with green border using hexidecimal notation + Rect { pen.width: 4 } + \endqml + + Odd pen widths generally lead to half-pixel painting. +*/ +void QFxPen::setWidth(int w) +{ + _width = w; + _valid = (_width < 1) ? false : true; + emit updated(); } @@ -167,6 +185,8 @@ void QFxRect::doUpdate() Q_D(QFxRect); d->_rectTexture.clear(); #endif + const int pw = d->_pen && d->_pen->isValid() ? d->_pen->width() : 0; + setPaintMargin((pw+1)/2); update(); } @@ -372,14 +392,19 @@ void QFxRect::generateRoundedRect() { Q_D(QFxRect); if (d->_rectImage.isNull()) { - d->_rectImage = QImage(d->_radius*2 + 1, d->_radius*2 + 1, QImage::Format_ARGB32_Premultiplied); + const int pw = d->_pen && d->_pen->isValid() ? d->_pen->width() : 0; + d->_rectImage = QImage(d->_radius*2 + 1 + pw*2, d->_radius*2 + 1 + pw*2, QImage::Format_ARGB32_Premultiplied); d->_rectImage.fill(0); QPainter p(&(d->_rectImage)); - QPen pn(QColor(pen()->color()), pen()->width()); p.setRenderHint(QPainter::Antialiasing); - p.setPen(pn); + if (d->_pen && d->_pen->isValid()) { + QPen pn(QColor(pen()->color()), pen()->width()); + p.setPen(pn); + } else { + p.setPen(Qt::NoPen); + } p.setBrush(d->_color); - p.drawRoundedRect(0, 0, d->_rectImage.width(), d->_rectImage.height(), d->_radius, d->_radius); + p.drawRoundedRect((pw+1)/2, (pw+1)/2, d->_rectImage.width()-(pw+1)/2*2, d->_rectImage.height()-(pw+1)/2*2, d->_radius, d->_radius); } } @@ -387,14 +412,19 @@ void QFxRect::generateBorderedRect() { Q_D(QFxRect); if (d->_rectImage.isNull()) { - d->_rectImage = QImage(d->pen()->width()*2 + 1, d->pen()->width()*2 + 1, QImage::Format_ARGB32_Premultiplied); + const int pw = d->_pen && d->_pen->isValid() ? d->_pen->width() : 0; + d->_rectImage = QImage(d->pen()->width()*2 + 1 + pw*2, d->pen()->width()*2 + 1 + pw*2, QImage::Format_ARGB32_Premultiplied); d->_rectImage.fill(0); QPainter p(&(d->_rectImage)); - QPen pn(QColor(pen()->color()), pen()->width()); p.setRenderHint(QPainter::Antialiasing); - p.setPen(pn); + if (d->_pen && d->_pen->isValid()) { + QPen pn(QColor(pen()->color()), pen()->width()); + p.setPen(pn); + } else { + p.setPen(Qt::NoPen); + } p.setBrush(d->_color); - p.drawRect(0, 0, d->_rectImage.width(), d->_rectImage.height()); + p.drawRect(qreal(pw+1)/2, qreal(pw+1)/2, d->_rectImage.width()-(pw+1)/2*2, d->_rectImage.height()-(pw+1)/2*2); } } #elif defined(QFX_RENDER_OPENGL) @@ -402,14 +432,15 @@ void QFxRect::generateRoundedRect() { Q_D(QFxRect); if (d->_rectTexture.isNull()) { - QImage roundRect(int(d->_radius*2 + 1), int(d->_radius*2 + 1), QImage::Format_ARGB32); + const int pw = d->_pen && d->_pen->isValid() ? d->_pen->width() : 0; + QImage roundRect(d->_radius*2 + 4 + pw*2, d->_radius*2 + 4 + pw*2, QImage::Format_ARGB32_Premultiplied); roundRect.fill(0); QPainter p(&roundRect); QPen pn(QColor(pen()->color()), pen()->width()); p.setRenderHint(QPainter::Antialiasing); p.setPen(pn); p.setBrush(d->_color); - p.drawRoundedRect(0, 0, roundRect.width(), roundRect.height(), d->_radius, d->_radius); + p.drawRoundedRect((pw+1)/2, (pw+1)/2, roundRect.width()-(pw+1)/2*2, roundRect.height()-(pw+1)/2*2, d->_radius, d->_radius); d->_rectTexture.setImage(roundRect); } } @@ -418,14 +449,15 @@ void QFxRect::generateBorderedRect() { Q_D(QFxRect); if (d->_rectTexture.isNull()) { - QImage borderedRect(d->pen()->width()*2 + 1, d->pen()->width()*2 + 1, QImage::Format_ARGB32_Premultiplied); + const int pw = d->_pen && d->_pen->isValid() ? d->_pen->width() : 0; + QImage borderedRect(pw*2 + 4, pw*2 + 4, QImage::Format_ARGB32_Premultiplied); borderedRect.fill(0); QPainter p(&(borderedRect)); QPen pn(QColor(pen()->color()), pen()->width()); p.setRenderHint(QPainter::Antialiasing); p.setPen(pn); p.setBrush(d->_color); - p.drawRect(0, 0, borderedRect.width(), borderedRect.height()); + p.drawRect(qreal(pw+1)/2, qreal(pw+1)/2, borderedRect.width()-(pw+1)/2*2, borderedRect.height()-(pw+1)/2*2); d->_rectTexture.setImage(borderedRect); } } @@ -458,9 +490,13 @@ void QFxRect::drawRect(QPainter &p) // XXX This path is still slower than the image path // Image path won't work for gradients though p.save(); - QPen pn(QColor(pen()->color()), pen()->width()); p.setRenderHint(QPainter::Antialiasing); - p.setPen(pn); + if (d->_pen && d->_pen->isValid()) { + QPen pn(QColor(pen()->color()), pen()->width()); + p.setPen(pn); + } else { + p.setPen(Qt::NoPen); + } if (d->_gradcolor.isValid()){ QLinearGradient grad(0, 0, 0, height()); grad.setColorAt(0, d->_color); @@ -476,13 +512,15 @@ void QFxRect::drawRect(QPainter &p) p.restore(); } else { int offset = 0; + const int pw = d->_pen && d->_pen->isValid() ? (d->_pen->width()+1)/2*2 : 0; + if (d->_radius > 0) { generateRoundedRect(); //### implicit conversion to int - offset = d->_radius; + offset = int(d->_radius+0.5+pw); } else { generateBorderedRect(); - offset = d->pen()->width(); + offset = pw; } //basically same code as QFxImage uses to paint sci images @@ -490,40 +528,42 @@ void QFxRect::drawRect(QPainter &p) int ySide = qMin(offset * 2, int(height()));; // Upper left - p.drawImage(QRect(0, 0, offset, offset), d->_rectImage, QRect(0, 0, offset, offset)); + p.drawImage(QRect(-pw/2, -pw/2, offset, offset), d->_rectImage, QRect(0, 0, offset, offset)); // Upper middle if (d->_rectImage.width() - xSide) - p.drawImage(QRect(offset, 0, width() - xSide, offset), d->_rectImage, - QRect(offset, 0, d->_rectImage.width() - xSide, offset)); + p.drawImage(QRect(offset-pw/2, -pw/2, width() - xSide + pw, offset), d->_rectImage, + QRect(d->_rectImage.width()/2, 0, 1, offset)); // Upper right if (d->_rectImage.width() - offset) { - p.drawImage(QPoint(width()-offset, 0), d->_rectImage, + p.drawImage(QPoint(width()-offset+pw/2, -pw/2), d->_rectImage, QRect(d->_rectImage.width()-offset, 0, offset, offset)); } // Middle left if (d->_rectImage.height() - ySide) - p.drawImage(QRect(0, offset, offset, height() - ySide), d->_rectImage, - QRect(0, offset, offset, d->_rectImage.height() - ySide)); + p.drawImage(QRect(-pw/2, offset-pw/2, offset, height() - ySide + pw), d->_rectImage, + QRect(0, d->_rectImage.height()/2, offset, 1)); // Middle if (d->_rectImage.width() - xSide && d->_rectImage.height() - ySide) - p.drawImage(QRect(offset, offset, width() - xSide, height() - ySide), d->_rectImage, - QRect(offset, offset, d->_rectImage.width() - xSide, d->_rectImage.height() - ySide)); - // Midlle right + // XXX paint errors in animation example + //p.fillRect(offset-pw/2, offset-pw/2, width() - xSide + pw, height() - ySide + pw, d->getColor()); + p.drawImage(QRect(offset-pw/2, offset-pw/2, width() - xSide + pw, height() - ySide + pw), d->_rectImage, + QRect(d->_rectImage.width()/2, d->_rectImage.height()/2, 1, 1)); + // Middle right if (d->_rectImage.height() - ySide) - p.drawImage(QRect(width()-offset, offset, offset, height() - ySide), d->_rectImage, - QRect(d->_rectImage.width()-offset, offset, offset, d->_rectImage.height() - ySide)); + p.drawImage(QRect(width()-offset+pw/2, offset-pw/2, offset, height() - ySide + pw), d->_rectImage, + QRect(d->_rectImage.width()-offset, d->_rectImage.height()/2, offset, 1)); // Lower left - p.drawImage(QPoint(0, height() - offset), d->_rectImage, QRect(0, d->_rectImage.height() - offset, offset, offset)); + p.drawImage(QPoint(-pw/2, height() - offset + pw/2), d->_rectImage, QRect(0, d->_rectImage.height() - offset, offset, offset)); // Lower Middle if (d->_rectImage.width() - xSide) - p.drawImage(QRect(offset, height() - offset, width() - xSide, offset), d->_rectImage, - QRect(offset, d->_rectImage.height() - offset, d->_rectImage.width() - xSide, offset)); + p.drawImage(QRect(offset-pw/2, height() - offset +pw/2, width() - xSide + pw, offset), d->_rectImage, + QRect(d->_rectImage.width()/2, d->_rectImage.height() - offset, 1, offset)); // Lower Right if (d->_rectImage.width() - offset) - p.drawImage(QPoint(width()-offset, height() - offset), d->_rectImage, + p.drawImage(QPoint(width()-offset+pw/2, height() - offset+pw/2), d->_rectImage, QRect(d->_rectImage.width()-offset, d->_rectImage.height() - offset, offset, offset)); } } @@ -586,12 +626,14 @@ void QFxRect::paintGLContents(GLPainter &p) } } else { qreal offset = 0; + qreal pw = d->_pen && d->_pen->isValid() ? d->_pen->width() : 0.0; + if (d->_radius > 0) { generateRoundedRect(); - offset = d->_radius; + offset = d->_radius + pw+1.5; } else { generateBorderedRect(); - offset = d->pen()->width(); + offset = pw+1.5; } QGLShaderProgram *shader = p.useTextureShader(); @@ -601,38 +643,29 @@ void QFxRect::paintGLContents(GLPainter &p) if (!imgWidth || !imgHeight) return; - float widthV = width(); - float heightV = height(); + float widthV = qreal(width())+pw/2; + float heightV = qreal(height())+pw/2; - float texleft = 0; - float texright = 1; - float textop = 1; - float texbottom = 0; - float imgleft = 0; - float imgright = widthV; - float imgtop = 0; - float imgbottom = heightV; - - texleft = float(offset) / imgWidth; - imgleft = offset; - texright = 1. - float(offset) / imgWidth; - imgright = widthV - offset; - textop = 1. - float(offset) / imgHeight; - imgtop = offset; - texbottom = float(offset) / imgHeight; - imgbottom = heightV - offset; + float texleft = float(offset) / imgWidth; + float imgleft = offset-pw/2; + float texright = float(imgWidth-offset) / imgWidth; + float imgright = widthV - offset; + float textop = float(imgHeight-offset) / imgHeight; + float imgtop = offset-pw/2; + float texbottom = float(offset) / imgHeight; + float imgbottom = heightV - offset; //Bug 231768: Inappropriate interpolation was occuring on 3x3 textures if (offset==1) texleft=texright=textop=texbottom=0.5; - float vert1[] = { 0, 0, - 0, imgtop, - imgleft, 0, + float vert1[] = { -pw/2, -pw/2, + -pw/2, imgtop, + imgleft, -pw/2, imgleft, imgtop, - imgright, 0, + imgright, -pw/2, imgright, imgtop, - widthV, 0, + widthV, -pw/2, widthV, imgtop }; float tex1[] = { 0, 0, 0, textop, @@ -642,8 +675,8 @@ void QFxRect::paintGLContents(GLPainter &p) texright, textop, 1, 0, 1, textop }; - float vert2[] = { 0, imgtop, - 0, imgbottom, + float vert2[] = { -pw/2, imgtop, + -pw/2, imgbottom, imgleft, imgtop, imgleft, imgbottom, imgright, imgtop, @@ -658,8 +691,8 @@ void QFxRect::paintGLContents(GLPainter &p) texright, texbottom, 1, textop, 1, texbottom }; - float vert3[] = { 0, imgbottom, - 0, heightV, + float vert3[] = { -pw/2, imgbottom, + -pw/2, heightV, imgleft, imgbottom, imgleft, heightV, imgright, imgbottom, diff --git a/src/declarative/fx/qfxrect.h b/src/declarative/fx/qfxrect.h index 42e7b2f..339a7d8 100644 --- a/src/declarative/fx/qfxrect.h +++ b/src/declarative/fx/qfxrect.h @@ -62,7 +62,7 @@ public: {} int width() const { return _width; } - void setWidth(int w) { _width = w; emit updated(); _valid = (_width < 1) ? false : true; } + void setWidth(int w); QColor color() const { return _color; } void setColor(const QColor &c); -- cgit v0.12 From 3b97e2d22ac184590b5049cff720a259f9aa6b42 Mon Sep 17 00:00:00 2001 From: Warwick Allison Date: Tue, 19 May 2009 12:41:06 +1000 Subject: Fix pens, at small sizes See 504c489d40e815397235ba26df7f06aae821c88a Also fixes 0 width (hairline) pens. --- src/declarative/fx/qfxrect.cpp | 147 +++++++++++++++++++++++++---------------- src/declarative/fx/qfxrect.h | 2 +- 2 files changed, 90 insertions(+), 59 deletions(-) diff --git a/src/declarative/fx/qfxrect.cpp b/src/declarative/fx/qfxrect.cpp index 6f13d7c..b61baec 100644 --- a/src/declarative/fx/qfxrect.cpp +++ b/src/declarative/fx/qfxrect.cpp @@ -52,6 +52,11 @@ QML_DEFINE_TYPE(QFxPen,Pen); \ingroup group_utility \brief The QFxPen class provides a pen used for drawing rect borders on a QFxView. + By default, the pen is invalid and nothing is drawn. You must either set a color (then the default + width is 0) or a width (then the default color is black). + + A width of 0 is a single-pixel line on the border of the item being painted. + Example: \qml Rect { pen.width: 2; pen.color: "red" ... } @@ -61,8 +66,9 @@ QML_DEFINE_TYPE(QFxPen,Pen); /*! \property QFxPen::width \brief the width of the pen. - The default width is 1. If the width is less than 1 the pen is considered invalid - and won't be used. + A width of 0 is a single-pixel line on the border of the item being painted. + + If the width is less than 0 the pen is considered invalid and won't be used. */ /*! @@ -99,12 +105,14 @@ void QFxPen::setColor(const QColor &c) Rect { pen.width: 4 } \endqml + A width of 0 creates a thin line. For no line, use a negative width or a transparent color. + Odd pen widths generally lead to half-pixel painting. */ void QFxPen::setWidth(int w) { _width = w; - _valid = (_width < 1) ? false : true; + _valid = (_width < 0) ? false : true; emit updated(); } @@ -436,9 +444,13 @@ void QFxRect::generateRoundedRect() QImage roundRect(d->_radius*2 + 4 + pw*2, d->_radius*2 + 4 + pw*2, QImage::Format_ARGB32_Premultiplied); roundRect.fill(0); QPainter p(&roundRect); - QPen pn(QColor(pen()->color()), pen()->width()); p.setRenderHint(QPainter::Antialiasing); - p.setPen(pn); + if (d->_pen && d->_pen->isValid()) { + QPen pn(QColor(pen()->color()), pen()->width()); + p.setPen(pn); + } else { + p.setPen(Qt::NoPen); + } p.setBrush(d->_color); p.drawRoundedRect((pw+1)/2, (pw+1)/2, roundRect.width()-(pw+1)/2*2, roundRect.height()-(pw+1)/2*2, d->_radius, d->_radius); d->_rectTexture.setImage(roundRect); @@ -453,9 +465,13 @@ void QFxRect::generateBorderedRect() QImage borderedRect(pw*2 + 4, pw*2 + 4, QImage::Format_ARGB32_Premultiplied); borderedRect.fill(0); QPainter p(&(borderedRect)); - QPen pn(QColor(pen()->color()), pen()->width()); p.setRenderHint(QPainter::Antialiasing); - p.setPen(pn); + if (d->_pen && d->_pen->isValid()) { + QPen pn(QColor(pen()->color()), pen()->width()); + p.setPen(pn); + } else { + p.setPen(Qt::NoPen); + } p.setBrush(d->_color); p.drawRect(qreal(pw+1)/2, qreal(pw+1)/2, borderedRect.width()-(pw+1)/2*2, borderedRect.height()-(pw+1)/2*2); d->_rectTexture.setImage(borderedRect); @@ -524,18 +540,22 @@ void QFxRect::drawRect(QPainter &p) } //basically same code as QFxImage uses to paint sci images - int w = width(); - int h = height(); + int w = width()+pw; + int h = height()+pw; int xOffset = offset; int xSide = xOffset * 2; + bool xMiddles=true; if (xSide > w) { - xOffset = w/2; + xMiddles=false; + xOffset = w/2 + 1; xSide = xOffset * 2; } int yOffset = offset; int ySide = yOffset * 2; + bool yMiddles=true; if (ySide > h) { - yOffset = h/2; + yMiddles = false; + yOffset = h/2 + 1; ySide = yOffset * 2; } @@ -543,40 +563,37 @@ void QFxRect::drawRect(QPainter &p) p.drawImage(QRect(-pw/2, -pw/2, xOffset, yOffset), d->_rectImage, QRect(0, 0, xOffset, yOffset)); // Upper middle - if (d->_rectImage.width() - xSide) + if (xMiddles) p.drawImage(QRect(xOffset-pw/2, -pw/2, width() - xSide + pw, yOffset), d->_rectImage, QRect(d->_rectImage.width()/2, 0, 1, yOffset)); // Upper right - if (d->_rectImage.width() - xOffset) { - p.drawImage(QPoint(width()-xOffset+pw/2, -pw/2), d->_rectImage, - QRect(d->_rectImage.width()-xOffset, 0, xOffset, yOffset)); - } + p.drawImage(QPoint(width()-xOffset+pw/2, -pw/2), d->_rectImage, + QRect(d->_rectImage.width()-xOffset, 0, xOffset, yOffset)); // Middle left - if (d->_rectImage.height() - ySide) + if (yMiddles) p.drawImage(QRect(-pw/2, yOffset-pw/2, xOffset, height() - ySide + pw), d->_rectImage, QRect(0, d->_rectImage.height()/2, xOffset, 1)); // Middle - if (d->_rectImage.width() - xSide && d->_rectImage.height() - ySide) + if (xMiddles && yMiddles) // XXX paint errors in animation example //p.fillRect(xOffset-pw/2, yOffset-pw/2, width() - xSide + pw, height() - ySide + pw, d->getColor()); p.drawImage(QRect(xOffset-pw/2, yOffset-pw/2, width() - xSide + pw, height() - ySide + pw), d->_rectImage, QRect(d->_rectImage.width()/2, d->_rectImage.height()/2, 1, 1)); // Middle right - if (d->_rectImage.height() - ySide) + if (yMiddles) p.drawImage(QRect(width()-xOffset+pw/2, yOffset-pw/2, xOffset, height() - ySide + pw), d->_rectImage, QRect(d->_rectImage.width()-xOffset, d->_rectImage.height()/2, xOffset, 1)); // Lower left p.drawImage(QPoint(-pw/2, height() - yOffset + pw/2), d->_rectImage, QRect(0, d->_rectImage.height() - yOffset, xOffset, yOffset)); // Lower Middle - if (d->_rectImage.width() - xSide) + if (xMiddles) p.drawImage(QRect(xOffset-pw/2, height() - yOffset +pw/2, width() - xSide + pw, yOffset), d->_rectImage, QRect(d->_rectImage.width()/2, d->_rectImage.height() - yOffset, 1, yOffset)); // Lower Right - if (d->_rectImage.width() - xOffset) - p.drawImage(QPoint(width()-xOffset+pw/2, height() - yOffset+pw/2), d->_rectImage, - QRect(d->_rectImage.width()-xOffset, d->_rectImage.height() - yOffset, xOffset, yOffset)); + p.drawImage(QPoint(width()-xOffset+pw/2, height() - yOffset+pw/2), d->_rectImage, + QRect(d->_rectImage.width()-xOffset, d->_rectImage.height() - yOffset, xOffset, yOffset)); } } #endif @@ -650,22 +667,36 @@ void QFxRect::paintGLContents(GLPainter &p) QGLShaderProgram *shader = p.useTextureShader(); - float imgWidth = d->_rectTexture.width(); - float imgHeight = d->_rectTexture.height(); - if (!imgWidth || !imgHeight) + float texWidth = d->_rectTexture.width(); + float texHeight = d->_rectTexture.height(); + if (!texWidth || !texHeight) return; float widthV = qreal(width())+pw/2; float heightV = qreal(height())+pw/2; - float texleft = float(offset) / imgWidth; - float imgleft = offset-pw/2; - float texright = float(imgWidth-offset) / imgWidth; - float imgright = widthV - offset; - float textop = float(imgHeight-offset) / imgHeight; - float imgtop = offset-pw/2; - float texbottom = float(offset) / imgHeight; - float imgbottom = heightV - offset; + float xOffset = offset; + bool xMiddles = true; + if (xOffset*2 > width()+pw) { + xMiddles = false; + xOffset = (width()+pw)/2; + } + float yOffset = offset; + bool yMiddles = true; + if (yOffset*2 > height()+pw) { + yMiddles = false; + yOffset = (height()+pw)/2; + } + + float texleft = xOffset / texWidth; + float imgleft = xOffset-pw/2; + float texright = (texWidth-xOffset) / texWidth; + float imgright = widthV - xOffset; + + float textop = yOffset / texHeight; + float imgtop = yOffset-pw/2; + float texbottom = (texHeight-yOffset) / texHeight; + float imgbottom = heightV - yOffset; //Bug 231768: Inappropriate interpolation was occuring on 3x3 textures if (offset==1) @@ -703,31 +734,31 @@ void QFxRect::paintGLContents(GLPainter &p) texright, texbottom, 1, textop, 1, texbottom }; - float vert3[] = { -pw/2, imgbottom, - -pw/2, heightV, - imgleft, imgbottom, + float vert3[] = { -pw/2, heightV, + -pw/2, imgbottom, imgleft, heightV, - imgright, imgbottom, + imgleft, imgbottom, imgright, heightV, - widthV, imgbottom, - widthV, heightV }; - float tex3[] = { 0, texbottom, - 0, 0, + imgright, imgbottom, + widthV, heightV, + widthV, imgbottom }; + float tex3[] = { 0, 1, + 0, texbottom, + texleft, 1, texleft, texbottom, - texleft, 0, + texright, 1, texright, texbottom, - texright, 0, - 1, texbottom, - 1, 0 }; - - glBindTexture(GL_TEXTURE_2D, d->_rectTexture.texture()); + 1, 1, + 1, texbottom }; shader->setAttributeArray(SingleTextureShader::Vertices, vert1, 2); shader->setAttributeArray(SingleTextureShader::TextureCoords, tex1, 2); glDrawArrays(GL_TRIANGLE_STRIP, 0, 8); - shader->setAttributeArray(SingleTextureShader::Vertices, vert2, 2); - shader->setAttributeArray(SingleTextureShader::TextureCoords, tex2, 2); - glDrawArrays(GL_TRIANGLE_STRIP, 0, 8); + if (yMiddles) { + shader->setAttributeArray(SingleTextureShader::Vertices, vert2, 2); + shader->setAttributeArray(SingleTextureShader::TextureCoords, tex2, 2); + glDrawArrays(GL_TRIANGLE_STRIP, 0, 8); + } shader->setAttributeArray(SingleTextureShader::Vertices, vert3, 2); shader->setAttributeArray(SingleTextureShader::TextureCoords, tex3, 2); glDrawArrays(GL_TRIANGLE_STRIP, 0, 8); @@ -806,9 +837,9 @@ void QFxRect::paintGLContents(GLPainter &p) glColor4f(1, 1, 1, p.activeOpacity); } - float imgWidth = d->_rectTexture.width(); - float imgHeight = d->_rectTexture.height(); - if (!imgWidth || !imgHeight) + float texWidth = d->_rectTexture.width(); + float texHeight = d->_rectTexture.height(); + if (!texWidth || !texHeight) return; float widthV = width(); @@ -823,13 +854,13 @@ void QFxRect::paintGLContents(GLPainter &p) float imgtop = 0; float imgbottom = heightV; - texleft = float(offset) / imgWidth; + texleft = float(offset) / texWidth; imgleft = offset; - texright = 1. - float(offset) / imgWidth; + texright = 1. - float(offset) / texWidth; imgright = widthV - offset; - textop = 1. - float(offset) / imgHeight; + textop = 1. - float(offset) / texHeight; imgtop = offset; - texbottom = float(offset) / imgHeight; + texbottom = float(offset) / texHeight; imgbottom = heightV - offset; float vert1[] = { 0, 0, diff --git a/src/declarative/fx/qfxrect.h b/src/declarative/fx/qfxrect.h index 339a7d8..84a9c57 100644 --- a/src/declarative/fx/qfxrect.h +++ b/src/declarative/fx/qfxrect.h @@ -58,7 +58,7 @@ class Q_DECLARATIVE_EXPORT QFxPen : public QObject Q_PROPERTY(QColor color READ color WRITE setColor) public: QFxPen(QObject *parent=0) - : QObject(parent), _width(1), _color("#000000"), _valid(false) + : QObject(parent), _width(0), _color("#000000"), _valid(false) {} int width() const { return _width; } -- cgit v0.12 From 8c2f6d4b70bc6e3579c99b49a1dd842678bd7ebe Mon Sep 17 00:00:00 2001 From: Michael Brasser Date: Tue, 19 May 2009 16:44:16 +1000 Subject: Make sure Flippable updates its back transform correctly. Previously we didn't update the back transform on geometry changes to the back element. Now we make sure it is up-to-date whenever we show it. Also updated anchors (they no longer need to work around this). --- src/declarative/fx/qfxanchors.cpp | 1 - src/declarative/fx/qfxflipable.cpp | 7 +++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/declarative/fx/qfxanchors.cpp b/src/declarative/fx/qfxanchors.cpp index 3eaf47a..235511f 100644 --- a/src/declarative/fx/qfxanchors.cpp +++ b/src/declarative/fx/qfxanchors.cpp @@ -234,7 +234,6 @@ void QFxAnchorsPrivate::remDepend(QFxItem *item) bool QFxAnchorsPrivate::isItemComplete() const { - return true; return item->isComponentComplete(); } diff --git a/src/declarative/fx/qfxflipable.cpp b/src/declarative/fx/qfxflipable.cpp index 24ae428..edcc7cb 100644 --- a/src/declarative/fx/qfxflipable.cpp +++ b/src/declarative/fx/qfxflipable.cpp @@ -169,7 +169,6 @@ void QFxFlipable::setBack(QFxItem *back) children()->append(d->back); if (Front == d->current) d->back->setOpacity(0.); - d->setBackTransform(); } /*! @@ -203,8 +202,6 @@ void QFxFlipablePrivate::_q_updateAxis() axisRotation.axis()->setEndX(axis->endX()); axisRotation.axis()->setEndY(axis->endY()); axisRotation.axis()->setEndZ(axis->endZ()); - - setBackTransform(); } void QFxFlipablePrivate::setBackTransform() @@ -273,8 +270,10 @@ void QFxFlipable::setRotation(qreal angle) d->current = newSide; if (d->front) d->front->setOpacity((d->current==Front)?1.:0.); - if (d->back) + if (d->back) { + d->setBackTransform(); d->back->setOpacity((d->current==Back)?1.:0.); + } emit sideChanged(); } } -- cgit v0.12 From 3eb9a9404544a7b954d18f19d373883d0623da93 Mon Sep 17 00:00:00 2001 From: Warwick Allison Date: Tue, 19 May 2009 17:31:46 +1000 Subject: More precise positioning to leave 1-pixel inner margin --- demos/declarative/flickr/content/Progress.qml | 2 +- demos/declarative/flickr/content/Slider.qml | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/demos/declarative/flickr/content/Progress.qml b/demos/declarative/flickr/content/Progress.qml index 92a232e..aa2a2e6 100644 --- a/demos/declarative/flickr/content/Progress.qml +++ b/demos/declarative/flickr/content/Progress.qml @@ -5,7 +5,7 @@ Item { Rect { id: Container; anchors.fill: parent; gradientColor: "#66000000"; - pen.color: "white"; pen.width: 1; color: "#66343434"; radius: height/2 - 2 + pen.color: "white"; pen.width: 0; color: "#66343434"; radius: height/2 - 2 } Rect { diff --git a/demos/declarative/flickr/content/Slider.qml b/demos/declarative/flickr/content/Slider.qml index 92f4993..aae4631 100644 --- a/demos/declarative/flickr/content/Slider.qml +++ b/demos/declarative/flickr/content/Slider.qml @@ -3,25 +3,25 @@ Item { // value is read/write. property real value - onValueChanged: { Handle.x = (value - minimum) * Slider.xMax / (maximum - minimum); } + onValueChanged: { Handle.x = 2 + (value - minimum) * Slider.xMax / (maximum - minimum); } property real maximum: 1 property real minimum: 1 - property int xMax: Slider.width - Handle.width - 2 + property int xMax: Slider.width - Handle.width - 4 Rect { id: Container; anchors.fill: parent; gradientColor: "#66000000"; - pen.color: "white"; pen.width: 1; color: "#66343434"; radius: 8 + pen.color: "white"; pen.width: 0; color: "#66343434"; radius: 8 } Rect { id: Handle - x: Slider.width / 2 - Handle.width / 2; y: 2; width: 30; height: 12 + x: Slider.width / 2 - Handle.width / 2; y: 2; width: 30; height: Slider.height-4 color: "lightgray"; gradientColor: "gray"; radius: 6 MouseRegion { anchors.fill: parent; drag.target: parent - drag.axis: "x"; drag.xmin: 2; drag.xmax: Slider.xMax - onPositionChanged: { value = (maximum - minimum) * Handle.x / Slider.xMax + minimum; } + drag.axis: "x"; drag.xmin: 2; drag.xmax: Slider.xMax+2 + onPositionChanged: { value = (maximum - minimum) * (Handle.x-2) / Slider.xMax + minimum; } } } } -- cgit v0.12 From 2d8a925309d2b5bfbff19df8bf607ccf3a343930 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Tue, 19 May 2009 09:39:44 +0200 Subject: Added QmlEngine::componentSearchPath() componentSearchPath() returns the list of urls (folders) inspected by qml to locate sub components. This is used in Bauhaus. Autotests have been stored in new "declarative/qmlengine" directory. --- src/declarative/qml/qmlengine.cpp | 29 +++++++++++++++ src/declarative/qml/qmlengine.h | 2 + tests/auto/declarative/declarative.pro | 3 +- tests/auto/declarative/qmlengine/qmlengine.pro | 5 +++ tests/auto/declarative/qmlengine/tst_qmlengine.cpp | 43 ++++++++++++++++++++++ 5 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 tests/auto/declarative/qmlengine/qmlengine.pro create mode 100644 tests/auto/declarative/qmlengine/tst_qmlengine.cpp diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp index 0209c1d..425cba4 100644 --- a/src/declarative/qml/qmlengine.cpp +++ b/src/declarative/qml/qmlengine.cpp @@ -615,6 +615,35 @@ QUrl QmlEngine::componentUrl(const QUrl& src, const QUrl& baseUrl) const } /*! + Returns the list of base urls the engine browses to find sub-components. + + The search path consists of the base of the \a url, and, in the case of local files, + the directories imported using the "import" statement in \a qml. + */ +QList QmlEngine::componentSearchPath(const QByteArray &qml, const QUrl &url) const +{ + QList searchPath; + + searchPath << url.resolved(QUrl(QLatin1String("."))); + + if (QFileInfo(url.toLocalFile()).exists()) { + QmlScriptParser parser; + if (parser.parse(qml, url)) { + for (int i = 0; i < parser.imports().size(); ++i) { + QUrl importUrl = QUrl(parser.imports().at(i).uri); + if (importUrl.isRelative()) { + searchPath << url.resolved(importUrl); + } else { + searchPath << importUrl; + } + } + } + } + + return searchPath; +} + +/*! Sets the common QNetworkAccessManager, \a network, used by all QML elements instantiated by this engine. diff --git a/src/declarative/qml/qmlengine.h b/src/declarative/qml/qmlengine.h index fde84d4..9382389 100644 --- a/src/declarative/qml/qmlengine.h +++ b/src/declarative/qml/qmlengine.h @@ -78,6 +78,8 @@ public: QMap nameSpacePaths() const; QUrl componentUrl(const QUrl& src, const QUrl& baseUrl) const; + QList componentSearchPath(const QByteArray &qml, const QUrl &url) const; + void setNetworkAccessManager(QNetworkAccessManager *); QNetworkAccessManager *networkAccessManager() const; diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro index b6e3584..14d8c24 100644 --- a/tests/auto/declarative/declarative.pro +++ b/tests/auto/declarative/declarative.pro @@ -14,7 +14,8 @@ SUBDIRS += datetimeformatter \ qmlmetaproperty \ qmllist \ qmllistaccessor \ - visual + visual\ + qmlengine # Tests which should run in Pulse PULSE_TESTS = $$SUBDIRS diff --git a/tests/auto/declarative/qmlengine/qmlengine.pro b/tests/auto/declarative/qmlengine/qmlengine.pro new file mode 100644 index 0000000..4ac81e9 --- /dev/null +++ b/tests/auto/declarative/qmlengine/qmlengine.pro @@ -0,0 +1,5 @@ +load(qttest_p4) +contains(QT_CONFIG,declarative): QT += declarative +SOURCES += tst_qmlengine.cpp + +DEFINES += SRCDIR=\\\"$$PWD\\\" diff --git a/tests/auto/declarative/qmlengine/tst_qmlengine.cpp b/tests/auto/declarative/qmlengine/tst_qmlengine.cpp new file mode 100644 index 0000000..9a04c61 --- /dev/null +++ b/tests/auto/declarative/qmlengine/tst_qmlengine.cpp @@ -0,0 +1,43 @@ +#include +#include + +#include +#include +#include + +class tst_qmlengine : public QObject +{ + Q_OBJECT +public: + tst_qmlengine() {} + +private slots: + void componentSearchPath(); +}; + + +void tst_qmlengine::componentSearchPath() +{ + QFile file(SRCDIR "/imports.qml"); + QVERIFY(file.open(QIODevice::ReadOnly)); + + QmlEngine engine; + + QList searchPath = engine.componentSearchPath(file.readAll(), + QUrl::fromLocalFile(file.fileName())); + + QList expected; + expected << QUrl::fromLocalFile(SRCDIR); + expected << QUrl::fromLocalFile(file.fileName()).resolved(QUrl("import1")); + expected << QUrl::fromLocalFile(file.fileName()).resolved(QUrl("import2")); + + QCOMPARE(searchPath.size(), expected.size()); + for (int i = 0; i < expected.size(); ++i) { + QCOMPARE(searchPath.at(i).toString(QUrl::StripTrailingSlash), + expected.at(i).toString(QUrl::StripTrailingSlash)); + } +} + +QTEST_MAIN(tst_qmlengine) + +#include "tst_qmlengine.moc" -- cgit v0.12 From 4871ff0563cf8a9691db8b084dce012aeb5abf47 Mon Sep 17 00:00:00 2001 From: Aaron Kennedy Date: Tue, 19 May 2009 18:46:43 +1000 Subject: Add a SetProperties::restoreEntryValues property to store the state restoring property entry values --- src/declarative/util/qmlsetproperties.cpp | 18 +++++++++++++++++- src/declarative/util/qmlsetproperties.h | 4 ++++ src/declarative/util/qmlstate.cpp | 4 ++-- src/declarative/util/qmlstate.h | 1 + 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/src/declarative/util/qmlsetproperties.cpp b/src/declarative/util/qmlsetproperties.cpp index 34d3b00..c986864 100644 --- a/src/declarative/util/qmlsetproperties.cpp +++ b/src/declarative/util/qmlsetproperties.cpp @@ -113,13 +113,15 @@ class QmlSetPropertiesPrivate : public QObjectPrivate { Q_DECLARE_PUBLIC(QmlSetProperties) public: - QmlSetPropertiesPrivate() : object(0), decoded(true) {} + QmlSetPropertiesPrivate() : object(0), decoded(true), restore(true) {} QObject *object; QByteArray data; bool decoded; void decode(); + bool restore; + QList > properties; QList > expressions; @@ -264,6 +266,18 @@ void QmlSetProperties::setObject(QObject *o) d->object = o; } +bool QmlSetProperties::restoreEntryValues() const +{ + Q_D(const QmlSetProperties); + return d->restore; +} + +void QmlSetProperties::setRestoreEntryValues(bool v) +{ + Q_D(QmlSetProperties); + d->restore = v; +} + QmlMetaProperty QmlSetPropertiesPrivate::property(const QByteArray &property) { @@ -314,6 +328,7 @@ QmlSetProperties::ActionList QmlSetProperties::actions() if (prop.isValid()) { Action a; + a.restore = restoreEntryValues(); a.property = prop; a.fromValue = a.property.read(); a.toValue = d->properties.at(ii).second; @@ -329,6 +344,7 @@ QmlSetProperties::ActionList QmlSetProperties::actions() if (prop.isValid()) { Action a; + a.restore = restoreEntryValues(); a.property = prop; a.fromValue = a.property.read(); a.toValue = d->expressions.at(ii).second->value(); diff --git a/src/declarative/util/qmlsetproperties.h b/src/declarative/util/qmlsetproperties.h index bd036c1..6d313b7 100644 --- a/src/declarative/util/qmlsetproperties.h +++ b/src/declarative/util/qmlsetproperties.h @@ -58,6 +58,7 @@ class Q_DECLARATIVE_EXPORT QmlSetProperties : public QmlStateOperation Q_DECLARE_PRIVATE(QmlSetProperties); Q_PROPERTY(QObject *target READ object WRITE setObject); + Q_PROPERTY(bool restoreEntryValues READ restoreEntryValues WRITE setRestoreEntryValues); public: QmlSetProperties(); ~QmlSetProperties(); @@ -65,6 +66,9 @@ public: QObject *object() const; void setObject(QObject *); + bool restoreEntryValues() const; + void setRestoreEntryValues(bool); + virtual ActionList actions(); }; QML_DECLARE_TYPE(QmlSetProperties); diff --git a/src/declarative/util/qmlstate.cpp b/src/declarative/util/qmlstate.cpp index 194cc1b..6261003 100644 --- a/src/declarative/util/qmlstate.cpp +++ b/src/declarative/util/qmlstate.cpp @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE DEFINE_BOOL_CONFIG_OPTION(stateChangeDebug, STATECHANGE_DEBUG); -Action::Action() : bv(0), event(0), actionDone(false) +Action::Action() : restore(true), bv(0), event(0), actionDone(false) { } @@ -344,7 +344,7 @@ void QmlState::apply(QmlStateGroup *group, QmlTransition *trans, QmlState *rever for (int ii = 0; ii < applyList.count(); ++ii) { const Action &action = applyList.at(ii); - if (action.event) + if (action.event || !action.restore) continue; bool found = false; diff --git a/src/declarative/util/qmlstate.h b/src/declarative/util/qmlstate.h index 68c43fa..dd9d6ab 100644 --- a/src/declarative/util/qmlstate.h +++ b/src/declarative/util/qmlstate.h @@ -61,6 +61,7 @@ public: Action(); QmlMetaProperty property; + bool restore; QVariant fromValue; QVariant toValue; QString fromBinding; -- cgit v0.12 From 21b1acda8aa202c6bd086344888ecb29757fe5bf Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Tue, 19 May 2009 12:43:51 +0200 Subject: make the web browser URL field work a little better The return key still doesn't do what it should do, but that's partly the fault of the KeyProxy's QML definition not working correctly. --- demos/declarative/webbrowser/webbrowser.qml | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/demos/declarative/webbrowser/webbrowser.qml b/demos/declarative/webbrowser/webbrowser.qml index 4b03b63..df0e1a7 100644 --- a/demos/declarative/webbrowser/webbrowser.qml +++ b/demos/declarative/webbrowser/webbrowser.qml @@ -114,6 +114,7 @@ Item { opacity: 1-Header.progressOff clip: true } + /* KeyProxy { id: proxy @@ -140,24 +141,11 @@ Item { anchors.leftMargin: 6 anchors.verticalCenter: UrlBox.verticalCenter anchors.verticalCenterOffset: 1 - - opacity: 0 - } - Text { - id: ShowUrl - text: WebView.url == '' ? ' ' : WebView.url - font.size: 11 - color: "#555555" - anchors.left: UrlBox.left - anchors.right: UrlBox.right - anchors.leftMargin: 6 - anchors.verticalCenter: UrlBox.verticalCenter - anchors.verticalCenterOffset: 1 } } MouseRegion { anchors.fill: UrlBox - onClicked: { proxy.focus=true } + onClicked: { EditUrl.focus=true } } } -- cgit v0.12 From bfcc49068b99416af2711b48dc5cf6386224345b Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Tue, 19 May 2009 12:54:22 +0200 Subject: better focus handling for the location bar --- demos/declarative/webbrowser/webbrowser.qml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/demos/declarative/webbrowser/webbrowser.qml b/demos/declarative/webbrowser/webbrowser.qml index df0e1a7..a38d032 100644 --- a/demos/declarative/webbrowser/webbrowser.qml +++ b/demos/declarative/webbrowser/webbrowser.qml @@ -135,6 +135,7 @@ Item { wrap: false font.size: 11 color: "#555555" + focusOnPress: true anchors.left: UrlBox.left anchors.right: UrlBox.right @@ -143,10 +144,6 @@ Item { anchors.verticalCenterOffset: 1 } } - MouseRegion { - anchors.fill: UrlBox - onClicked: { EditUrl.focus=true } - } } property real progressOff : 1 -- cgit v0.12 From 07c879367e4a8e9038c5eb7d100ed0e4facd9329 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Tue, 19 May 2009 14:19:50 +0200 Subject: no need to translate graphics events to regular ones QTextControl can handle graphics mouse events directly, no need to translate them to regular mouse events. --- src/declarative/fx/qfxtextedit.cpp | 39 +++----------------------------------- 1 file changed, 3 insertions(+), 36 deletions(-) diff --git a/src/declarative/fx/qfxtextedit.cpp b/src/declarative/fx/qfxtextedit.cpp index 35b1173..8667c9e 100644 --- a/src/declarative/fx/qfxtextedit.cpp +++ b/src/declarative/fx/qfxtextedit.cpp @@ -662,7 +662,6 @@ void QFxTextEdit::keyReleaseEvent(QKeyEvent *event) */ void QFxTextEdit::focusChanged(bool hasFocus) { - Q_D(QFxTextEdit); setCursorVisible(hasFocus); } @@ -675,29 +674,6 @@ void QFxTextEdit::selectAll() d->control->selectAll(); } -static QMouseEvent *sceneMouseEventToMouseEvent(QGraphicsSceneMouseEvent *e) -{ - QEvent::Type t; - switch(e->type()) { - default: - case QEvent::GraphicsSceneMousePress: - t = QEvent::MouseButtonPress; - break; - case QEvent::GraphicsSceneMouseRelease: - t = QEvent::MouseButtonRelease; - break; - case QEvent::GraphicsSceneMouseMove: - t = QEvent::MouseMove; - break; - case QGraphicsSceneEvent::GraphicsSceneMouseDoubleClick: - t = QEvent::MouseButtonDblClick; - break; - } - - QMouseEvent *me = new QMouseEvent(t, e->pos().toPoint(), e->button(), e->buttons(), 0); - return me; -} - /*! \overload Handles the given mouse \a event. @@ -707,10 +683,7 @@ void QFxTextEdit::mousePressEvent(QGraphicsSceneMouseEvent *event) Q_D(QFxTextEdit); if (d->focusOnPress) setFocus(true); - QMouseEvent *me = sceneMouseEventToMouseEvent(event); - d->control->processEvent(me, QPointF(0, 0)); - event->setAccepted(me->isAccepted()); - delete me; + d->control->processEvent(event, QPointF(0, 0)); if (!event->isAccepted()) QFxPaintedItem::mousePressEvent(event); } @@ -722,10 +695,7 @@ Handles the given mouse \a event. void QFxTextEdit::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) { Q_D(QFxTextEdit); - QMouseEvent *me = sceneMouseEventToMouseEvent(event); - d->control->processEvent(me, QPointF(0, 0)); - event->setAccepted(me->isAccepted()); - delete me; + d->control->processEvent(event, QPointF(0, 0)); if (!event->isAccepted()) QFxPaintedItem::mousePressEvent(event); } @@ -737,10 +707,7 @@ Handles the given mouse \a event. void QFxTextEdit::mouseMoveEvent(QGraphicsSceneMouseEvent *event) { Q_D(QFxTextEdit); - QMouseEvent *me = sceneMouseEventToMouseEvent(event); - d->control->processEvent(me, QPointF(0, 0)); - event->setAccepted(me->isAccepted()); - delete me; + d->control->processEvent(event, QPointF(0, 0)); if (!event->isAccepted()) QFxPaintedItem::mousePressEvent(event); } -- cgit v0.12 From 06cfcc9c8a328648d1000cc9fb1767a1b3e4d013 Mon Sep 17 00:00:00 2001 From: Roberto Raggi Date: Tue, 19 May 2009 15:21:40 +0200 Subject: Resolved reduce/reduce conflict between QML array literals and JS array literals. --- src/declarative/qml/parser/javascript.g | 102 +- src/declarative/qml/parser/javascriptgrammar.cpp | 1274 ++++++++++++---------- src/declarative/qml/parser/javascriptgrammar_p.h | 14 +- src/declarative/qml/parser/javascriptparser.cpp | 413 +++---- src/declarative/qml/parser/javascriptparser_p.h | 4 +- 5 files changed, 958 insertions(+), 849 deletions(-) diff --git a/src/declarative/qml/parser/javascript.g b/src/declarative/qml/parser/javascript.g index 33847f2..155630b 100644 --- a/src/declarative/qml/parser/javascript.g +++ b/src/declarative/qml/parser/javascript.g @@ -823,25 +823,6 @@ case $rule_number: { } ./ -UiQualifiedId: JsIdentifier ; -/. -case $rule_number: { - AST::UiQualifiedId *node = makeAstNode (driver->nodePool(), sym(1).sval); - node->identifierToken = loc(1); - sym(1).Node = node; -} break; -./ - -UiQualifiedId: UiQualifiedId T_DOT JsIdentifier ; -/. -case $rule_number: { - AST::UiQualifiedId *node = makeAstNode (driver->nodePool(), sym(1).UiQualifiedId, sym(3).sval); - node->identifierToken = loc(3); - sym(1).Node = node; -} break; -./ - - -------------------------------------------------------------------------------------------------------- -- Expressions -------------------------------------------------------------------------------------------------------- @@ -943,10 +924,20 @@ case $rule_number: { } break; ./ -PrimaryExpression: T_LBRACKET ElisionOpt T_RBRACKET ; +PrimaryExpression: T_LBRACKET T_RBRACKET ; /. case $rule_number: { - AST::ArrayLiteral *node = makeAstNode (driver->nodePool(), sym(2).Elision); + AST::ArrayLiteral *node = makeAstNode (driver->nodePool(), (AST::Elision *) 0); + node->lbracketToken = loc(1); + node->rbracketToken = loc(2); + sym(1).Node = node; +} break; +./ + +PrimaryExpression: T_LBRACKET Elision T_RBRACKET ; +/. +case $rule_number: { + AST::ArrayLiteral *node = makeAstNode (driver->nodePool(), sym(2).Elision->finish()); node->lbracketToken = loc(1); node->rbracketToken = loc(3); sym(1).Node = node; @@ -963,10 +954,23 @@ case $rule_number: { } break; ./ -PrimaryExpression: T_LBRACKET ElementList T_COMMA ElisionOpt T_RBRACKET ; +PrimaryExpression: T_LBRACKET ElementList T_COMMA T_RBRACKET ; +/. +case $rule_number: { + AST::ArrayLiteral *node = makeAstNode (driver->nodePool(), sym(2).ElementList->finish (), + (AST::Elision *) 0); + node->lbracketToken = loc(1); + node->commaToken = loc(3); + node->rbracketToken = loc(4); + sym(1).Node = node; +} break; +./ + +PrimaryExpression: T_LBRACKET ElementList T_COMMA Elision T_RBRACKET ; /. case $rule_number: { - AST::ArrayLiteral *node = makeAstNode (driver->nodePool(), sym(2).ElementList->finish (), sym(4).Elision); + AST::ArrayLiteral *node = makeAstNode (driver->nodePool(), sym(2).ElementList->finish (), + sym(4).Elision->finish()); node->lbracketToken = loc(1); node->commaToken = loc(3); node->rbracketToken = loc(5); @@ -1017,51 +1021,73 @@ case $rule_number: { } break; ./ -ElementList: ElisionOpt AssignmentExpression ; +UiQualifiedId: JsIdentifier ; +/. +case $rule_number: { + AST::UiQualifiedId *node = makeAstNode (driver->nodePool(), sym(1).sval); + node->identifierToken = loc(1); + sym(1).Node = node; +} break; +./ + +UiQualifiedId: UiQualifiedId T_DOT JsIdentifier ; +/. +case $rule_number: { + AST::UiQualifiedId *node = makeAstNode (driver->nodePool(), sym(1).UiQualifiedId, sym(3).sval); + node->identifierToken = loc(3); + sym(1).Node = node; +} break; +./ + +ElementList: AssignmentExpression ; /. case $rule_number: { - sym(1).Node = makeAstNode (driver->nodePool(), sym(1).Elision, sym(2).Expression); + sym(1).Node = makeAstNode (driver->nodePool(), (AST::Elision *) 0, sym(1).Expression); } break; ./ -ElementList: ElementList T_COMMA ElisionOpt AssignmentExpression ; +ElementList: Elision AssignmentExpression ; /. case $rule_number: { - AST::ElementList *node = makeAstNode (driver->nodePool(), sym(1).ElementList, sym(3).Elision, sym(4).Expression); - node->commaToken = loc(2); - sym(1).Node = node; + sym(1).Node = makeAstNode (driver->nodePool(), sym(1).Elision->finish(), sym(2).Expression); } break; ./ -Elision: T_COMMA ; +ElementList: ElementList T_COMMA AssignmentExpression ; /. case $rule_number: { - AST::Elision *node = makeAstNode (driver->nodePool()); - node->commaToken = loc(1); + AST::ElementList *node = makeAstNode (driver->nodePool(), sym(1).ElementList, + (AST::Elision *) 0, sym(3).Expression); + node->commaToken = loc(2); sym(1).Node = node; } break; ./ -Elision: Elision T_COMMA ; +ElementList: ElementList T_COMMA Elision AssignmentExpression ; /. case $rule_number: { - AST::Elision *node = makeAstNode (driver->nodePool(), sym(1).Elision); + AST::ElementList *node = makeAstNode (driver->nodePool(), sym(1).ElementList, sym(3).Elision->finish(), + sym(4).Expression); node->commaToken = loc(2); sym(1).Node = node; } break; ./ -ElisionOpt: %prec SHIFT_THERE ; +Elision: T_COMMA ; /. case $rule_number: { - sym(1).Node = 0; + AST::Elision *node = makeAstNode (driver->nodePool()); + node->commaToken = loc(1); + sym(1).Node = node; } break; ./ -ElisionOpt: Elision ; +Elision: Elision T_COMMA ; /. case $rule_number: { - sym(1).Elision = sym(1).Elision->finish (); + AST::Elision *node = makeAstNode (driver->nodePool(), sym(1).Elision); + node->commaToken = loc(2); + sym(1).Node = node; } break; ./ diff --git a/src/declarative/qml/parser/javascriptgrammar.cpp b/src/declarative/qml/parser/javascriptgrammar.cpp index db34464..a879bfe 100644 --- a/src/declarative/qml/parser/javascriptgrammar.cpp +++ b/src/declarative/qml/parser/javascriptgrammar.cpp @@ -59,404 +59,422 @@ const int JavaScriptGrammar::lhs [] = { 98, 100, 100, 101, 101, 97, 99, 99, 103, 104, 104, 99, 99, 99, 99, 99, 99, 99, 111, 111, 111, 99, 99, 99, 99, 99, 99, 99, 99, 99, - 99, 99, 102, 102, 114, 114, 114, 102, 102, 115, + 99, 99, 102, 102, 114, 114, 114, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, - 115, 115, 115, 115, 117, 117, 121, 121, 116, 116, - 119, 119, 122, 122, 122, 122, 122, 122, 123, 123, - 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, - 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, - 123, 123, 123, 123, 123, 123, 123, 123, 123, 124, - 124, 125, 125, 125, 125, 125, 128, 128, 129, 129, - 129, 129, 127, 127, 130, 130, 131, 131, 132, 132, - 132, 133, 133, 133, 133, 133, 133, 133, 133, 133, - 133, 134, 134, 134, 134, 135, 135, 135, 136, 136, - 136, 136, 137, 137, 137, 137, 137, 137, 137, 138, - 138, 138, 138, 138, 138, 139, 139, 139, 139, 139, - 140, 140, 140, 140, 140, 141, 141, 142, 142, 143, - 143, 144, 144, 145, 145, 146, 146, 147, 147, 148, - 148, 149, 149, 150, 150, 151, 151, 152, 152, 120, - 120, 153, 153, 154, 154, 154, 154, 154, 154, 154, - 154, 154, 154, 154, 154, 105, 105, 155, 155, 156, - 156, 157, 157, 158, 158, 158, 158, 158, 158, 158, - 158, 158, 158, 158, 158, 158, 158, 158, 106, 169, - 169, 168, 168, 113, 113, 170, 170, 171, 171, 173, - 173, 172, 174, 177, 175, 175, 178, 176, 176, 107, - 108, 108, 110, 110, 159, 159, 159, 159, 159, 159, - 159, 160, 160, 160, 160, 161, 161, 161, 161, 162, - 162, 163, 165, 179, 179, 182, 182, 180, 180, 183, - 181, 164, 164, 164, 166, 166, 167, 167, 167, 184, - 185, 109, 109, 112, 126, 189, 189, 186, 186, 187, - 187, 190, 191, 191, 192, 192, 188, 188, 118, 118, - 193}; + 115, 115, 115, 115, 102, 102, 117, 117, 117, 117, + 116, 116, 119, 119, 121, 121, 121, 121, 121, 121, + 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, + 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, + 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, + 122, 123, 123, 124, 124, 124, 124, 124, 127, 127, + 128, 128, 128, 128, 126, 126, 129, 129, 130, 130, + 131, 131, 131, 132, 132, 132, 132, 132, 132, 132, + 132, 132, 132, 133, 133, 133, 133, 134, 134, 134, + 135, 135, 135, 135, 136, 136, 136, 136, 136, 136, + 136, 137, 137, 137, 137, 137, 137, 138, 138, 138, + 138, 138, 139, 139, 139, 139, 139, 140, 140, 141, + 141, 142, 142, 143, 143, 144, 144, 145, 145, 146, + 146, 147, 147, 148, 148, 149, 149, 150, 150, 151, + 151, 120, 120, 152, 152, 153, 153, 153, 153, 153, + 153, 153, 153, 153, 153, 153, 153, 105, 105, 154, + 154, 155, 155, 156, 156, 157, 157, 157, 157, 157, + 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, + 106, 168, 168, 167, 167, 113, 113, 169, 169, 170, + 170, 172, 172, 171, 173, 176, 174, 174, 177, 175, + 175, 107, 108, 108, 110, 110, 158, 158, 158, 158, + 158, 158, 158, 159, 159, 159, 159, 160, 160, 160, + 160, 161, 161, 162, 164, 178, 178, 181, 181, 179, + 179, 182, 180, 163, 163, 163, 165, 165, 166, 166, + 166, 183, 184, 109, 109, 112, 125, 188, 188, 185, + 185, 186, 186, 189, 190, 190, 191, 191, 187, 187, + 118, 118, 192}; const int JavaScriptGrammar:: rhs[] = { 2, 1, 1, 1, 2, 3, 3, 0, 1, 1, 2, 1, 3, 2, 3, 2, 1, 5, 1, 2, 2, 4, 3, 3, 3, 3, 3, 3, 1, 1, 1, 2, 4, 4, 5, 5, 6, 6, 7, 7, - 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, - 5, 3, 4, 3, 2, 4, 1, 2, 0, 1, - 3, 5, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 2, 3, 3, 4, + 5, 3, 4, 3, 1, 3, 1, 2, 3, 4, + 1, 2, 3, 5, 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, 4, 3, 5, 1, 2, 4, 4, - 4, 3, 0, 1, 1, 3, 1, 1, 1, 2, - 2, 1, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 1, 3, 3, 3, 1, 3, 3, 1, 3, - 3, 3, 1, 3, 3, 3, 3, 3, 3, 1, - 3, 3, 3, 3, 3, 1, 3, 3, 3, 3, - 1, 3, 3, 3, 3, 1, 3, 1, 3, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 4, 3, 5, 1, 2, + 4, 4, 4, 3, 0, 1, 1, 3, 1, 1, + 1, 2, 2, 1, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 1, 3, 3, 3, 1, 3, 3, + 1, 3, 3, 3, 1, 3, 3, 3, 3, 3, + 3, 1, 3, 3, 3, 3, 3, 1, 3, 3, + 3, 3, 1, 3, 3, 3, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, - 3, 1, 3, 1, 3, 1, 5, 1, 5, 1, - 3, 1, 3, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 3, 0, 1, 1, - 3, 0, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, - 2, 0, 1, 3, 3, 1, 1, 1, 3, 1, - 3, 2, 2, 2, 0, 1, 2, 0, 1, 1, - 2, 2, 7, 5, 7, 7, 5, 9, 10, 7, - 8, 2, 2, 3, 3, 2, 2, 3, 3, 3, - 3, 5, 5, 3, 5, 1, 2, 0, 1, 4, - 3, 3, 3, 3, 3, 3, 3, 3, 4, 5, - 2, 2, 2, 8, 8, 1, 3, 0, 1, 0, - 1, 1, 1, 2, 1, 1, 0, 1, 0, 1, - 2}; + 3, 1, 3, 1, 3, 1, 3, 1, 5, 1, + 5, 1, 3, 1, 3, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 3, 0, + 1, 1, 3, 0, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 3, 1, 2, 0, 1, 3, 3, 1, 1, 1, + 3, 1, 3, 2, 2, 2, 0, 1, 2, 0, + 1, 1, 2, 2, 7, 5, 7, 7, 5, 9, + 10, 7, 8, 2, 2, 3, 3, 2, 2, 3, + 3, 3, 3, 5, 5, 3, 5, 1, 2, 0, + 1, 4, 3, 3, 3, 3, 3, 3, 3, 3, + 4, 5, 2, 2, 2, 8, 8, 1, 3, 0, + 1, 0, 1, 1, 1, 2, 1, 1, 0, 1, + 0, 1, 2}; const int JavaScriptGrammar::action_default [] = { 8, 2, 0, 4, 3, 0, 0, 0, 6, 7, - 5, 48, 45, 46, 43, 44, 47, 9, 0, 1, - 0, 0, 16, 49, 41, 246, 0, 0, 46, 14, - 47, 247, 17, 10, 0, 0, 0, 42, 0, 31, - 30, 29, 0, 0, 35, 0, 36, 149, 216, 180, - 188, 184, 128, 200, 176, 0, 113, 51, 129, 192, - 196, 117, 146, 127, 132, 112, 166, 153, 0, 57, - 58, 54, 317, 319, 69, 0, 0, 0, 0, 0, - 52, 55, 0, 0, 56, 50, 0, 53, 0, 0, - 142, 0, 0, 129, 148, 131, 130, 0, 0, 0, - 144, 145, 143, 147, 0, 177, 0, 0, 0, 0, - 167, 0, 0, 0, 0, 0, 0, 157, 0, 0, - 0, 151, 152, 150, 155, 159, 158, 156, 154, 169, - 168, 170, 0, 185, 0, 181, 0, 0, 123, 110, - 122, 111, 79, 80, 81, 106, 82, 107, 83, 84, - 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, - 95, 108, 96, 97, 98, 99, 100, 101, 102, 103, - 104, 105, 109, 0, 0, 121, 217, 124, 0, 125, - 0, 126, 120, 39, 40, 0, 213, 206, 204, 211, - 212, 210, 209, 215, 208, 207, 205, 214, 201, 0, - 189, 0, 0, 193, 0, 0, 197, 0, 0, 123, - 115, 0, 114, 0, 119, 133, 0, 318, 308, 309, - 0, 306, 0, 307, 0, 310, 224, 231, 230, 238, - 226, 0, 227, 311, 0, 316, 228, 229, 234, 232, - 313, 312, 315, 235, 0, 0, 0, 0, 0, 317, - 45, 0, 319, 46, 218, 260, 47, 0, 0, 0, - 0, 0, 236, 237, 225, 233, 261, 262, 305, 314, - 0, 276, 277, 278, 279, 0, 272, 273, 274, 275, - 302, 303, 0, 0, 0, 0, 0, 265, 266, 222, - 220, 182, 190, 186, 202, 178, 223, 0, 129, 194, - 198, 171, 160, 0, 0, 179, 0, 0, 0, 0, - 172, 0, 0, 0, 0, 0, 164, 162, 165, 163, - 161, 174, 173, 175, 0, 187, 0, 183, 0, 221, - 129, 0, 203, 218, 219, 0, 218, 0, 0, 268, - 0, 0, 0, 270, 0, 191, 0, 0, 195, 0, - 0, 199, 258, 0, 250, 259, 253, 0, 257, 0, - 218, 251, 0, 218, 0, 0, 269, 0, 0, 0, - 271, 318, 308, 0, 0, 310, 0, 304, 0, 294, - 0, 0, 0, 264, 0, 263, 0, 320, 0, 78, - 240, 243, 0, 79, 246, 82, 107, 84, 85, 54, - 89, 90, 45, 91, 94, 52, 55, 46, 218, 47, - 56, 97, 50, 99, 53, 101, 102, 247, 104, 105, - 109, 0, 71, 0, 0, 73, 77, 75, 63, 74, - 76, 0, 72, 62, 241, 239, 117, 118, 123, 0, - 116, 0, 293, 0, 280, 281, 0, 292, 0, 0, - 0, 283, 288, 286, 289, 0, 0, 287, 288, 0, - 284, 0, 285, 242, 291, 0, 242, 290, 0, 295, - 296, 0, 242, 297, 298, 0, 0, 299, 0, 0, - 0, 300, 301, 135, 134, 0, 0, 0, 267, 0, - 0, 0, 282, 0, 70, 0, 67, 69, 60, 0, - 66, 61, 68, 65, 59, 0, 64, 139, 137, 141, - 138, 136, 140, 0, 0, 0, 33, 0, 34, 0, - 37, 38, 32, 15, 11, 0, 23, 26, 24, 0, - 25, 28, 242, 69, 19, 0, 27, 22, 79, 246, - 82, 107, 84, 85, 54, 89, 90, 45, 91, 94, - 52, 55, 46, 218, 47, 56, 97, 50, 99, 53, - 101, 102, 247, 104, 105, 109, 0, 12, 0, 18, - 13, 20, 21, 255, 248, 0, 256, 252, 0, 254, - 244, 0, 245, 249, 321}; + 5, 65, 45, 46, 43, 44, 47, 9, 0, 1, + 0, 0, 16, 66, 41, 248, 0, 0, 46, 14, + 47, 249, 17, 10, 0, 0, 0, 42, 0, 31, + 30, 29, 0, 0, 35, 0, 36, 151, 218, 182, + 190, 186, 130, 202, 178, 0, 115, 49, 131, 194, + 198, 119, 148, 129, 134, 114, 168, 155, 0, 55, + 56, 52, 319, 321, 0, 0, 0, 0, 0, 0, + 50, 53, 0, 0, 54, 48, 0, 51, 0, 0, + 144, 0, 0, 131, 150, 133, 132, 0, 0, 0, + 146, 147, 145, 149, 0, 179, 0, 0, 0, 0, + 169, 0, 0, 0, 0, 0, 0, 159, 0, 0, + 0, 153, 154, 152, 157, 161, 160, 158, 156, 171, + 170, 172, 0, 187, 0, 183, 0, 0, 125, 112, + 124, 113, 81, 82, 83, 108, 84, 109, 85, 86, + 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, + 97, 110, 98, 99, 100, 101, 102, 103, 104, 105, + 106, 107, 111, 0, 0, 123, 219, 126, 0, 127, + 0, 128, 122, 39, 40, 0, 215, 208, 206, 213, + 214, 212, 211, 217, 210, 209, 207, 216, 203, 0, + 191, 0, 0, 195, 0, 0, 199, 0, 0, 125, + 117, 0, 116, 0, 121, 135, 0, 320, 310, 311, + 0, 308, 0, 309, 0, 312, 226, 233, 232, 240, + 228, 0, 229, 313, 0, 318, 230, 231, 236, 234, + 315, 314, 317, 237, 0, 0, 0, 0, 0, 319, + 45, 0, 321, 46, 220, 262, 47, 0, 0, 0, + 0, 0, 238, 239, 227, 235, 263, 264, 307, 316, + 0, 278, 279, 280, 281, 0, 274, 275, 276, 277, + 304, 305, 0, 0, 0, 0, 0, 267, 268, 224, + 222, 184, 192, 188, 204, 180, 225, 0, 131, 196, + 200, 173, 162, 0, 0, 181, 0, 0, 0, 0, + 174, 0, 0, 0, 0, 0, 166, 164, 167, 165, + 163, 176, 175, 177, 0, 189, 0, 185, 0, 223, + 131, 0, 205, 220, 221, 0, 220, 0, 0, 270, + 0, 0, 0, 272, 0, 193, 0, 0, 197, 0, + 0, 201, 260, 0, 252, 261, 255, 0, 259, 0, + 220, 253, 0, 220, 0, 0, 271, 0, 0, 0, + 273, 320, 310, 0, 0, 312, 0, 306, 0, 296, + 0, 0, 0, 266, 0, 265, 0, 322, 0, 80, + 242, 245, 0, 81, 248, 84, 109, 86, 87, 52, + 91, 92, 45, 93, 96, 50, 53, 46, 220, 47, + 54, 99, 48, 101, 51, 103, 104, 249, 106, 107, + 111, 0, 73, 0, 0, 75, 79, 77, 63, 76, + 78, 0, 74, 62, 243, 241, 119, 120, 125, 0, + 118, 0, 295, 0, 282, 283, 0, 294, 0, 0, + 0, 285, 290, 288, 291, 0, 0, 289, 290, 0, + 286, 0, 287, 244, 293, 0, 244, 292, 0, 297, + 298, 0, 244, 299, 300, 0, 0, 301, 0, 0, + 0, 302, 303, 137, 136, 0, 0, 0, 269, 0, + 0, 0, 284, 67, 0, 0, 71, 57, 0, 59, + 69, 0, 60, 70, 72, 61, 68, 58, 0, 64, + 141, 139, 143, 140, 138, 142, 0, 0, 0, 33, + 0, 34, 0, 37, 38, 32, 15, 11, 0, 23, + 26, 24, 0, 25, 28, 244, 0, 19, 0, 27, + 22, 81, 248, 84, 109, 86, 87, 52, 91, 92, + 45, 93, 96, 50, 53, 46, 220, 47, 54, 99, + 48, 101, 51, 103, 104, 249, 106, 107, 111, 49, + 0, 12, 0, 18, 13, 20, 21, 257, 250, 0, + 258, 254, 0, 256, 246, 0, 247, 251, 323}; const int JavaScriptGrammar::goto_default [] = { - 6, 5, 19, 1, 4, 3, 32, 34, 33, 566, - 22, 18, 535, 536, 231, 226, 230, 232, 229, 236, - 514, 235, 264, 57, 65, 495, 493, 388, 387, 48, - 494, 386, 389, 140, 61, 56, 178, 63, 52, 177, - 58, 64, 90, 62, 47, 67, 66, 301, 54, 295, - 49, 291, 51, 293, 50, 292, 59, 299, 60, 300, - 53, 294, 290, 331, 443, 296, 297, 390, 237, 228, - 227, 239, 265, 238, 243, 262, 263, 392, 391, 36, - 575, 574, 353, 354, 577, 356, 576, 355, 451, 455, - 458, 454, 453, 473, 474, 220, 234, 216, 219, 233, - 241, 240, 0}; + 6, 5, 19, 1, 4, 3, 32, 34, 33, 570, + 22, 18, 538, 539, 231, 226, 230, 232, 229, 236, + 517, 235, 264, 57, 65, 495, 494, 388, 387, 48, + 386, 389, 140, 61, 56, 178, 63, 52, 177, 58, + 64, 90, 62, 47, 67, 66, 301, 54, 295, 49, + 291, 51, 293, 50, 292, 59, 299, 60, 300, 53, + 294, 290, 331, 443, 296, 297, 390, 237, 228, 227, + 239, 265, 238, 243, 262, 263, 392, 391, 36, 579, + 578, 353, 354, 581, 356, 580, 355, 451, 455, 458, + 454, 453, 473, 474, 220, 234, 216, 219, 233, 241, + 240, 0}; const int JavaScriptGrammar::action_index [] = { - 7, -91, 35, -91, 7, 304, 96, 111, -91, -91, - -91, -91, -91, -91, -91, -91, -91, -91, 120, -91, - 136, 417, -91, -91, -91, -91, 64, 161, 160, -91, - 73, -91, -91, -91, 385, 262, 259, -91, 229, -91, - -91, -91, 65, 237, -91, 721, -91, 115, -91, 79, - 41, 3, 338, -91, 303, 228, -91, -91, 562, 68, - 77, 260, 243, -91, -91, -91, 400, 158, 721, -91, - -91, -91, 159, 1299, 93, 721, 721, 721, 515, 721, - -91, -91, 721, 721, -91, -91, 721, -91, 721, 721, - -91, 721, 721, 110, 150, -91, -91, 721, 721, 721, - -91, -91, -91, 175, 721, 310, 721, 721, 721, 721, - 474, 721, 721, 721, 721, 721, 721, 179, 721, 721, - 721, 70, 74, 78, 246, 253, 249, 241, 227, 474, - 474, 474, 721, 61, 721, 178, 1212, 721, 721, -91, + 8, -91, 14, -91, -15, 296, 67, 94, -91, -91, + -91, -91, -91, -91, -91, -91, -91, -91, 109, -91, + 184, 408, -91, -91, -91, -91, 45, 125, 170, -91, + 46, -91, -91, -91, 429, 171, 130, -91, 120, -91, + -91, -91, -19, 169, -91, 733, -91, 72, -91, 22, + -26, -59, 173, -91, 278, 174, -91, -91, 574, 51, + 112, 183, 177, -91, -91, -91, 412, 214, 733, -91, + -91, -91, 161, 1566, 980, 733, 733, 733, 653, 733, + -91, -91, 733, 733, -91, -91, 733, -91, 733, 733, + -91, 733, 733, 98, 235, -91, -91, 733, 733, 733, + -91, -91, -91, 230, 733, 276, 733, 733, 733, 733, + 396, 733, 733, 733, 733, 733, 733, 288, 733, 733, + 733, 88, 87, 74, 288, 288, 288, 218, 221, 486, + 372, 362, 733, 4, 733, 76, 1479, 733, 733, -91, -91, -91, -91, -91, -91, -91, -91, -91, -91, -91, -91, -91, -91, -91, -91, -91, -91, -91, -91, -91, -91, -91, -91, -91, -91, -91, -91, -91, -91, -91, - -91, -91, -91, 104, 721, -91, -91, 84, 56, -91, - 721, -91, -91, -91, -91, 721, -91, -91, -91, -91, - -91, -91, -91, -91, -91, -91, -91, -91, -91, 721, - 69, 721, 721, 95, 92, 721, -91, 1212, 721, 721, - -91, 112, -91, 14, -91, -91, 36, -91, 155, 67, - 53, -91, 176, -91, 43, 1560, -91, -91, -91, -91, - -91, 254, -91, -91, 33, -91, -91, -91, -91, -91, - -91, 1560, -91, -91, 339, 332, 85, 1473, 62, 252, - 66, 32, 1734, 71, 721, -91, 72, 55, 721, 60, - 50, 46, -91, -91, -91, -91, -91, -91, -91, -91, - 75, -91, -91, -91, -91, 80, -91, -91, -91, -91, - -91, -91, 1, 49, 721, 118, 119, -91, -91, 961, - -91, 86, 21, 6, -91, 305, 63, 22, 482, 88, - 121, 406, 282, 157, 721, 312, 721, 721, 721, 721, - 406, 721, 721, 721, 721, 721, 212, 208, 222, 226, - 234, 406, 406, 406, 721, -39, 721, -1, 721, -91, - 562, 721, -91, 721, -3, -57, 721, -54, 1473, -91, - 721, 116, 1473, -91, 721, -45, 721, 721, 88, -6, - 721, -91, -10, 130, -21, -91, -91, 721, -91, 238, - 721, -91, -44, 721, -46, 1473, -91, 721, 132, 1473, - -91, -23, 219, -49, -24, 1560, -47, -91, 1473, -91, - 721, 99, 1473, -4, 1473, -91, 40, 42, 2, -91, - -91, 1473, -2, 325, 39, 314, 108, 721, 1473, 34, - 12, 272, 38, 13, 641, 45, 48, -91, 1045, -91, - 57, 26, 47, 721, 8, 11, 721, 16, 721, -11, - -7, 721, -91, 1386, 17, -91, -91, -91, -91, -91, - -91, 721, -91, -91, -91, -91, 182, -91, 721, -41, - -91, 1473, -91, 89, -91, -91, 1473, -91, 721, 114, - -5, -91, 28, -91, 37, 109, 721, -91, 29, 25, - -91, -25, -91, 1473, -91, 125, 1473, -91, 221, -91, - -91, 103, 1473, 18, -91, 0, 4, -91, 164, -20, - 10, -91, -91, -91, -91, 721, 97, 1473, -91, 721, - 98, 1473, -91, 100, 27, 801, -91, 23, -91, 881, - -91, -91, -91, -91, -91, 107, -91, -91, -91, -91, - -91, -91, -91, -16, -8, 147, -91, 721, -91, 153, - -91, -91, -91, -91, -91, 1125, -91, -91, -91, 284, - -91, -91, 1647, 388, -91, 82, -91, -91, 359, 9, - 349, 87, 721, 1473, 15, -9, 298, 19, 24, 641, - 52, 51, -91, 1045, -91, 54, 31, 58, 721, 59, - 30, 721, 44, 721, 20, -18, 126, -91, 318, -91, - -91, -91, -91, -15, -91, 137, -91, -91, 721, -91, - -91, 190, -91, -91, -91, + -91, -91, -91, 102, 733, -91, -91, 60, 3, -91, + 733, -91, -91, -91, -91, 733, -91, -91, -91, -91, + -91, -91, -91, -91, -91, -91, -91, -91, -91, 733, + -6, 733, 733, 30, 32, 733, -91, 1479, 733, 733, + -91, 107, -91, -14, -91, -91, 69, -91, 191, 49, + 18, -91, 233, -91, 47, 1827, -91, -91, -91, -91, + -91, 204, -91, -91, 39, -91, -91, -91, -91, -91, + -91, 1827, -91, -91, 322, 281, 103, 1740, 50, 203, + 77, 40, 2001, 53, 733, -91, 52, 29, 733, 25, + 28, 35, -91, -91, -91, -91, -91, -91, -91, -91, + 113, -91, -91, -91, -91, 106, -91, -91, -91, -91, + -91, -91, 15, 68, 733, 135, 119, -91, -91, 897, + -91, 82, 58, 17, -91, 261, 84, 42, 494, 91, + 79, 304, 288, 208, 733, 245, 733, 733, 733, 733, + 418, 733, 733, 733, 733, 733, 288, 288, 288, 288, + 288, 343, 336, 279, 733, -57, 733, 19, 733, -91, + 574, 733, -91, 733, -7, -30, 733, -60, 1740, -91, + 733, 111, 1740, -91, 733, 2, 733, 733, 43, 37, + 733, -91, 34, 118, 23, -91, -91, 733, -91, 238, + 733, -91, -5, 733, -17, 1740, -91, 733, 133, 1740, + -91, -9, 194, -32, -8, 1827, -25, -91, 1740, -91, + 733, 100, 1740, 21, 1740, -91, 31, 26, -20, -91, + -91, 1740, -38, 283, 41, 291, 85, 733, 1740, -1, + -34, 252, 54, -27, 653, 9, 5, -91, 817, -91, + 6, -21, 7, 733, 11, -28, 733, 1, 733, -33, + -10, 733, -91, 1653, 33, -91, -91, -91, -91, -91, + -91, 733, -91, -91, -91, -91, 172, -91, 733, -24, + -91, 1740, -91, 73, -91, -91, 1740, -91, 733, 93, + 0, -91, 24, -91, 36, 122, 733, -91, 44, 48, + -91, -3, -91, 1740, -91, 110, 1740, -91, 192, -91, + -91, 124, 1740, 27, -91, -12, -29, -91, 155, -53, + -22, -91, -91, -91, -91, 733, 123, 1740, -91, 733, + 92, 1740, -91, -91, 105, 1229, -91, -91, 1146, -91, + -91, 1063, -91, -91, -91, -91, -91, -91, 90, -91, + -91, -91, -91, -91, -91, -91, 71, 70, 222, -91, + 733, -91, 164, -91, -91, -91, -91, -91, 1392, -91, + -91, -91, 268, -91, -91, 1914, 1312, -91, 75, -91, + -91, 350, 55, 303, 108, 733, 1740, 59, 38, 242, + 62, 40, 527, 63, 81, -91, 817, -91, 138, 29, + 65, 733, 78, 56, 733, 80, 733, 61, 66, 57, + 101, -91, 347, -91, -91, -91, -91, 64, -91, 140, + -91, -91, 733, -91, -91, 144, -91, -91, -91, - -103, -103, -103, -103, 7, 70, -103, -103, -103, -103, - -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, - 20, 240, -103, -103, -103, -103, -103, 45, -103, -103, - -103, -103, -103, -103, 256, -103, -15, -103, -13, -103, - -103, -103, -103, -103, -103, -14, -103, -103, -103, -103, - -103, -103, -103, -103, -103, -103, -103, -103, -42, -103, - -103, -103, -103, -103, -103, -103, -103, -103, 142, -103, - -103, -103, 9, -103, -103, 0, 143, 132, 136, 114, - -103, -103, 146, 62, -103, -103, 129, -103, 125, 119, - -103, 151, 164, -103, -103, -103, -103, 157, 160, 122, - -103, -103, -103, -103, 65, -103, 77, 78, 89, 109, - -103, 82, 86, 80, 69, 47, 66, -103, 75, 72, - 137, -103, -103, -103, -103, -103, -103, -103, -103, -103, - -103, -103, 101, -103, 107, -103, 120, 34, 17, -103, - -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, - -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, - -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, - -103, -103, -103, -103, 13, -103, -103, -103, -103, -103, - 28, -103, -103, -103, -103, 46, -103, -103, -103, -103, - -103, -103, -103, -103, -103, -103, -103, -103, -103, 135, - -103, 110, -5, -103, -103, -10, -103, 209, 6, 50, - -103, -103, -103, -103, -103, -103, -103, -103, -19, -103, - -103, -103, 39, -103, -103, 33, -103, -103, -103, -103, - -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, - -103, 79, -103, -103, -6, 4, -103, -38, -103, 29, - -103, -103, -103, -103, 36, -103, -103, -103, 40, 25, - -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, - -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, - -103, -103, -103, -103, 8, -103, -103, -103, -103, 200, - -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, - -103, -103, -103, 11, 169, -103, 212, 203, 263, 179, - -103, 165, 147, 150, 156, 163, -103, -103, -103, -103, - -103, -103, -103, -103, 182, -103, 204, -103, 185, -103, - -103, 194, -103, 134, -103, -103, 96, -103, 30, -103, - 59, -103, 2, -103, 191, -103, 172, 175, -103, -103, - 176, -103, -103, -103, -103, -103, -103, 166, -103, 85, - 76, -103, -103, 81, -103, -51, -103, 16, -103, -41, - -103, -103, 84, -103, -103, 67, -103, -103, -61, -103, - 53, -103, 3, -103, -3, -103, -103, -103, -103, -103, - -103, -31, -103, 21, -103, 15, -103, 102, -9, -103, - -103, 26, -103, -103, 99, -103, -103, -103, 37, -103, - -103, -103, -103, 31, -103, 38, 97, -103, 90, -103, - -103, 27, -103, 10, -103, -103, -103, -103, -103, -103, - -103, 18, -103, -103, -103, -103, -103, -103, 92, -103, - -103, 5, -103, -103, -103, -103, 32, -103, 52, -103, - -103, -103, -103, -103, -33, -103, 49, -103, -28, -103, - -103, -103, -103, -76, -103, -103, -72, -103, -103, -103, - -103, -103, -103, -84, -103, -103, -12, -103, -21, -103, - 74, -103, -103, -103, -103, 14, -103, -54, -103, 19, - -103, -36, -103, -103, -103, -4, -103, -2, -103, -11, - -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, - -103, -103, -103, -103, -103, -103, -103, 1, -103, -103, - -103, -103, -103, -103, -103, 254, -103, -103, -103, -1, - -103, -103, -103, 68, -103, -103, -103, -103, 12, -103, - 42, -103, 61, -7, -103, -103, 48, -103, -103, 44, - -103, -103, -103, 41, -103, -103, -103, -103, 23, -103, - 24, 56, -103, 43, -103, -103, -103, -103, 71, -103, - -103, -103, -103, -103, -103, -103, -103, -103, -18, -103, - -103, 57, -103, -103, -103}; + -102, -102, -102, -102, 19, 103, -102, -102, -102, -102, + -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, + -4, 249, -102, -102, -102, -102, -102, -7, -102, -102, + -102, -102, -102, -102, 257, -102, -13, -102, -11, -102, + -102, -102, -102, -102, -102, -3, -102, -102, -102, -102, + -102, -102, -102, -102, -102, -102, -102, -102, -44, -102, + -102, -102, -102, -102, -102, -102, -102, -102, 141, -102, + -102, -102, -8, -102, 0, 16, 116, 122, 129, 119, + -102, -102, 90, 64, -102, -102, 94, -102, 91, 86, + -102, 71, 79, -102, -102, -102, -102, 159, 81, 76, + -102, -102, -102, -102, 98, -102, 67, 63, 47, 163, + -102, 160, 115, 104, 105, 127, 133, -102, 151, 144, + 130, -102, -102, -102, -102, -102, -102, -102, -102, -102, + -102, -102, 145, -102, 152, -102, 162, 31, 21, -102, + -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, + -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, + -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, + -102, -102, -102, -102, 23, -102, -102, -102, -102, -102, + 29, -102, -102, -102, -102, 34, -102, -102, -102, -102, + -102, -102, -102, -102, -102, -102, -102, -102, -102, 89, + -102, 68, 36, -102, -102, 42, -102, 235, 46, 49, + -102, -102, -102, -102, -102, -102, -102, -102, 33, -102, + -102, -102, 26, -102, -102, -18, -102, -102, -102, -102, + -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, + -102, 53, -102, -102, 8, 20, -102, -5, -102, 32, + -102, -102, -102, -102, 39, -102, -102, -102, 37, 73, + -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, + -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, + -102, -102, -102, -102, 40, -102, -102, -102, -102, 97, + -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, + -102, -102, -102, 41, 213, -102, 186, 199, 203, 209, + -102, 50, 51, 38, 57, 60, -102, -102, -102, -102, + -102, -102, -102, -102, 212, -102, 174, -102, 166, -102, + -102, 168, -102, 125, -102, -102, 61, -102, 1, -102, + 45, -102, -9, -102, 172, -102, 184, 176, -102, -102, + 170, -102, -102, -102, -102, -102, -102, 215, -102, 124, + 132, -102, -102, 178, -102, -29, -102, 25, -102, 2, + -102, -102, 62, -102, -102, 102, -102, -102, -28, -102, + 22, -102, -31, -102, -33, -102, -102, -102, -102, -102, + -102, -34, -102, 17, -102, 18, -102, 111, -20, -102, + -102, 24, -102, -102, 153, -102, -102, -102, 30, -102, + -102, -102, -102, 28, -102, 73, 140, -102, 205, -102, + -102, 5, -102, 44, -102, -102, -102, -102, -102, -102, + -102, 43, -102, -102, -102, -102, -102, -102, 135, -102, + -102, 7, -102, -102, -102, -102, 4, -102, 55, -102, + -102, -102, -102, -102, -25, -102, 48, -102, 9, -102, + -102, -102, -102, -69, -102, -102, -70, -102, -102, -102, + -102, -102, -102, -92, -102, -102, -12, -102, -10, -102, + -1, -102, -102, -102, -102, 11, -102, -40, -102, 14, + -102, -39, -102, -102, -102, -17, -102, -102, 54, -102, + -102, -24, -102, -102, -102, -102, -102, -102, -102, -102, + -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, + 3, -102, -102, -102, -102, -102, -102, -102, 267, -102, + -102, -102, 12, -102, -102, -102, 301, -102, -102, -102, + -102, -19, -102, -15, -102, 59, -64, -102, -102, -2, + -102, -102, 142, -102, -102, -102, -14, -102, -102, -102, + -102, 6, -102, 73, 52, -102, 75, -102, -102, -102, + -102, -102, 128, -102, -102, -102, -102, -102, -102, -102, + -102, -102, -6, -102, -102, 58, -102, -102, -102}; const int JavaScriptGrammar::action_info [] = { - 304, 350, 578, 324, 336, 174, 338, 357, 377, 375, - 367, 374, 384, 372, 365, -100, -106, 363, 489, 440, - 372, 515, -87, -103, 431, 485, -73, 289, 452, 489, - 462, 496, 463, 456, 456, 502, 478, 472, 476, 326, - 480, -87, 456, 472, 472, -73, -106, 421, 289, 380, - 423, -103, -95, 435, -98, -77, 485, 433, -77, -95, - 380, -76, 448, 472, -76, -98, -100, 448, 380, 324, - 199, 328, 218, 378, 214, 222, 225, 283, 441, 446, - 104, 134, 489, 333, 326, 284, 485, 304, 268, 132, - 344, 448, 180, 472, 43, 2, 584, 199, 289, 205, - 7, 496, 522, 0, 0, 174, 174, 174, 497, 475, - 91, 0, 174, 224, 91, 174, 182, 132, 91, 459, - 174, 92, 174, 476, 174, 92, 174, 201, 0, 92, - 38, 202, 466, 174, 568, 20, 274, 273, 359, 134, - 174, 279, 278, 572, 571, 581, 281, 280, 281, 280, - 445, 444, 95, 21, 517, 91, 498, 487, 491, 382, - 175, 174, 97, 96, 460, 12, 92, 506, 212, 281, - 280, 346, 9, 8, 450, 347, 342, 0, 286, 104, - 288, 287, 569, 118, 12, 119, 12, 97, 12, 39, - 12, 360, 369, 12, 0, 0, 120, 207, 582, 580, - 0, 0, 13, 16, 118, 12, 119, 98, 518, 516, - 0, 0, 0, 99, 521, 520, 208, 120, 438, 12, - 0, 13, 16, 13, 16, 13, 16, 13, 16, 174, - 13, 16, 98, 118, 41, 119, 174, 118, 99, 119, - 0, 0, 13, 16, 45, 40, 120, 118, 12, 119, - 120, 118, 118, 119, 119, 97, 13, 16, 39, 118, - 120, 119, 174, 0, 120, 120, 118, 12, 119, 525, - 0, 118, 120, 119, 118, 207, 119, 20, 118, 120, - 119, 12, 470, 469, 120, 13, 16, 120, 12, 184, - 183, 120, 174, 0, 208, 21, 209, 0, 46, 44, - 98, 12, 0, 41, 13, 16, 99, 118, -317, 119, - 0, 0, 0, 0, 40, 267, 266, 21, 13, 16, - 120, 106, 107, 306, 307, 13, 16, 12, 106, 107, - 306, 307, 0, 12, -317, 0, 0, 0, 13, 16, - 0, 0, 0, 12, 0, 267, 266, 12, 108, 109, - 308, 309, 0, 136, 12, 108, 109, 308, 309, 0, - 0, 12, 0, 15, 13, 16, 0, 0, 12, 0, - 13, 16, 137, 0, 138, 277, 276, 15, 12, 0, - 13, 16, 0, 0, 13, 16, 272, 271, 12, 14, - 0, 13, 16, 277, 276, 26, 496, 0, 13, 16, - 272, 271, 0, 14, 0, 13, 16, 27, 0, 0, - 277, 276, 0, 0, 12, 13, 16, 12, 0, 0, - 272, 271, 0, 111, 112, 13, 16, 26, 0, 311, - 312, 113, 114, 0, 0, 115, 0, 116, 313, 27, - 523, 314, 0, 315, 15, 0, 12, 15, 0, 0, - 0, 28, 30, 0, 13, 16, 0, 0, 0, 31, - 0, 0, 0, 0, 0, 0, 0, 0, 25, 0, - 14, 0, 29, 14, 0, 0, 15, 0, 0, 0, - 0, 0, 0, 28, 30, 186, 0, 0, 0, 0, - 0, 31, 0, 0, 0, 187, 0, 111, 112, 188, - 25, 0, 14, 0, 0, 113, 114, 0, 189, 115, - 190, 116, 0, 340, 0, 0, 0, 0, 0, 0, - 0, 191, 0, 192, 95, 0, 0, 69, 70, 0, - 0, 193, 0, 0, 194, 96, 0, 72, 0, 0, - 195, 0, 0, 0, 12, 0, 196, 0, 73, 74, - 0, 75, 0, 0, 0, 0, 0, 0, 78, 0, - 0, 197, 81, 0, 0, 186, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 187, 0, 0, 0, 188, - 84, 13, 16, 0, 85, 0, 0, 0, 189, 0, - 190, 0, 0, 0, 0, 80, 87, 71, 0, 0, - 0, 191, 0, 192, 95, 0, 0, 0, 0, 0, - 0, 193, 0, 0, 194, 96, 0, 0, 0, 0, - 195, 0, 0, 0, 0, 0, 196, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 197, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 69, 70, 0, 0, 0, 0, 0, - 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, - 12, 0, 0, 0, 73, 74, 0, 75, 0, 0, - 0, 0, 0, 0, 78, 0, 0, 0, 81, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 84, 13, 16, 0, - 85, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 80, 87, 71, 0, 0, 0, 0, 0, 0, - 0, 0, 68, 69, 70, 0, 0, 0, 0, 0, - 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, - 12, 0, 0, 0, 73, 74, 0, 75, 0, 0, - 0, 76, 0, 77, 78, 79, 0, 0, 81, 0, - 0, 0, 82, 0, 83, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 84, 13, 16, 0, - 85, 0, 86, 0, 88, 0, 89, 0, 0, 0, - 0, 80, 87, 71, 0, 0, 0, 0, 0, 0, - 0, 0, 68, 69, 70, 0, 0, 0, 0, 0, - 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, - 12, 0, 0, 0, 73, 74, 0, 75, 0, 0, - 0, 76, 0, 77, 78, 79, 0, 0, 81, 0, - 0, 0, 82, 0, 83, 0, 0, 504, 0, 0, - 0, 0, 0, 0, 0, 0, 84, 13, 16, 0, - 85, 0, 86, 0, 88, 0, 89, 0, 0, 0, - 0, 80, 87, 71, 0, 0, 0, 0, 0, 0, - 0, 0, 68, 69, 70, 0, 0, 0, 0, 0, - 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, - 12, 0, 0, 0, 73, 74, 0, 75, 0, 0, - 0, 76, 0, 77, 78, 79, 0, 0, 81, 0, - 0, 0, 82, 0, 83, 0, 0, 501, 0, 0, - 0, 0, 0, 0, 0, 0, 84, 13, 16, 0, - 85, 0, 86, 0, 88, 0, 89, 0, 0, 0, - 0, 80, 87, 71, 0, 0, 0, 0, 0, 0, - 0, 0, 68, 69, 70, 0, 0, 0, 0, 0, - 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, - 12, 0, 0, 0, 73, 74, 0, 75, 0, 0, - 0, 76, 0, 77, 78, 79, 0, 0, 81, 0, - 0, 0, 82, 0, 83, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 84, 13, 16, 0, - 85, 0, 86, 0, 88, 303, 89, 0, 0, 0, - 0, 80, 87, 71, 0, 0, 0, 0, 0, 0, - 0, 0, -96, 0, 0, 0, 68, 69, 70, 0, - 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, - 0, 0, 0, 0, 12, 0, 0, 0, 73, 74, - 0, 75, 0, 0, 0, 76, 0, 77, 78, 79, - 0, 0, 81, 0, 0, 0, 82, 0, 83, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 84, 13, 16, 0, 85, 0, 86, 0, 88, 0, - 89, 0, 0, 0, 0, 80, 87, 71, 0, 0, - 0, 0, 0, 0, 0, 0, 68, 69, 70, 0, - 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, - 0, 0, 0, 0, 12, 251, 0, 0, 532, 533, - 0, 75, 0, 0, 0, 76, 0, 77, 78, 79, - 0, 0, 81, 0, 0, 0, 82, 0, 83, 0, - 0, 0, 0, 0, 0, 0, 255, 0, 0, 0, - 84, 13, 16, 0, 85, 0, 86, 0, 88, 0, - 89, 0, 0, 0, 0, 80, 87, 71, 0, 246, - 0, 534, 0, 0, 0, 0, 142, 143, 144, 0, - 0, 146, 148, 149, 0, 0, 150, 0, 151, 0, - 0, 0, 153, 154, 155, 0, 0, 0, 0, 0, - 0, 12, 156, 157, 158, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 159, 0, 0, 0, 0, + 338, 174, 289, 485, 472, 472, -89, 480, -105, 380, + 43, 472, -79, -78, -100, 448, -97, 435, -102, 134, + 304, 326, 132, 104, 478, 375, 489, 372, 374, 456, + 377, 336, 199, 452, 423, 433, 440, 384, 421, 205, + 431, 456, 132, 365, 350, 344, 214, 476, -108, 456, + 324, 357, 462, 199, 367, 463, 363, 222, 472, 446, + 441, -75, -108, 182, 485, 448, -89, 588, 180, -75, + -97, 489, -100, 2, 289, 525, 380, 104, 224, 7, + 225, 582, 134, 304, 378, -102, 289, -105, -79, 472, + -65, 283, 328, 344, 268, 326, 2, 485, 174, 518, + 174, 174, 489, 333, 284, 218, 324, 372, 174, 572, + 174, 38, 91, 498, 91, 174, 0, 466, 174, 174, + 0, 0, 0, 92, 20, 92, 359, 91, 91, 346, + 475, 174, 459, 347, 445, 444, 576, 575, 92, 92, + 95, 174, 21, 174, 476, -78, 281, 280, 585, 39, + 509, 96, 491, 450, 12, 9, 8, 573, 175, 12, + 382, 499, 201, 212, 281, 280, 202, 279, 278, 281, + 280, 342, 174, 12, 274, 273, 45, 460, 528, 360, + 288, 287, 174, 487, 12, 0, 20, 207, 136, 97, + 12, 13, 16, 369, 41, 286, 13, 16, 207, 39, + 174, 586, 584, 0, 21, 40, 208, 137, 438, 138, + 13, 16, 174, 12, 0, 0, 0, 208, 0, 209, + 12, 13, 16, 12, 0, 524, 523, 13, 16, 520, + 46, 44, 12, 0, 98, 184, 183, 12, 0, 118, + 99, 119, 97, 118, 41, 119, 118, 97, 119, 0, + 13, 16, 120, 470, 469, 40, 120, 13, 16, 120, + 13, 16, 12, 306, 307, 267, 266, 12, 0, 13, + 16, 12, 0, 0, 13, 16, 174, 0, -319, 306, + 307, 12, 0, 521, 519, 0, 0, 98, -319, 0, + 308, 309, 98, 99, 106, 107, 106, 107, 99, 13, + 16, 21, 311, 312, 13, 16, 308, 309, 13, 16, + 12, 313, 12, 118, 314, 119, 315, 0, 13, 16, + 12, 108, 109, 108, 109, 12, 120, 311, 312, 267, + 266, 0, 12, 0, 0, 0, 313, 0, 0, 314, + 0, 315, 277, 276, 272, 271, 0, 13, 16, 13, + 16, 12, 277, 276, 0, 15, 0, 13, 16, 311, + 312, 0, 13, 16, 277, 276, 311, 312, 313, 13, + 16, 314, 0, 315, 0, 313, 12, 0, 314, 12, + 315, 14, 0, 272, 271, 111, 112, 0, 13, 16, + 0, 0, 0, 113, 114, 111, 112, 115, 0, 116, + 0, 0, 0, 113, 114, 0, 15, 115, 0, 116, + 0, 272, 271, 13, 16, 0, 13, 16, 26, 111, + 112, 0, 0, 0, 0, 0, 0, 113, 114, 0, + 27, 115, 14, 116, 0, 111, 112, 12, 0, 26, + 0, 311, 312, 113, 114, 0, 0, 115, 0, 116, + 313, 27, 0, 314, 0, 315, 0, 0, 12, 0, + 0, 0, 0, 29, 0, 0, 0, 15, 0, 0, + 0, 0, 0, 0, 28, 30, 0, 0, 0, 0, + 0, 0, 31, 0, 526, 0, 0, 0, 15, 0, + 0, 25, 0, 14, 0, 28, 30, 186, 0, 0, + 0, 0, 0, 31, 0, 0, 0, 187, 0, 111, + 112, 188, 25, 0, 14, 0, 0, 113, 114, 0, + 189, 115, 190, 116, 0, 340, 0, 0, 0, 0, + 0, 0, 0, 191, 0, 192, 95, 0, 0, 69, + 70, 0, 0, 193, 0, 0, 194, 96, 0, 72, + 0, 0, 195, 0, 0, 0, 12, 0, 196, 0, + 73, 74, 0, 75, 0, 0, 0, 0, 0, 0, + 78, 0, 0, 197, 81, 0, 0, 186, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 187, 0, 0, + 0, 188, 84, 13, 16, 0, 85, 0, 0, 0, + 189, 0, 190, 0, 0, 0, 0, 80, 87, 71, + 0, 0, 0, 191, 0, 192, 95, 0, 0, 0, + 0, 0, 0, 193, 0, 0, 194, 96, 0, 0, + 0, 0, 195, 0, 0, 0, 0, 0, 196, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 162, 0, 0, 0, 0, 0, 0, 13, 16, - 163, 164, 165, 0, 167, 168, 169, 170, 171, 172, - 0, 0, 160, 166, 152, 145, 147, 161, 0, 0, + 0, 0, 0, 197, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 69, 70, 0, 0, 0, + 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, + 0, 0, 12, 0, 0, 0, 73, 74, 0, 75, + 0, 0, 0, 0, 0, 0, 78, 0, 0, 0, + 81, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 84, 13, + 16, 0, 85, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 80, 87, 71, 0, 0, 0, 0, + 0, 0, 0, 0, 68, 69, 70, 0, 0, 0, + 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, + 0, 0, 12, 0, 0, 0, 73, 74, 0, 75, + 0, 0, 0, 76, 0, 77, 78, 79, 0, 0, + 81, 0, 0, 0, 82, 0, 83, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 84, 13, + 16, 0, 85, 0, 86, 0, 88, 0, 89, 0, + 0, 0, 0, 80, 87, 71, 0, 0, 0, 0, + 0, 0, 0, 0, -98, 0, 0, 0, 68, 69, + 70, 0, 0, 0, 0, 0, 0, 0, 0, 72, + 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, + 73, 74, 0, 75, 0, 0, 0, 76, 0, 77, + 78, 79, 0, 0, 81, 0, 0, 0, 82, 0, + 83, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 84, 13, 16, 0, 85, 0, 86, 0, + 88, 0, 89, 0, 0, 0, 0, 80, 87, 71, + 0, 0, 0, 0, 0, 0, 0, 0, 68, 69, + 70, 0, 0, 0, 0, 0, 0, 0, 0, 72, + 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, + 73, 74, 0, 75, 0, 0, 0, 76, 0, 77, + 78, 79, 0, 0, 81, 0, 0, 0, 82, 0, + 83, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 84, 13, 16, 0, 85, 0, 86, 0, + 88, 303, 89, 0, 0, 0, 0, 80, 87, 71, + 0, 0, 0, 0, 0, 0, 0, 0, 496, 0, + 0, 68, 69, 70, 0, 0, 0, 0, 0, 0, + 0, 0, 72, 0, 0, 0, 0, 0, 0, 12, + 0, 0, 0, 73, 74, 0, 75, 0, 0, 0, + 76, 0, 77, 78, 79, 0, 0, 81, 0, 0, + 0, 82, 0, 83, 0, 0, 497, 0, 0, 0, + 0, 0, 0, 0, 0, 84, 13, 16, 0, 85, + 0, 86, 0, 88, 0, 89, 0, 0, 0, 0, + 80, 87, 71, 0, 0, 0, 0, 0, 0, 0, + 0, 504, 0, 0, 68, 69, 70, 0, 0, 0, + 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, + 0, 0, 12, 0, 0, 0, 73, 74, 0, 75, + 0, 0, 0, 76, 0, 77, 78, 79, 0, 0, + 81, 0, 0, 0, 82, 0, 83, 0, 0, 505, + 0, 0, 0, 0, 0, 0, 0, 0, 84, 13, + 16, 0, 85, 0, 86, 0, 88, 0, 89, 0, + 0, 0, 0, 80, 87, 71, 0, 0, 0, 0, + 0, 0, 0, 0, 496, 0, 0, 68, 69, 70, + 0, 0, 0, 0, 0, 0, 0, 0, 72, 0, + 0, 0, 0, 0, 0, 12, 0, 0, 0, 73, + 74, 0, 75, 0, 0, 0, 76, 0, 77, 78, + 79, 0, 0, 81, 0, 0, 0, 82, 0, 83, + 0, 0, 502, 0, 0, 0, 0, 0, 0, 0, + 0, 84, 13, 16, 0, 85, 0, 86, 0, 88, + 0, 89, 0, 0, 0, 0, 80, 87, 71, 0, + 0, 0, 0, 0, 0, 0, 0, 504, 0, 0, + 68, 69, 70, 0, 0, 0, 0, 0, 0, 0, + 0, 72, 0, 0, 0, 0, 0, 0, 12, 0, + 0, 0, 73, 74, 0, 75, 0, 0, 0, 76, + 0, 77, 78, 79, 0, 0, 81, 0, 0, 0, + 82, 0, 83, 0, 0, 507, 0, 0, 0, 0, + 0, 0, 0, 0, 84, 13, 16, 0, 85, 0, + 86, 0, 88, 0, 89, 0, 0, 0, 0, 80, + 87, 71, 0, 0, 0, 0, 0, 0, 0, 0, + 496, 0, 0, 68, 69, 70, 0, 0, 0, 0, + 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, + 0, 12, 0, 0, 0, 73, 74, 0, 75, 0, + 0, 0, 76, 0, 77, 78, 79, 0, 0, 81, + 0, 0, 0, 82, 0, 83, 0, 0, 497, 0, + 0, 15, 0, 0, 0, 0, 0, 84, 13, 16, + 0, 85, 0, 86, 0, 88, 0, 89, 0, 0, + 0, 0, 80, 87, 71, 0, 0, 14, 0, 0, + 0, 0, 0, 68, 69, 70, 0, 0, 0, 0, + 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, + 0, 12, 251, 0, 0, 535, 536, 0, 75, 0, + 0, 0, 76, 0, 77, 78, 79, 0, 0, 81, + 0, 0, 0, 82, 0, 83, 0, 0, 0, 0, + 0, 0, 0, 255, 0, 0, 0, 84, 13, 16, + 0, 85, 0, 86, 0, 88, 0, 89, 0, 0, + 0, 0, 80, 87, 71, 0, 246, 0, 537, 0, 0, 0, 0, 142, 143, 144, 0, 0, 146, 148, 149, 0, 0, 150, 0, 151, 0, 0, 0, 153, - 154, 155, 0, 0, 0, 0, 0, 0, 425, 156, + 154, 155, 0, 0, 0, 0, 0, 0, 12, 156, 157, 158, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 159, 0, 0, 0, 426, 0, 0, 0, + 0, 0, 159, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 162, 0, - 0, 0, 0, 0, 430, 427, 429, 163, 164, 165, + 0, 0, 0, 0, 0, 13, 16, 163, 164, 165, 0, 167, 168, 169, 170, 171, 172, 0, 0, 160, 166, 152, 145, 147, 161, 0, 0, 0, 0, 0, 142, 143, 144, 0, 0, 146, 148, 149, 0, 0, @@ -464,222 +482,253 @@ const int JavaScriptGrammar::action_info [] = { 0, 0, 0, 0, 0, 425, 156, 157, 158, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 159, 0, 0, 0, 426, 0, 0, 0, 0, 0, 0, - 0, 428, 0, 0, 0, 162, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 162, 0, 0, 0, 0, 0, 430, 427, 429, 163, 164, 165, 0, 167, 168, 169, 170, 171, 172, 0, 0, 160, 166, 152, 145, - 147, 161, 0, 0, 0, 0, 0, 244, 0, 0, - 0, 0, 245, 0, 68, 69, 70, 247, 0, 0, - 0, 0, 0, 0, 248, 72, 0, 0, 0, 0, - 0, 0, 250, 251, 0, 0, 252, 74, 0, 75, - 0, 0, 0, 76, 0, 77, 78, 79, 0, 0, - 81, 0, 0, 0, 82, 0, 83, 0, 0, 0, - 0, 0, 254, 0, 255, 0, 0, 0, 84, 253, - 256, 257, 85, 258, 86, 259, 88, 31, 89, 260, - 261, 0, 0, 80, 87, 71, 25, 246, 0, 0, + 147, 161, 0, 0, 0, 0, 0, 142, 143, 144, + 0, 0, 146, 148, 149, 0, 0, 150, 0, 151, + 0, 0, 0, 153, 154, 155, 0, 0, 0, 0, + 0, 0, 425, 156, 157, 158, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 159, 0, 0, 0, + 426, 0, 0, 0, 0, 0, 0, 0, 428, 0, + 0, 0, 162, 0, 0, 0, 0, 0, 430, 427, + 429, 163, 164, 165, 0, 167, 168, 169, 170, 171, + 172, 0, 0, 160, 166, 152, 145, 147, 161, 0, 0, 0, 0, 0, 244, 0, 0, 0, 0, 245, 0, 68, 69, 70, 247, 0, 0, 0, 0, 0, - 0, 248, 249, 0, 0, 0, 0, 0, 0, 250, + 0, 248, 72, 0, 0, 0, 0, 0, 0, 250, 251, 0, 0, 252, 74, 0, 75, 0, 0, 0, 76, 0, 77, 78, 79, 0, 0, 81, 0, 0, 0, 82, 0, 83, 0, 0, 0, 0, 0, 254, 0, 255, 0, 0, 0, 84, 253, 256, 257, 85, 258, 86, 259, 88, 31, 89, 260, 261, 0, 0, 80, 87, 71, 25, 246, 0, 0, 0, 0, 0, - 0, 538, 143, 144, 0, 0, 540, 148, 542, 69, - 70, 543, 0, 151, 0, 0, 0, 153, 545, 546, - 0, 0, 0, 0, 0, 0, 547, 548, 157, 158, + 0, 244, 0, 0, 0, 0, 245, 0, 68, 69, + 70, 247, 0, 0, 0, 0, 0, 0, 248, 249, + 0, 0, 0, 0, 0, 0, 250, 251, 0, 0, 252, 74, 0, 75, 0, 0, 0, 76, 0, 77, - 549, 79, 0, 0, 551, 0, 0, 0, 82, 0, - 83, 0, 0, 0, 0, 0, 553, 0, 255, 0, - 0, 0, 555, 552, 554, 556, 557, 558, 86, 560, - 561, 562, 563, 564, 565, 0, 0, 550, 559, 544, - 539, 541, 161, 0, 0, 0, 0, 0, 393, 143, - 144, 0, 0, 395, 148, 397, 69, 70, 398, 0, - 151, 0, 0, 0, 153, 400, 401, 0, 0, 0, - 0, 0, 0, 402, 403, 157, 158, 252, 74, 0, - 75, 0, 0, 0, 76, 0, 77, 404, 79, 0, - 0, 406, 0, 0, 0, 82, 0, 83, 0, -242, - 0, 0, 0, 408, 0, 255, 0, 0, 0, 410, - 407, 409, 411, 412, 413, 86, 415, 416, 417, 418, - 419, 420, 0, 0, 405, 414, 399, 394, 396, 161, - 0, 0, 0, 0, 0, + 78, 79, 0, 0, 81, 0, 0, 0, 82, 0, + 83, 0, 0, 0, 0, 0, 254, 0, 255, 0, + 0, 0, 84, 253, 256, 257, 85, 258, 86, 259, + 88, 31, 89, 260, 261, 0, 0, 80, 87, 71, + 25, 246, 0, 0, 0, 0, 0, 0, 541, 143, + 144, 0, 0, 543, 148, 545, 69, 70, 546, 0, + 151, 0, 0, 0, 153, 548, 549, 0, 0, 0, + 0, 0, 0, 550, 551, 157, 158, 252, 74, 0, + 75, 0, 0, 0, 76, 0, 77, 552, 79, 0, + 0, 554, 0, 0, 0, 82, 0, 83, 0, 0, + 0, 0, 0, 556, 0, 255, 0, 0, 0, 558, + 555, 557, 559, 560, 561, 86, 563, 564, 565, 566, + 567, 568, 0, 0, 553, 562, 547, 542, 544, 161, + 0, 0, 0, 0, 0, 393, 143, 144, 0, 0, + 395, 148, 397, 69, 70, 398, 0, 151, 0, 0, + 0, 153, 400, 401, 0, 0, 0, 0, 0, 0, + 402, 403, 157, 158, 252, 74, 0, 75, 0, 0, + 0, 76, 0, 77, 404, 79, 0, 0, 406, 0, + 0, 0, 82, 0, 83, 0, -244, 0, 0, 0, + 408, 0, 255, 0, 0, 0, 410, 407, 409, 411, + 412, 413, 86, 415, 416, 417, 418, 419, 420, 0, + 0, 405, 414, 399, 394, 396, 161, 0, 0, 0, + 0, 0, - 55, 464, 479, 482, 221, 467, 379, 42, 573, 537, - 477, 579, 10, 488, 505, 519, 366, 270, 500, 206, - 211, 185, 285, 499, 204, 503, 370, 275, 486, 282, - 368, 492, 217, 490, 352, 270, 434, 468, 275, 471, - 471, 424, 176, 23, 270, 468, 179, 432, 173, 217, - 334, 334, 371, 471, 468, 334, 422, 181, 282, 457, - 282, 461, 223, 465, 385, 275, 449, 381, 513, 343, - 383, 217, 442, 341, 567, 198, 17, 570, 436, 179, - 573, 437, 0, 93, 0, 484, 213, 93, 0, 481, - 334, 11, 127, 11, 11, 334, 93, 339, 483, 447, - 242, 93, 93, 215, 511, 93, 93, 221, 352, 93, - 334, 128, 93, 105, 126, 93, 122, 93, 93, 121, - 93, 179, 93, 110, 129, 125, 93, 117, 439, 93, - 93, 124, 484, 436, 242, 130, 437, 93, 583, 483, - 362, 93, 93, 139, 215, 364, 242, 93, 334, 93, - 93, 0, 141, 133, 93, 131, 509, 135, 0, 93, - 337, 484, 93, 376, 102, 93, 203, 483, 361, 93, - 436, 512, 93, 437, 508, 93, 0, 93, 0, 373, - 269, 123, 93, 93, 215, 507, 93, 93, 510, 200, - 93, 93, 317, 0, 94, 318, 93, 93, 335, 100, - 93, 319, 101, 93, 93, 93, 330, 103, 320, 93, - 316, 302, 93, 0, 302, 330, 330, 302, 305, 93, - 302, 302, 93, 0, 302, 330, 323, 302, 358, 348, - 302, 93, 139, 0, 330, 325, 302, 349, 351, 302, - 298, 141, 210, 93, 93, 302, 345, 329, 302, 302, - 321, 35, 93, 0, 0, 327, 332, 302, 0, 310, - 0, 24, 37, 11, 524, 0, 0, 35, 529, 526, - 528, 530, 527, 531, 0, 0, 0, 24, 37, 11, + 334, 477, 282, 482, 270, 503, 467, 464, 275, 42, + 577, 55, 506, 479, 481, 217, 516, 522, 185, 23, + 468, 217, 540, 583, 10, 486, 488, 492, 490, 493, + 508, 270, 434, 385, 422, 383, 381, 366, 379, 368, + 270, 275, 468, 275, 334, 173, 282, 217, 242, 223, + 179, 468, 176, 334, 285, 371, 221, 343, 181, 341, + 211, 282, 465, 198, 352, 204, 457, 339, 370, 449, + 447, 206, 432, 442, 424, 334, 0, 93, 179, 501, + 0, 577, 318, 500, 213, 221, 93, 0, 471, 93, + 93, 93, 130, 483, 316, 317, 93, 461, 93, 93, + 215, 319, 93, 93, 320, 514, 93, 93, 129, 17, + 93, 0, 110, 94, 93, 93, 484, 102, 93, 242, + 93, 103, 101, 203, 337, 93, 11, 484, 93, 93, + 93, 513, 483, 93, 574, 515, 298, 93, 587, 334, + 0, 302, 200, 93, 93, 105, 334, 352, 125, 126, + 93, 11, 215, 269, 93, 93, 373, 510, 93, 124, + 512, 93, 436, 511, 179, 437, 93, 0, 242, 93, + 439, 127, 93, 123, 0, 436, 0, 128, 437, 93, + 93, 483, 215, 93, 93, 139, 436, 122, 335, 437, + 93, 93, 334, 141, 121, 362, 133, 376, 93, 93, + 100, 135, 93, 0, 117, 330, 361, 330, 131, 330, + 302, 93, 302, 93, 302, 330, 302, 0, 302, 0, + 302, 0, 0, 93, 327, 93, 345, 329, 302, 332, + 302, 351, 310, 0, 0, 0, 0, 349, 93, 0, + 348, 364, 93, 302, 93, 321, 484, 302, 93, 322, + 0, 93, 93, 302, 330, 323, 302, 302, 139, 302, + 35, 305, 0, 0, 325, 527, 141, 210, 35, 0, + 24, 37, 11, 0, 0, 0, 358, 0, 24, 37, + 11, 532, 529, 531, 533, 530, 534, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 571, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 569, 0, 0, 0, 0, 0, + 493, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 93, 0, 0, 0, 0, 302, 0, - 322, 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, 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, 0}; + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0}; const int JavaScriptGrammar::action_check [] = { - 1, 7, 17, 48, 61, 8, 60, 17, 55, 33, - 31, 60, 16, 36, 60, 7, 7, 61, 36, 60, - 36, 29, 7, 7, 7, 36, 7, 36, 33, 36, - 55, 8, 7, 5, 5, 8, 36, 33, 20, 78, - 60, 7, 5, 33, 33, 7, 7, 7, 36, 36, - 8, 7, 7, 55, 7, 7, 36, 55, 7, 7, - 36, 7, 36, 33, 7, 7, 7, 36, 36, 48, - 2, 8, 36, 7, 60, 8, 33, 76, 7, 7, - 1, 78, 36, 61, 78, 36, 36, 1, 55, 48, - 2, 36, 8, 33, 29, 88, 0, 2, 36, 7, - 65, 8, 29, -1, -1, 8, 8, 8, 8, 6, - 40, -1, 8, 60, 40, 8, 60, 48, 40, 10, - 8, 51, 8, 20, 8, 51, 8, 50, -1, 51, - 66, 54, 7, 8, 8, 15, 61, 62, 8, 78, - 8, 61, 62, 61, 62, 8, 61, 62, 61, 62, - 61, 62, 42, 33, 7, 40, 56, 60, 60, 60, - 56, 8, 12, 53, 55, 29, 51, 60, 56, 61, - 62, 50, 61, 62, 60, 54, 60, -1, 60, 1, - 61, 62, 56, 25, 29, 27, 29, 12, 29, 29, - 29, 61, 60, 29, -1, -1, 38, 15, 61, 62, - -1, -1, 66, 67, 25, 29, 27, 57, 61, 62, - -1, -1, -1, 63, 61, 62, 34, 38, 36, 29, - -1, 66, 67, 66, 67, 66, 67, 66, 67, 8, - 66, 67, 57, 25, 74, 27, 8, 25, 63, 27, - -1, -1, 66, 67, 7, 85, 38, 25, 29, 27, - 38, 25, 25, 27, 27, 12, 66, 67, 29, 25, - 38, 27, 8, -1, 38, 38, 25, 29, 27, 7, - -1, 25, 38, 27, 25, 15, 27, 15, 25, 38, - 27, 29, 61, 62, 38, 66, 67, 38, 29, 61, - 62, 38, 8, -1, 34, 33, 36, -1, 61, 62, - 57, 29, -1, 74, 66, 67, 63, 25, 36, 27, - -1, -1, -1, -1, 85, 61, 62, 33, 66, 67, - 38, 18, 19, 18, 19, 66, 67, 29, 18, 19, - 18, 19, -1, 29, 36, -1, -1, -1, 66, 67, - -1, -1, -1, 29, -1, 61, 62, 29, 45, 46, - 45, 46, -1, 15, 29, 45, 46, 45, 46, -1, - -1, 29, -1, 59, 66, 67, -1, -1, 29, -1, - 66, 67, 34, -1, 36, 61, 62, 59, 29, -1, - 66, 67, -1, -1, 66, 67, 61, 62, 29, 85, - -1, 66, 67, 61, 62, 10, 8, -1, 66, 67, - 61, 62, -1, 85, -1, 66, 67, 22, -1, -1, - 61, 62, -1, -1, 29, 66, 67, 29, -1, -1, - 61, 62, -1, 23, 24, 66, 67, 10, -1, 23, - 24, 31, 32, -1, -1, 35, -1, 37, 32, 22, - 55, 35, -1, 37, 59, -1, 29, 59, -1, -1, - -1, 66, 67, -1, 66, 67, -1, -1, -1, 74, - -1, -1, -1, -1, -1, -1, -1, -1, 83, -1, - 85, -1, 55, 85, -1, -1, 59, -1, -1, -1, - -1, -1, -1, 66, 67, 3, -1, -1, -1, -1, - -1, 74, -1, -1, -1, 13, -1, 23, 24, 17, - 83, -1, 85, -1, -1, 31, 32, -1, 26, 35, - 28, 37, -1, 31, -1, -1, -1, -1, -1, -1, - -1, 39, -1, 41, 42, -1, -1, 12, 13, -1, - -1, 49, -1, -1, 52, 53, -1, 22, -1, -1, - 58, -1, -1, -1, 29, -1, 64, -1, 33, 34, - -1, 36, -1, -1, -1, -1, -1, -1, 43, -1, - -1, 79, 47, -1, -1, 3, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 13, -1, -1, -1, 17, - 65, 66, 67, -1, 69, -1, -1, -1, 26, -1, - 28, -1, -1, -1, -1, 80, 81, 82, -1, -1, - -1, 39, -1, 41, 42, -1, -1, -1, -1, -1, - -1, 49, -1, -1, 52, 53, -1, -1, -1, -1, - 58, -1, -1, -1, -1, -1, 64, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 79, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 12, 13, -1, -1, -1, -1, -1, - -1, -1, -1, 22, -1, -1, -1, -1, -1, -1, - 29, -1, -1, -1, 33, 34, -1, 36, -1, -1, - -1, -1, -1, -1, 43, -1, -1, -1, 47, -1, + 60, 8, 36, 36, 33, 33, 7, 60, 7, 36, + 29, 33, 7, 7, 7, 36, 7, 55, 7, 78, + 1, 78, 48, 1, 36, 33, 36, 36, 60, 5, + 55, 61, 2, 33, 8, 55, 60, 16, 7, 7, + 7, 5, 48, 60, 7, 2, 60, 20, 7, 5, + 48, 17, 55, 2, 31, 7, 61, 8, 33, 7, + 7, 7, 7, 60, 36, 36, 7, 0, 8, 7, + 7, 36, 7, 88, 36, 29, 36, 1, 60, 65, + 33, 17, 78, 1, 7, 7, 36, 7, 7, 33, + 33, 76, 8, 2, 55, 78, 88, 36, 8, 29, + 8, 8, 36, 61, 36, 36, 48, 36, 8, 8, + 8, 66, 40, 8, 40, 8, -1, 7, 8, 8, + -1, -1, -1, 51, 15, 51, 8, 40, 40, 50, + 6, 8, 10, 54, 61, 62, 61, 62, 51, 51, + 42, 8, 33, 8, 20, 7, 61, 62, 8, 29, + 60, 53, 60, 60, 29, 61, 62, 56, 56, 29, + 60, 56, 50, 56, 61, 62, 54, 61, 62, 61, + 62, 60, 8, 29, 61, 62, 7, 55, 7, 61, + 61, 62, 8, 60, 29, -1, 15, 15, 15, 12, + 29, 66, 67, 60, 74, 60, 66, 67, 15, 29, + 8, 61, 62, -1, 33, 85, 34, 34, 36, 36, + 66, 67, 8, 29, -1, -1, -1, 34, -1, 36, + 29, 66, 67, 29, -1, 61, 62, 66, 67, 7, + 61, 62, 29, -1, 57, 61, 62, 29, -1, 25, + 63, 27, 12, 25, 74, 27, 25, 12, 27, -1, + 66, 67, 38, 61, 62, 85, 38, 66, 67, 38, + 66, 67, 29, 18, 19, 61, 62, 29, -1, 66, + 67, 29, -1, -1, 66, 67, 8, -1, 36, 18, + 19, 29, -1, 61, 62, -1, -1, 57, 36, -1, + 45, 46, 57, 63, 18, 19, 18, 19, 63, 66, + 67, 33, 23, 24, 66, 67, 45, 46, 66, 67, + 29, 32, 29, 25, 35, 27, 37, -1, 66, 67, + 29, 45, 46, 45, 46, 29, 38, 23, 24, 61, + 62, -1, 29, -1, -1, -1, 32, -1, -1, 35, + -1, 37, 61, 62, 61, 62, -1, 66, 67, 66, + 67, 29, 61, 62, -1, 59, -1, 66, 67, 23, + 24, -1, 66, 67, 61, 62, 23, 24, 32, 66, + 67, 35, -1, 37, -1, 32, 29, -1, 35, 29, + 37, 85, -1, 61, 62, 23, 24, -1, 66, 67, + -1, -1, -1, 31, 32, 23, 24, 35, -1, 37, + -1, -1, -1, 31, 32, -1, 59, 35, -1, 37, + -1, 61, 62, 66, 67, -1, 66, 67, 10, 23, + 24, -1, -1, -1, -1, -1, -1, 31, 32, -1, + 22, 35, 85, 37, -1, 23, 24, 29, -1, 10, + -1, 23, 24, 31, 32, -1, -1, 35, -1, 37, + 32, 22, -1, 35, -1, 37, -1, -1, 29, -1, + -1, -1, -1, 55, -1, -1, -1, 59, -1, -1, + -1, -1, -1, -1, 66, 67, -1, -1, -1, -1, + -1, -1, 74, -1, 55, -1, -1, -1, 59, -1, + -1, 83, -1, 85, -1, 66, 67, 3, -1, -1, + -1, -1, -1, 74, -1, -1, -1, 13, -1, 23, + 24, 17, 83, -1, 85, -1, -1, 31, 32, -1, + 26, 35, 28, 37, -1, 31, -1, -1, -1, -1, + -1, -1, -1, 39, -1, 41, 42, -1, -1, 12, + 13, -1, -1, 49, -1, -1, 52, 53, -1, 22, + -1, -1, 58, -1, -1, -1, 29, -1, 64, -1, + 33, 34, -1, 36, -1, -1, -1, -1, -1, -1, + 43, -1, -1, 79, 47, -1, -1, 3, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 13, -1, -1, + -1, 17, 65, 66, 67, -1, 69, -1, -1, -1, + 26, -1, 28, -1, -1, -1, -1, 80, 81, 82, + -1, -1, -1, 39, -1, 41, 42, -1, -1, -1, + -1, -1, -1, 49, -1, -1, 52, 53, -1, -1, + -1, -1, 58, -1, -1, -1, -1, -1, 64, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 65, 66, 67, -1, - 69, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 80, 81, 82, -1, -1, -1, -1, -1, -1, - -1, -1, 11, 12, 13, -1, -1, -1, -1, -1, - -1, -1, -1, 22, -1, -1, -1, -1, -1, -1, - 29, -1, -1, -1, 33, 34, -1, 36, -1, -1, - -1, 40, -1, 42, 43, 44, -1, -1, 47, -1, - -1, -1, 51, -1, 53, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 65, 66, 67, -1, - 69, -1, 71, -1, 73, -1, 75, -1, -1, -1, - -1, 80, 81, 82, -1, -1, -1, -1, -1, -1, - -1, -1, 11, 12, 13, -1, -1, -1, -1, -1, - -1, -1, -1, 22, -1, -1, -1, -1, -1, -1, - 29, -1, -1, -1, 33, 34, -1, 36, -1, -1, - -1, 40, -1, 42, 43, 44, -1, -1, 47, -1, - -1, -1, 51, -1, 53, -1, -1, 56, -1, -1, - -1, -1, -1, -1, -1, -1, 65, 66, 67, -1, - 69, -1, 71, -1, 73, -1, 75, -1, -1, -1, - -1, 80, 81, 82, -1, -1, -1, -1, -1, -1, - -1, -1, 11, 12, 13, -1, -1, -1, -1, -1, - -1, -1, -1, 22, -1, -1, -1, -1, -1, -1, - 29, -1, -1, -1, 33, 34, -1, 36, -1, -1, - -1, 40, -1, 42, 43, 44, -1, -1, 47, -1, - -1, -1, 51, -1, 53, -1, -1, 56, -1, -1, - -1, -1, -1, -1, -1, -1, 65, 66, 67, -1, - 69, -1, 71, -1, 73, -1, 75, -1, -1, -1, - -1, 80, 81, 82, -1, -1, -1, -1, -1, -1, - -1, -1, 11, 12, 13, -1, -1, -1, -1, -1, - -1, -1, -1, 22, -1, -1, -1, -1, -1, -1, - 29, -1, -1, -1, 33, 34, -1, 36, -1, -1, - -1, 40, -1, 42, 43, 44, -1, -1, 47, -1, - -1, -1, 51, -1, 53, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 65, 66, 67, -1, - 69, -1, 71, -1, 73, 74, 75, -1, -1, -1, - -1, 80, 81, 82, -1, -1, -1, -1, -1, -1, - -1, -1, 7, -1, -1, -1, 11, 12, 13, -1, - -1, -1, -1, -1, -1, -1, -1, 22, -1, -1, - -1, -1, -1, -1, 29, -1, -1, -1, 33, 34, - -1, 36, -1, -1, -1, 40, -1, 42, 43, 44, - -1, -1, 47, -1, -1, -1, 51, -1, 53, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 65, 66, 67, -1, 69, -1, 71, -1, 73, -1, - 75, -1, -1, -1, -1, 80, 81, 82, -1, -1, - -1, -1, -1, -1, -1, -1, 11, 12, 13, -1, - -1, -1, -1, -1, -1, -1, -1, 22, -1, -1, - -1, -1, -1, -1, 29, 30, -1, -1, 33, 34, - -1, 36, -1, -1, -1, 40, -1, 42, 43, 44, - -1, -1, 47, -1, -1, -1, 51, -1, 53, -1, - -1, -1, -1, -1, -1, -1, 61, -1, -1, -1, - 65, 66, 67, -1, 69, -1, 71, -1, 73, -1, - 75, -1, -1, -1, -1, 80, 81, 82, -1, 84, - -1, 86, -1, -1, -1, -1, 4, 5, 6, -1, - -1, 9, 10, 11, -1, -1, 14, -1, 16, -1, - -1, -1, 20, 21, 22, -1, -1, -1, -1, -1, - -1, 29, 30, 31, 32, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 43, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 59, -1, -1, -1, -1, -1, -1, 66, 67, - 68, 69, 70, -1, 72, 73, 74, 75, 76, 77, - -1, -1, 80, 81, 82, 83, 84, 85, -1, -1, + -1, -1, -1, 79, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 12, 13, -1, -1, -1, + -1, -1, -1, -1, -1, 22, -1, -1, -1, -1, + -1, -1, 29, -1, -1, -1, 33, 34, -1, 36, + -1, -1, -1, -1, -1, -1, 43, -1, -1, -1, + 47, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 65, 66, + 67, -1, 69, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 80, 81, 82, -1, -1, -1, -1, + -1, -1, -1, -1, 11, 12, 13, -1, -1, -1, + -1, -1, -1, -1, -1, 22, -1, -1, -1, -1, + -1, -1, 29, -1, -1, -1, 33, 34, -1, 36, + -1, -1, -1, 40, -1, 42, 43, 44, -1, -1, + 47, -1, -1, -1, 51, -1, 53, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 65, 66, + 67, -1, 69, -1, 71, -1, 73, -1, 75, -1, + -1, -1, -1, 80, 81, 82, -1, -1, -1, -1, + -1, -1, -1, -1, 7, -1, -1, -1, 11, 12, + 13, -1, -1, -1, -1, -1, -1, -1, -1, 22, + -1, -1, -1, -1, -1, -1, 29, -1, -1, -1, + 33, 34, -1, 36, -1, -1, -1, 40, -1, 42, + 43, 44, -1, -1, 47, -1, -1, -1, 51, -1, + 53, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 65, 66, 67, -1, 69, -1, 71, -1, + 73, -1, 75, -1, -1, -1, -1, 80, 81, 82, + -1, -1, -1, -1, -1, -1, -1, -1, 11, 12, + 13, -1, -1, -1, -1, -1, -1, -1, -1, 22, + -1, -1, -1, -1, -1, -1, 29, -1, -1, -1, + 33, 34, -1, 36, -1, -1, -1, 40, -1, 42, + 43, 44, -1, -1, 47, -1, -1, -1, 51, -1, + 53, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 65, 66, 67, -1, 69, -1, 71, -1, + 73, 74, 75, -1, -1, -1, -1, 80, 81, 82, + -1, -1, -1, -1, -1, -1, -1, -1, 8, -1, + -1, 11, 12, 13, -1, -1, -1, -1, -1, -1, + -1, -1, 22, -1, -1, -1, -1, -1, -1, 29, + -1, -1, -1, 33, 34, -1, 36, -1, -1, -1, + 40, -1, 42, 43, 44, -1, -1, 47, -1, -1, + -1, 51, -1, 53, -1, -1, 56, -1, -1, -1, + -1, -1, -1, -1, -1, 65, 66, 67, -1, 69, + -1, 71, -1, 73, -1, 75, -1, -1, -1, -1, + 80, 81, 82, -1, -1, -1, -1, -1, -1, -1, + -1, 8, -1, -1, 11, 12, 13, -1, -1, -1, + -1, -1, -1, -1, -1, 22, -1, -1, -1, -1, + -1, -1, 29, -1, -1, -1, 33, 34, -1, 36, + -1, -1, -1, 40, -1, 42, 43, 44, -1, -1, + 47, -1, -1, -1, 51, -1, 53, -1, -1, 56, + -1, -1, -1, -1, -1, -1, -1, -1, 65, 66, + 67, -1, 69, -1, 71, -1, 73, -1, 75, -1, + -1, -1, -1, 80, 81, 82, -1, -1, -1, -1, + -1, -1, -1, -1, 8, -1, -1, 11, 12, 13, + -1, -1, -1, -1, -1, -1, -1, -1, 22, -1, + -1, -1, -1, -1, -1, 29, -1, -1, -1, 33, + 34, -1, 36, -1, -1, -1, 40, -1, 42, 43, + 44, -1, -1, 47, -1, -1, -1, 51, -1, 53, + -1, -1, 56, -1, -1, -1, -1, -1, -1, -1, + -1, 65, 66, 67, -1, 69, -1, 71, -1, 73, + -1, 75, -1, -1, -1, -1, 80, 81, 82, -1, + -1, -1, -1, -1, -1, -1, -1, 8, -1, -1, + 11, 12, 13, -1, -1, -1, -1, -1, -1, -1, + -1, 22, -1, -1, -1, -1, -1, -1, 29, -1, + -1, -1, 33, 34, -1, 36, -1, -1, -1, 40, + -1, 42, 43, 44, -1, -1, 47, -1, -1, -1, + 51, -1, 53, -1, -1, 56, -1, -1, -1, -1, + -1, -1, -1, -1, 65, 66, 67, -1, 69, -1, + 71, -1, 73, -1, 75, -1, -1, -1, -1, 80, + 81, 82, -1, -1, -1, -1, -1, -1, -1, -1, + 8, -1, -1, 11, 12, 13, -1, -1, -1, -1, + -1, -1, -1, -1, 22, -1, -1, -1, -1, -1, + -1, 29, -1, -1, -1, 33, 34, -1, 36, -1, + -1, -1, 40, -1, 42, 43, 44, -1, -1, 47, + -1, -1, -1, 51, -1, 53, -1, -1, 56, -1, + -1, 59, -1, -1, -1, -1, -1, 65, 66, 67, + -1, 69, -1, 71, -1, 73, -1, 75, -1, -1, + -1, -1, 80, 81, 82, -1, -1, 85, -1, -1, + -1, -1, -1, 11, 12, 13, -1, -1, -1, -1, + -1, -1, -1, -1, 22, -1, -1, -1, -1, -1, + -1, 29, 30, -1, -1, 33, 34, -1, 36, -1, + -1, -1, 40, -1, 42, 43, 44, -1, -1, 47, + -1, -1, -1, 51, -1, 53, -1, -1, -1, -1, + -1, -1, -1, 61, -1, -1, -1, 65, 66, 67, + -1, 69, -1, 71, -1, 73, -1, 75, -1, -1, + -1, -1, 80, 81, 82, -1, 84, -1, 86, -1, -1, -1, -1, 4, 5, 6, -1, -1, 9, 10, 11, -1, -1, 14, -1, 16, -1, -1, -1, 20, 21, 22, -1, -1, -1, -1, -1, -1, 29, 30, 31, 32, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 43, -1, -1, -1, 47, -1, -1, -1, + -1, -1, 43, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 59, -1, - -1, -1, -1, -1, 65, 66, 67, 68, 69, 70, + -1, -1, -1, -1, -1, 66, 67, 68, 69, 70, -1, 72, 73, 74, 75, 76, 77, -1, -1, 80, 81, 82, 83, 84, 85, -1, -1, -1, -1, -1, 4, 5, 6, -1, -1, 9, 10, 11, -1, -1, @@ -687,18 +736,18 @@ const int JavaScriptGrammar::action_check [] = { -1, -1, -1, -1, -1, 29, 30, 31, 32, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 43, -1, -1, -1, 47, -1, -1, -1, -1, -1, -1, - -1, 55, -1, -1, -1, 59, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 59, -1, -1, -1, -1, -1, 65, 66, 67, 68, 69, 70, -1, 72, 73, 74, 75, 76, 77, -1, -1, 80, 81, 82, 83, - 84, 85, -1, -1, -1, -1, -1, 4, -1, -1, - -1, -1, 9, -1, 11, 12, 13, 14, -1, -1, - -1, -1, -1, -1, 21, 22, -1, -1, -1, -1, - -1, -1, 29, 30, -1, -1, 33, 34, -1, 36, - -1, -1, -1, 40, -1, 42, 43, 44, -1, -1, - 47, -1, -1, -1, 51, -1, 53, -1, -1, -1, - -1, -1, 59, -1, 61, -1, -1, -1, 65, 66, - 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, - 77, -1, -1, 80, 81, 82, 83, 84, -1, -1, + 84, 85, -1, -1, -1, -1, -1, 4, 5, 6, + -1, -1, 9, 10, 11, -1, -1, 14, -1, 16, + -1, -1, -1, 20, 21, 22, -1, -1, -1, -1, + -1, -1, 29, 30, 31, 32, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 43, -1, -1, -1, + 47, -1, -1, -1, -1, -1, -1, -1, 55, -1, + -1, -1, 59, -1, -1, -1, -1, -1, 65, 66, + 67, 68, 69, 70, -1, 72, 73, 74, 75, 76, + 77, -1, -1, 80, 81, 82, 83, 84, 85, -1, -1, -1, -1, -1, 4, -1, -1, -1, -1, 9, -1, 11, 12, 13, 14, -1, -1, -1, -1, -1, -1, 21, 22, -1, -1, -1, -1, -1, -1, 29, @@ -708,60 +757,73 @@ const int JavaScriptGrammar::action_check [] = { -1, 61, -1, -1, -1, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, -1, -1, 80, 81, 82, 83, 84, -1, -1, -1, -1, -1, - -1, 4, 5, 6, -1, -1, 9, 10, 11, 12, - 13, 14, -1, 16, -1, -1, -1, 20, 21, 22, - -1, -1, -1, -1, -1, -1, 29, 30, 31, 32, + -1, 4, -1, -1, -1, -1, 9, -1, 11, 12, + 13, 14, -1, -1, -1, -1, -1, -1, 21, 22, + -1, -1, -1, -1, -1, -1, 29, 30, -1, -1, 33, 34, -1, 36, -1, -1, -1, 40, -1, 42, 43, 44, -1, -1, 47, -1, -1, -1, 51, -1, 53, -1, -1, -1, -1, -1, 59, -1, 61, -1, -1, -1, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, -1, -1, 80, 81, 82, - 83, 84, 85, -1, -1, -1, -1, -1, 4, 5, + 83, 84, -1, -1, -1, -1, -1, -1, 4, 5, 6, -1, -1, 9, 10, 11, 12, 13, 14, -1, 16, -1, -1, -1, 20, 21, 22, -1, -1, -1, -1, -1, -1, 29, 30, 31, 32, 33, 34, -1, 36, -1, -1, -1, 40, -1, 42, 43, 44, -1, - -1, 47, -1, -1, -1, 51, -1, 53, -1, 55, + -1, 47, -1, -1, -1, 51, -1, 53, -1, -1, -1, -1, -1, 59, -1, 61, -1, -1, -1, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, -1, -1, 80, 81, 82, 83, 84, 85, - -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 4, 5, 6, -1, -1, + 9, 10, 11, 12, 13, 14, -1, 16, -1, -1, + -1, 20, 21, 22, -1, -1, -1, -1, -1, -1, + 29, 30, 31, 32, 33, 34, -1, 36, -1, -1, + -1, 40, -1, 42, 43, 44, -1, -1, 47, -1, + -1, -1, 51, -1, 53, -1, 55, -1, -1, -1, + 59, -1, 61, -1, -1, -1, 65, 66, 67, 68, + 69, 70, 71, 72, 73, 74, 75, 76, 77, -1, + -1, 80, 81, 82, 83, 84, 85, -1, -1, -1, + -1, -1, - 14, 77, 23, 15, 23, 77, 67, 20, 23, 10, - 94, 29, 5, 67, 14, 14, 67, 23, 29, 29, - 14, 63, 14, 25, 29, 29, 67, 23, 14, 67, - 14, 67, 23, 14, 23, 23, 67, 14, 23, 15, - 15, 31, 29, 23, 23, 14, 29, 29, 14, 23, - 14, 14, 23, 15, 14, 14, 29, 29, 67, 92, - 67, 89, 23, 14, 67, 23, 14, 14, 23, 67, - 67, 23, 67, 14, 6, 29, 6, 6, 34, 29, - 23, 37, -1, 40, -1, 42, 36, 40, -1, 15, - 14, 23, 45, 23, 23, 14, 40, 67, 42, 67, - 67, 40, 40, 42, 42, 40, 40, 23, 23, 40, - 14, 45, 40, 48, 45, 40, 44, 40, 40, 44, - 40, 29, 40, 46, 46, 45, 40, 45, 36, 40, - 40, 45, 42, 34, 67, 46, 37, 40, 81, 42, - 64, 40, 40, 23, 42, 64, 67, 40, 14, 40, - 40, -1, 32, 52, 40, 46, 42, 50, -1, 40, - 64, 42, 40, 96, 42, 40, 56, 42, 83, 40, - 34, 42, 40, 37, 42, 40, -1, 40, -1, 95, - 101, 44, 40, 40, 42, 42, 40, 40, 42, 54, - 40, 40, 45, -1, 43, 45, 40, 40, 64, 42, - 40, 45, 42, 40, 40, 40, 40, 43, 45, 40, - 45, 45, 40, -1, 45, 40, 40, 45, 49, 40, - 45, 45, 40, -1, 45, 40, 47, 45, 62, 57, - 45, 40, 23, -1, 40, 53, 45, 62, 62, 45, - 40, 32, 33, 40, 40, 45, 55, 62, 45, 45, - 47, 11, 40, -1, -1, 51, 62, 45, -1, 47, - -1, 21, 22, 23, 8, -1, -1, 11, 14, 15, - 16, 17, 18, 19, -1, -1, -1, 21, 22, 23, + 14, 93, 66, 15, 23, 29, 76, 76, 23, 20, + 23, 14, 29, 23, 15, 23, 23, 14, 62, 23, + 14, 23, 10, 29, 5, 14, 66, 66, 14, 29, + 14, 23, 66, 66, 29, 66, 14, 66, 66, 14, + 23, 23, 14, 23, 14, 14, 66, 23, 66, 23, + 29, 14, 29, 14, 14, 23, 23, 66, 29, 14, + 14, 66, 14, 29, 23, 29, 91, 66, 66, 14, + 66, 29, 29, 66, 30, 14, -1, 39, 29, 25, + -1, 23, 44, 29, 35, 23, 39, -1, 15, 39, + 39, 39, 45, 41, 44, 44, 39, 88, 39, 39, + 41, 44, 39, 39, 44, 41, 39, 39, 45, 6, + 39, -1, 45, 42, 39, 39, 41, 41, 39, 66, + 39, 42, 41, 55, 63, 39, 23, 41, 39, 39, + 39, 41, 41, 39, 6, 41, 39, 39, 80, 14, + -1, 44, 53, 39, 39, 47, 14, 23, 44, 44, + 39, 23, 41, 100, 39, 39, 94, 41, 39, 44, + 41, 39, 33, 41, 29, 36, 39, -1, 66, 39, + 35, 44, 39, 43, -1, 33, -1, 44, 36, 39, + 39, 41, 41, 39, 39, 23, 33, 43, 63, 36, + 39, 39, 14, 31, 43, 63, 51, 95, 39, 39, + 41, 49, 39, -1, 44, 39, 82, 39, 45, 39, + 44, 39, 44, 39, 44, 39, 44, -1, 44, -1, + 44, -1, -1, 39, 50, 39, 54, 61, 44, 61, + 44, 61, 46, -1, -1, -1, -1, 61, 39, -1, + 56, 63, 39, 44, 39, 46, 41, 44, 39, 46, + -1, 39, 39, 44, 39, 46, 44, 44, 23, 44, + 11, 48, -1, -1, 52, 8, 31, 32, 11, -1, + 21, 22, 23, -1, -1, -1, 61, -1, 21, 22, + 23, 14, 15, 16, 17, 18, 19, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 6, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 23, -1, -1, -1, -1, -1, + 29, -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, -1, 40, -1, -1, -1, -1, 45, -1, - 47, -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, -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}; diff --git a/src/declarative/qml/parser/javascriptgrammar_p.h b/src/declarative/qml/parser/javascriptgrammar_p.h index de83cd0..830f533 100644 --- a/src/declarative/qml/parser/javascriptgrammar_p.h +++ b/src/declarative/qml/parser/javascriptgrammar_p.h @@ -150,15 +150,15 @@ public: T_XOR = 78, T_XOR_EQ = 79, - ACCEPT_STATE = 584, - RULE_COUNT = 321, - STATE_COUNT = 585, + ACCEPT_STATE = 588, + RULE_COUNT = 323, + STATE_COUNT = 589, TERMINAL_COUNT = 91, - NON_TERMINAL_COUNT = 103, + NON_TERMINAL_COUNT = 102, - GOTO_INDEX_OFFSET = 585, - GOTO_INFO_OFFSET = 1825, - GOTO_CHECK_OFFSET = 1825 + GOTO_INDEX_OFFSET = 589, + GOTO_INFO_OFFSET = 2092, + GOTO_CHECK_OFFSET = 2092 }; static const char *const spell []; diff --git a/src/declarative/qml/parser/javascriptparser.cpp b/src/declarative/qml/parser/javascriptparser.cpp index 5d456c7..7ff438e 100644 --- a/src/declarative/qml/parser/javascriptparser.cpp +++ b/src/declarative/qml/parser/javascriptparser.cpp @@ -400,60 +400,48 @@ case 46: { } case 47: { - AST::UiQualifiedId *node = makeAstNode (driver->nodePool(), sym(1).sval); - node->identifierToken = loc(1); - sym(1).Node = node; -} break; - -case 48: { - AST::UiQualifiedId *node = makeAstNode (driver->nodePool(), sym(1).UiQualifiedId, sym(3).sval); - node->identifierToken = loc(3); - sym(1).Node = node; -} break; - -case 49: { AST::ThisExpression *node = makeAstNode (driver->nodePool()); node->thisToken = loc(1); sym(1).Node = node; } break; -case 50: { +case 48: { AST::IdentifierExpression *node = makeAstNode (driver->nodePool(), sym(1).sval); node->identifierToken = loc(1); sym(1).Node = node; } break; -case 51: { +case 49: { AST::NullExpression *node = makeAstNode (driver->nodePool()); node->nullToken = loc(1); sym(1).Node = node; } break; -case 52: { +case 50: { AST::TrueLiteral *node = makeAstNode (driver->nodePool()); node->trueToken = loc(1); sym(1).Node = node; } break; -case 53: { +case 51: { AST::FalseLiteral *node = makeAstNode (driver->nodePool()); node->falseToken = loc(1); sym(1).Node = node; } break; -case 54: { +case 52: { AST::NumericLiteral *node = makeAstNode (driver->nodePool(), sym(1).dval); node->literalToken = loc(1); sym(1).Node = node; } break; -case 55: { +case 53: { AST::StringLiteral *node = makeAstNode (driver->nodePool(), sym(1).sval); node->literalToken = loc(1); sym(1).Node = node; } break; -case 56: { +case 54: { bool rx = lexer->scanRegExp(Lexer::NoPrefix); if (!rx) { diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage())); @@ -464,7 +452,7 @@ case 56: { sym(1).Node = node; } break; -case 57: { +case 55: { bool rx = lexer->scanRegExp(Lexer::EqualPrefix); if (!rx) { diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage())); @@ -475,22 +463,39 @@ case 57: { sym(1).Node = node; } break; -case 58: { - AST::ArrayLiteral *node = makeAstNode (driver->nodePool(), sym(2).Elision); +case 56: { + AST::ArrayLiteral *node = makeAstNode (driver->nodePool(), (AST::Elision *) 0); + node->lbracketToken = loc(1); + node->rbracketToken = loc(2); + sym(1).Node = node; +} break; + +case 57: { + AST::ArrayLiteral *node = makeAstNode (driver->nodePool(), sym(2).Elision->finish()); node->lbracketToken = loc(1); node->rbracketToken = loc(3); sym(1).Node = node; } break; -case 59: { +case 58: { AST::ArrayLiteral *node = makeAstNode (driver->nodePool(), sym(2).ElementList->finish ()); node->lbracketToken = loc(1); node->rbracketToken = loc(3); sym(1).Node = node; } break; +case 59: { + AST::ArrayLiteral *node = makeAstNode (driver->nodePool(), sym(2).ElementList->finish (), + (AST::Elision *) 0); + node->lbracketToken = loc(1); + node->commaToken = loc(3); + node->rbracketToken = loc(4); + sym(1).Node = node; +} break; + case 60: { - AST::ArrayLiteral *node = makeAstNode (driver->nodePool(), sym(2).ElementList->finish (), sym(4).Elision); + AST::ArrayLiteral *node = makeAstNode (driver->nodePool(), sym(2).ElementList->finish (), + sym(4).Elision->finish()); node->lbracketToken = loc(1); node->commaToken = loc(3); node->rbracketToken = loc(5); @@ -525,43 +530,59 @@ case 63: { } break; case 64: { - sym(1).Node = makeAstNode (driver->nodePool(), sym(1).Elision, sym(2).Expression); -} break; + AST::UiQualifiedId *node = makeAstNode (driver->nodePool(), sym(1).sval); + node->identifierToken = loc(1); + sym(1).Node = node; +} break; case 65: { - AST::ElementList *node = makeAstNode (driver->nodePool(), sym(1).ElementList, sym(3).Elision, sym(4).Expression); - node->commaToken = loc(2); - sym(1).Node = node; -} break; + AST::UiQualifiedId *node = makeAstNode (driver->nodePool(), sym(1).UiQualifiedId, sym(3).sval); + node->identifierToken = loc(3); + sym(1).Node = node; +} break; case 66: { - AST::Elision *node = makeAstNode (driver->nodePool()); - node->commaToken = loc(1); - sym(1).Node = node; + sym(1).Node = makeAstNode (driver->nodePool(), (AST::Elision *) 0, sym(1).Expression); } break; case 67: { - AST::Elision *node = makeAstNode (driver->nodePool(), sym(1).Elision); - node->commaToken = loc(2); - sym(1).Node = node; + sym(1).Node = makeAstNode (driver->nodePool(), sym(1).Elision->finish(), sym(2).Expression); } break; case 68: { - sym(1).Node = 0; + AST::ElementList *node = makeAstNode (driver->nodePool(), sym(1).ElementList, + (AST::Elision *) 0, sym(3).Expression); + node->commaToken = loc(2); + sym(1).Node = node; } break; case 69: { - sym(1).Elision = sym(1).Elision->finish (); + AST::ElementList *node = makeAstNode (driver->nodePool(), sym(1).ElementList, sym(3).Elision->finish(), + sym(4).Expression); + node->commaToken = loc(2); + sym(1).Node = node; } break; case 70: { + AST::Elision *node = makeAstNode (driver->nodePool()); + node->commaToken = loc(1); + sym(1).Node = node; +} break; + +case 71: { + AST::Elision *node = makeAstNode (driver->nodePool(), sym(1).Elision); + node->commaToken = loc(2); + sym(1).Node = node; +} break; + +case 72: { AST::PropertyNameAndValueList *node = makeAstNode (driver->nodePool(), sym(1).PropertyName, sym(3).Expression); node->colonToken = loc(2); sym(1).Node = node; } break; -case 71: { +case 73: { AST::PropertyNameAndValueList *node = makeAstNode (driver->nodePool(), sym(1).PropertyNameAndValueList, sym(3).PropertyName, sym(5).Expression); node->commaToken = loc(2); @@ -569,40 +590,36 @@ case 71: { sym(1).Node = node; } break; -case 72: { +case 74: { AST::IdentifierPropertyName *node = makeAstNode (driver->nodePool(), sym(1).sval); node->propertyNameToken = loc(1); sym(1).Node = node; } break; -case 73: -case 74: { +case 75: +case 76: { AST::IdentifierPropertyName *node = makeAstNode (driver->nodePool(), driver->intern(lexer->characterBuffer(), lexer->characterCount())); node->propertyNameToken = loc(1); sym(1).Node = node; } break; -case 75: { +case 77: { AST::StringLiteralPropertyName *node = makeAstNode (driver->nodePool(), sym(1).sval); node->propertyNameToken = loc(1); sym(1).Node = node; } break; -case 76: { +case 78: { AST::NumericLiteralPropertyName *node = makeAstNode (driver->nodePool(), sym(1).dval); node->propertyNameToken = loc(1); sym(1).Node = node; } break; -case 77: { +case 79: { AST::IdentifierPropertyName *node = makeAstNode (driver->nodePool(), sym(1).sval); node->propertyNameToken = loc(1); sym(1).Node = node; } break; -case 78: - -case 79: - case 80: case 81: @@ -660,25 +677,29 @@ case 106: case 107: case 108: + +case 109: + +case 110: { sym(1).sval = driver->intern(lexer->characterBuffer(), lexer->characterCount()); } break; -case 113: { +case 115: { AST::ArrayMemberExpression *node = makeAstNode (driver->nodePool(), sym(1).Expression, sym(3).Expression); node->lbracketToken = loc(2); node->rbracketToken = loc(4); sym(1).Node = node; } break; -case 114: { +case 116: { AST::FieldMemberExpression *node = makeAstNode (driver->nodePool(), sym(1).Expression, sym(3).sval); node->dotToken = loc(2); node->identifierToken = loc(3); sym(1).Node = node; } break; -case 115: { +case 117: { AST::NewMemberExpression *node = makeAstNode (driver->nodePool(), sym(2).Expression, sym(4).ArgumentList); node->newToken = loc(1); node->lparenToken = loc(3); @@ -686,316 +707,309 @@ case 115: { sym(1).Node = node; } break; -case 117: { +case 119: { AST::NewExpression *node = makeAstNode (driver->nodePool(), sym(2).Expression); node->newToken = loc(1); sym(1).Node = node; } break; -case 118: { +case 120: { AST::CallExpression *node = makeAstNode (driver->nodePool(), sym(1).Expression, sym(3).ArgumentList); node->lparenToken = loc(2); node->rparenToken = loc(4); sym(1).Node = node; } break; -case 119: { +case 121: { AST::CallExpression *node = makeAstNode (driver->nodePool(), sym(1).Expression, sym(3).ArgumentList); node->lparenToken = loc(2); node->rparenToken = loc(4); sym(1).Node = node; } break; -case 120: { +case 122: { AST::ArrayMemberExpression *node = makeAstNode (driver->nodePool(), sym(1).Expression, sym(3).Expression); node->lbracketToken = loc(2); node->rbracketToken = loc(4); sym(1).Node = node; } break; -case 121: { +case 123: { AST::FieldMemberExpression *node = makeAstNode (driver->nodePool(), sym(1).Expression, sym(3).sval); node->dotToken = loc(2); node->identifierToken = loc(3); sym(1).Node = node; } break; -case 122: { +case 124: { sym(1).Node = 0; } break; -case 123: { +case 125: { sym(1).Node = sym(1).ArgumentList->finish(); } break; -case 124: { +case 126: { sym(1).Node = makeAstNode (driver->nodePool(), sym(1).Expression); } break; -case 125: { +case 127: { AST::ArgumentList *node = makeAstNode (driver->nodePool(), sym(1).ArgumentList, sym(3).Expression); node->commaToken = loc(2); sym(1).Node = node; } break; -case 129: { +case 131: { AST::PostIncrementExpression *node = makeAstNode (driver->nodePool(), sym(1).Expression); node->incrementToken = loc(2); sym(1).Node = node; } break; -case 130: { +case 132: { AST::PostDecrementExpression *node = makeAstNode (driver->nodePool(), sym(1).Expression); node->decrementToken = loc(2); sym(1).Node = node; } break; -case 132: { +case 134: { AST::DeleteExpression *node = makeAstNode (driver->nodePool(), sym(2).Expression); node->deleteToken = loc(1); sym(1).Node = node; } break; -case 133: { +case 135: { AST::VoidExpression *node = makeAstNode (driver->nodePool(), sym(2).Expression); node->voidToken = loc(1); sym(1).Node = node; } break; -case 134: { +case 136: { AST::TypeOfExpression *node = makeAstNode (driver->nodePool(), sym(2).Expression); node->typeofToken = loc(1); sym(1).Node = node; } break; -case 135: { +case 137: { AST::PreIncrementExpression *node = makeAstNode (driver->nodePool(), sym(2).Expression); node->incrementToken = loc(1); sym(1).Node = node; } break; -case 136: { +case 138: { AST::PreDecrementExpression *node = makeAstNode (driver->nodePool(), sym(2).Expression); node->decrementToken = loc(1); sym(1).Node = node; } break; -case 137: { +case 139: { AST::UnaryPlusExpression *node = makeAstNode (driver->nodePool(), sym(2).Expression); node->plusToken = loc(1); sym(1).Node = node; } break; -case 138: { +case 140: { AST::UnaryMinusExpression *node = makeAstNode (driver->nodePool(), sym(2).Expression); node->minusToken = loc(1); sym(1).Node = node; } break; -case 139: { +case 141: { AST::TildeExpression *node = makeAstNode (driver->nodePool(), sym(2).Expression); node->tildeToken = loc(1); sym(1).Node = node; } break; -case 140: { +case 142: { AST::NotExpression *node = makeAstNode (driver->nodePool(), sym(2).Expression); node->notToken = loc(1); sym(1).Node = node; } break; -case 142: { +case 144: { AST::BinaryExpression *node = makeAstNode (driver->nodePool(), sym(1).Expression, QSOperator::Mul, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 143: { +case 145: { AST::BinaryExpression *node = makeAstNode (driver->nodePool(), sym(1).Expression, QSOperator::Div, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 144: { +case 146: { AST::BinaryExpression *node = makeAstNode (driver->nodePool(), sym(1).Expression, QSOperator::Mod, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 146: { +case 148: { AST::BinaryExpression *node = makeAstNode (driver->nodePool(), sym(1).Expression, QSOperator::Add, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 147: { +case 149: { AST::BinaryExpression *node = makeAstNode (driver->nodePool(), sym(1).Expression, QSOperator::Sub, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 149: { +case 151: { AST::BinaryExpression *node = makeAstNode (driver->nodePool(), sym(1).Expression, QSOperator::LShift, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 150: { +case 152: { AST::BinaryExpression *node = makeAstNode (driver->nodePool(), sym(1).Expression, QSOperator::RShift, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 151: { +case 153: { AST::BinaryExpression *node = makeAstNode (driver->nodePool(), sym(1).Expression, QSOperator::URShift, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 153: { +case 155: { AST::BinaryExpression *node = makeAstNode (driver->nodePool(), sym(1).Expression, QSOperator::Lt, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 154: { +case 156: { AST::BinaryExpression *node = makeAstNode (driver->nodePool(), sym(1).Expression, QSOperator::Gt, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 155: { +case 157: { AST::BinaryExpression *node = makeAstNode (driver->nodePool(), sym(1).Expression, QSOperator::Le, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 156: { +case 158: { AST::BinaryExpression *node = makeAstNode (driver->nodePool(), sym(1).Expression, QSOperator::Ge, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 157: { +case 159: { AST::BinaryExpression *node = makeAstNode (driver->nodePool(), sym(1).Expression, QSOperator::InstanceOf, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 158: { +case 160: { AST::BinaryExpression *node = makeAstNode (driver->nodePool(), sym(1).Expression, QSOperator::In, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 160: { +case 162: { AST::BinaryExpression *node = makeAstNode (driver->nodePool(), sym(1).Expression, QSOperator::Lt, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 161: { +case 163: { AST::BinaryExpression *node = makeAstNode (driver->nodePool(), sym(1).Expression, QSOperator::Gt, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 162: { +case 164: { AST::BinaryExpression *node = makeAstNode (driver->nodePool(), sym(1).Expression, QSOperator::Le, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 163: { +case 165: { AST::BinaryExpression *node = makeAstNode (driver->nodePool(), sym(1).Expression, QSOperator::Ge, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 164: { +case 166: { AST::BinaryExpression *node = makeAstNode (driver->nodePool(), sym(1).Expression, QSOperator::InstanceOf, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 166: { +case 168: { AST::BinaryExpression *node = makeAstNode (driver->nodePool(), sym(1).Expression, QSOperator::Equal, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 167: { +case 169: { AST::BinaryExpression *node = makeAstNode (driver->nodePool(), sym(1).Expression, QSOperator::NotEqual, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 168: { +case 170: { AST::BinaryExpression *node = makeAstNode (driver->nodePool(), sym(1).Expression, QSOperator::StrictEqual, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 169: { +case 171: { AST::BinaryExpression *node = makeAstNode (driver->nodePool(), sym(1).Expression, QSOperator::StrictNotEqual, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 171: { +case 173: { AST::BinaryExpression *node = makeAstNode (driver->nodePool(), sym(1).Expression, QSOperator::Equal, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 172: { +case 174: { AST::BinaryExpression *node = makeAstNode (driver->nodePool(), sym(1).Expression, QSOperator::NotEqual, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 173: { +case 175: { AST::BinaryExpression *node = makeAstNode (driver->nodePool(), sym(1).Expression, QSOperator::StrictEqual, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 174: { - AST::BinaryExpression *node = makeAstNode (driver->nodePool(), sym(1).Expression, - QSOperator::StrictNotEqual, sym(3).Expression); - node->operatorToken = loc(2); - sym(1).Node = node; -} break; - case 176: { AST::BinaryExpression *node = makeAstNode (driver->nodePool(), sym(1).Expression, - QSOperator::BitAnd, sym(3).Expression); + QSOperator::StrictNotEqual, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; @@ -1009,7 +1023,7 @@ case 178: { case 180: { AST::BinaryExpression *node = makeAstNode (driver->nodePool(), sym(1).Expression, - QSOperator::BitXor, sym(3).Expression); + QSOperator::BitAnd, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; @@ -1023,7 +1037,7 @@ case 182: { case 184: { AST::BinaryExpression *node = makeAstNode (driver->nodePool(), sym(1).Expression, - QSOperator::BitOr, sym(3).Expression); + QSOperator::BitXor, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; @@ -1037,7 +1051,7 @@ case 186: { case 188: { AST::BinaryExpression *node = makeAstNode (driver->nodePool(), sym(1).Expression, - QSOperator::And, sym(3).Expression); + QSOperator::BitOr, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; @@ -1051,7 +1065,7 @@ case 190: { case 192: { AST::BinaryExpression *node = makeAstNode (driver->nodePool(), sym(1).Expression, - QSOperator::Or, sym(3).Expression); + QSOperator::And, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; @@ -1064,6 +1078,13 @@ case 194: { } break; case 196: { + AST::BinaryExpression *node = makeAstNode (driver->nodePool(), sym(1).Expression, + QSOperator::Or, sym(3).Expression); + node->operatorToken = loc(2); + sym(1).Node = node; +} break; + +case 198: { AST::ConditionalExpression *node = makeAstNode (driver->nodePool(), sym(1).Expression, sym(3).Expression, sym(5).Expression); node->questionToken = loc(2); @@ -1071,7 +1092,7 @@ case 196: { sym(1).Node = node; } break; -case 198: { +case 200: { AST::ConditionalExpression *node = makeAstNode (driver->nodePool(), sym(1).Expression, sym(3).Expression, sym(5).Expression); node->questionToken = loc(2); @@ -1079,112 +1100,112 @@ case 198: { sym(1).Node = node; } break; -case 200: { +case 202: { AST::BinaryExpression *node = makeAstNode (driver->nodePool(), sym(1).Expression, sym(2).ival, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 202: { +case 204: { AST::BinaryExpression *node = makeAstNode (driver->nodePool(), sym(1).Expression, sym(2).ival, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 203: { +case 205: { sym(1).ival = QSOperator::Assign; } break; -case 204: { +case 206: { sym(1).ival = QSOperator::InplaceMul; } break; -case 205: { +case 207: { sym(1).ival = QSOperator::InplaceDiv; } break; -case 206: { +case 208: { sym(1).ival = QSOperator::InplaceMod; } break; -case 207: { +case 209: { sym(1).ival = QSOperator::InplaceAdd; } break; -case 208: { +case 210: { sym(1).ival = QSOperator::InplaceSub; } break; -case 209: { +case 211: { sym(1).ival = QSOperator::InplaceLeftShift; } break; -case 210: { +case 212: { sym(1).ival = QSOperator::InplaceRightShift; } break; -case 211: { +case 213: { sym(1).ival = QSOperator::InplaceURightShift; } break; -case 212: { +case 214: { sym(1).ival = QSOperator::InplaceAnd; } break; -case 213: { +case 215: { sym(1).ival = QSOperator::InplaceXor; } break; -case 214: { +case 216: { sym(1).ival = QSOperator::InplaceOr; } break; -case 216: { +case 218: { AST::Expression *node = makeAstNode (driver->nodePool(), sym(1).Expression, sym(3).Expression); node->commaToken = loc(2); sym(1).Node = node; } break; -case 217: { +case 219: { sym(1).Node = 0; } break; -case 220: { +case 222: { AST::Expression *node = makeAstNode (driver->nodePool(), sym(1).Expression, sym(3).Expression); node->commaToken = loc(2); sym(1).Node = node; } break; -case 221: { +case 223: { sym(1).Node = 0; } break; -case 238: { +case 240: { AST::Block *node = makeAstNode (driver->nodePool(), sym(2).StatementList); node->lbraceToken = loc(1); node->rbraceToken = loc(3); sym(1).Node = node; } break; -case 239: { +case 241: { sym(1).Node = makeAstNode (driver->nodePool(), sym(1).Statement); } break; -case 240: { +case 242: { sym(1).Node = makeAstNode (driver->nodePool(), sym(1).StatementList, sym(2).Statement); } break; -case 241: { +case 243: { sym(1).Node = 0; } break; -case 242: { +case 244: { sym(1).Node = sym(1).StatementList->finish (); } break; -case 244: { +case 246: { AST::VariableStatement *node = makeAstNode (driver->nodePool(), sym(2).VariableDeclarationList->finish (/*readOnly=*/sym(1).ival == T_CONST)); node->declarationKindToken = loc(1); @@ -1192,76 +1213,76 @@ case 244: { sym(1).Node = node; } break; -case 245: { +case 247: { sym(1).ival = T_CONST; } break; -case 246: { +case 248: { sym(1).ival = T_VAR; } break; -case 247: { +case 249: { sym(1).Node = makeAstNode (driver->nodePool(), sym(1).VariableDeclaration); } break; -case 248: { +case 250: { AST::VariableDeclarationList *node = makeAstNode (driver->nodePool(), sym(1).VariableDeclarationList, sym(3).VariableDeclaration); node->commaToken = loc(2); sym(1).Node = node; } break; -case 249: { +case 251: { sym(1).Node = makeAstNode (driver->nodePool(), sym(1).VariableDeclaration); } break; -case 250: { +case 252: { sym(1).Node = makeAstNode (driver->nodePool(), sym(1).VariableDeclarationList, sym(3).VariableDeclaration); } break; -case 251: { +case 253: { AST::VariableDeclaration *node = makeAstNode (driver->nodePool(), sym(1).sval, sym(2).Expression); node->identifierToken = loc(1); sym(1).Node = node; } break; -case 252: { +case 254: { AST::VariableDeclaration *node = makeAstNode (driver->nodePool(), sym(1).sval, sym(2).Expression); node->identifierToken = loc(1); sym(1).Node = node; } break; -case 253: { +case 255: { // ### TODO: AST for initializer sym(1) = sym(2); } break; -case 254: { +case 256: { sym(1).Node = 0; } break; -case 256: { +case 258: { // ### TODO: AST for initializer sym(1) = sym(2); } break; -case 257: { +case 259: { sym(1).Node = 0; } break; -case 259: { +case 261: { AST::EmptyStatement *node = makeAstNode (driver->nodePool()); node->semicolonToken = loc(1); sym(1).Node = node; } break; -case 261: { +case 263: { AST::ExpressionStatement *node = makeAstNode (driver->nodePool(), sym(1).Expression); node->semicolonToken = loc(2); sym(1).Node = node; } break; -case 262: { +case 264: { AST::IfStatement *node = makeAstNode (driver->nodePool(), sym(3).Expression, sym(5).Statement, sym(7).Statement); node->ifToken = loc(1); node->lparenToken = loc(2); @@ -1270,7 +1291,7 @@ case 262: { sym(1).Node = node; } break; -case 263: { +case 265: { AST::IfStatement *node = makeAstNode (driver->nodePool(), sym(3).Expression, sym(5).Statement); node->ifToken = loc(1); node->lparenToken = loc(2); @@ -1278,7 +1299,7 @@ case 263: { sym(1).Node = node; } break; -case 265: { +case 267: { AST::DoWhileStatement *node = makeAstNode (driver->nodePool(), sym(2).Statement, sym(5).Expression); node->doToken = loc(1); node->whileToken = loc(3); @@ -1288,7 +1309,7 @@ case 265: { sym(1).Node = node; } break; -case 266: { +case 268: { AST::WhileStatement *node = makeAstNode (driver->nodePool(), sym(3).Expression, sym(5).Statement); node->whileToken = loc(1); node->lparenToken = loc(2); @@ -1296,7 +1317,7 @@ case 266: { sym(1).Node = node; } break; -case 267: { +case 269: { AST::ForStatement *node = makeAstNode (driver->nodePool(), sym(3).Expression, sym(5).Expression, sym(7).Expression, sym(9).Statement); node->forToken = loc(1); @@ -1307,7 +1328,7 @@ case 267: { sym(1).Node = node; } break; -case 268: { +case 270: { AST::LocalForStatement *node = makeAstNode (driver->nodePool(), sym(4).VariableDeclarationList->finish (/*readOnly=*/false), sym(6).Expression, sym(8).Expression, sym(10).Statement); @@ -1320,7 +1341,7 @@ case 268: { sym(1).Node = node; } break; -case 269: { +case 271: { AST:: ForEachStatement *node = makeAstNode (driver->nodePool(), sym(3).Expression, sym(5).Expression, sym(7).Statement); node->forToken = loc(1); @@ -1330,7 +1351,7 @@ case 269: { sym(1).Node = node; } break; -case 270: { +case 272: { AST::LocalForEachStatement *node = makeAstNode (driver->nodePool(), sym(4).VariableDeclaration, sym(6).Expression, sym(8).Statement); node->forToken = loc(1); @@ -1341,14 +1362,14 @@ case 270: { sym(1).Node = node; } break; -case 272: { +case 274: { AST::ContinueStatement *node = makeAstNode (driver->nodePool()); node->continueToken = loc(1); node->semicolonToken = loc(2); sym(1).Node = node; } break; -case 274: { +case 276: { AST::ContinueStatement *node = makeAstNode (driver->nodePool(), sym(2).sval); node->continueToken = loc(1); node->identifierToken = loc(2); @@ -1356,14 +1377,14 @@ case 274: { sym(1).Node = node; } break; -case 276: { +case 278: { AST::BreakStatement *node = makeAstNode (driver->nodePool()); node->breakToken = loc(1); node->semicolonToken = loc(2); sym(1).Node = node; } break; -case 278: { +case 280: { AST::BreakStatement *node = makeAstNode (driver->nodePool(), sym(2).sval); node->breakToken = loc(1); node->identifierToken = loc(2); @@ -1371,14 +1392,14 @@ case 278: { sym(1).Node = node; } break; -case 280: { +case 282: { AST::ReturnStatement *node = makeAstNode (driver->nodePool(), sym(2).Expression); node->returnToken = loc(1); node->semicolonToken = loc(3); sym(1).Node = node; } break; -case 281: { +case 283: { AST::WithStatement *node = makeAstNode (driver->nodePool(), sym(3).Expression, sym(5).Statement); node->withToken = loc(1); node->lparenToken = loc(2); @@ -1386,7 +1407,7 @@ case 281: { sym(1).Node = node; } break; -case 282: { +case 284: { AST::SwitchStatement *node = makeAstNode (driver->nodePool(), sym(3).Expression, sym(5).CaseBlock); node->switchToken = loc(1); node->lparenToken = loc(2); @@ -1394,90 +1415,90 @@ case 282: { sym(1).Node = node; } break; -case 283: { +case 285: { AST::CaseBlock *node = makeAstNode (driver->nodePool(), sym(2).CaseClauses); node->lbraceToken = loc(1); node->rbraceToken = loc(3); sym(1).Node = node; } break; -case 284: { +case 286: { AST::CaseBlock *node = makeAstNode (driver->nodePool(), sym(2).CaseClauses, sym(3).DefaultClause, sym(4).CaseClauses); node->lbraceToken = loc(1); node->rbraceToken = loc(5); sym(1).Node = node; } break; -case 285: { +case 287: { sym(1).Node = makeAstNode (driver->nodePool(), sym(1).CaseClause); } break; -case 286: { +case 288: { sym(1).Node = makeAstNode (driver->nodePool(), sym(1).CaseClauses, sym(2).CaseClause); } break; -case 287: { +case 289: { sym(1).Node = 0; } break; -case 288: { +case 290: { sym(1).Node = sym(1).CaseClauses->finish (); } break; -case 289: { +case 291: { AST::CaseClause *node = makeAstNode (driver->nodePool(), sym(2).Expression, sym(4).StatementList); node->caseToken = loc(1); node->colonToken = loc(3); sym(1).Node = node; } break; -case 290: { +case 292: { AST::DefaultClause *node = makeAstNode (driver->nodePool(), sym(3).StatementList); node->defaultToken = loc(1); node->colonToken = loc(2); sym(1).Node = node; } break; -case 291: -case 292: { +case 293: +case 294: { AST::LabelledStatement *node = makeAstNode (driver->nodePool(), driver->intern(lexer->characterBuffer(), lexer->characterCount()), sym(3).Statement); node->identifierToken = loc(1); node->colonToken = loc(2); sym(1).Node = node; } break; -case 293: { +case 295: { AST::LabelledStatement *node = makeAstNode (driver->nodePool(), sym(1).sval, sym(3).Statement); node->identifierToken = loc(1); node->colonToken = loc(2); sym(1).Node = node; } break; -case 295: { +case 297: { AST::ThrowStatement *node = makeAstNode (driver->nodePool(), sym(2).Expression); node->throwToken = loc(1); node->semicolonToken = loc(3); sym(1).Node = node; } break; -case 296: { +case 298: { AST::TryStatement *node = makeAstNode (driver->nodePool(), sym(2).Statement, sym(3).Catch); node->tryToken = loc(1); sym(1).Node = node; } break; -case 297: { +case 299: { AST::TryStatement *node = makeAstNode (driver->nodePool(), sym(2).Statement, sym(3).Finally); node->tryToken = loc(1); sym(1).Node = node; } break; -case 298: { +case 300: { AST::TryStatement *node = makeAstNode (driver->nodePool(), sym(2).Statement, sym(3).Catch, sym(4).Finally); node->tryToken = loc(1); sym(1).Node = node; } break; -case 299: { +case 301: { AST::Catch *node = makeAstNode (driver->nodePool(), sym(3).sval, sym(5).Block); node->catchToken = loc(1); node->lparenToken = loc(2); @@ -1486,20 +1507,20 @@ case 299: { sym(1).Node = node; } break; -case 300: { +case 302: { AST::Finally *node = makeAstNode (driver->nodePool(), sym(2).Block); node->finallyToken = loc(1); sym(1).Node = node; } break; -case 302: { +case 304: { AST::DebuggerStatement *node = makeAstNode (driver->nodePool()); node->debuggerToken = loc(1); node->semicolonToken = loc(2); sym(1).Node = node; } break; -case 303: { +case 305: { AST::FunctionDeclaration *node = makeAstNode (driver->nodePool(), sym(2).sval, sym(4).FormalParameterList, sym(7).FunctionBody); node->functionToken = loc(1); node->identifierToken = loc(2); @@ -1510,7 +1531,7 @@ case 303: { sym(1).Node = node; } break; -case 304: { +case 306: { AST::FunctionExpression *node = makeAstNode (driver->nodePool(), sym(2).sval, sym(4).FormalParameterList, sym(7).FunctionBody); node->functionToken = loc(1); if (sym(2).sval) @@ -1522,56 +1543,56 @@ case 304: { sym(1).Node = node; } break; -case 305: { +case 307: { AST::FormalParameterList *node = makeAstNode (driver->nodePool(), sym(1).sval); node->identifierToken = loc(1); sym(1).Node = node; } break; -case 306: { +case 308: { AST::FormalParameterList *node = makeAstNode (driver->nodePool(), sym(1).FormalParameterList, sym(3).sval); node->commaToken = loc(2); node->identifierToken = loc(3); sym(1).Node = node; } break; -case 307: { +case 309: { sym(1).Node = 0; } break; -case 308: { +case 310: { sym(1).Node = sym(1).FormalParameterList->finish (); } break; -case 309: { +case 311: { sym(1).Node = 0; } break; -case 311: { +case 313: { sym(1).Node = makeAstNode (driver->nodePool(), sym(1).SourceElements->finish ()); } break; -case 312: { +case 314: { sym(1).Node = makeAstNode (driver->nodePool(), sym(1).SourceElement); } break; -case 313: { +case 315: { sym(1).Node = makeAstNode (driver->nodePool(), sym(1).SourceElements, sym(2).SourceElement); } break; -case 314: { +case 316: { sym(1).Node = makeAstNode (driver->nodePool(), sym(1).Statement); } break; -case 315: { +case 317: { sym(1).Node = makeAstNode (driver->nodePool(), sym(1).FunctionDeclaration); } break; -case 316: { +case 318: { sym(1).sval = 0; } break; -case 318: { +case 320: { sym(1).Node = 0; } break; diff --git a/src/declarative/qml/parser/javascriptparser_p.h b/src/declarative/qml/parser/javascriptparser_p.h index 4c5fef1..2ae4c34 100644 --- a/src/declarative/qml/parser/javascriptparser_p.h +++ b/src/declarative/qml/parser/javascriptparser_p.h @@ -196,9 +196,9 @@ protected: -#define J_SCRIPT_REGEXPLITERAL_RULE1 56 +#define J_SCRIPT_REGEXPLITERAL_RULE1 54 -#define J_SCRIPT_REGEXPLITERAL_RULE2 57 +#define J_SCRIPT_REGEXPLITERAL_RULE2 55 QT_END_NAMESPACE -- cgit v0.12 From cc51d0f166354ad5acdc5ce054a83a02eeb21229 Mon Sep 17 00:00:00 2001 From: Michael Brasser Date: Wed, 20 May 2009 09:36:07 +1000 Subject: Fix docs. --- doc/src/declarative/qmlforcpp.qdoc | 6 ++++-- src/declarative/qml/qmlcontext.cpp | 4 ++-- src/declarative/qml/qmlengine.cpp | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/doc/src/declarative/qmlforcpp.qdoc b/doc/src/declarative/qmlforcpp.qdoc index e29b962..2898499 100644 --- a/doc/src/declarative/qmlforcpp.qdoc +++ b/doc/src/declarative/qmlforcpp.qdoc @@ -28,7 +28,8 @@ based on a simple declarative component description. \code - QmlComponent redRectangle("Rect { color: \"red\"; width: 100; height: 100 }"); + QmlEngine engine; + QmlComponent redRectangle(&engine, "Rect { color: \"red\"; width: 100; height: 100 }"); for (int ii = 0; ii < 100; ++ii) { QObject *rectangle = redRectangle.create(); // ... do something with the rectangle ... @@ -581,7 +582,8 @@ \row \o \code - QmlComponent component(xmlData); + QmlEngine engine; + QmlComponent component(&engine, qmlData); QObject *object = component.create(); // Will print "Hello world!" qDebug() << object->property("text2"); diff --git a/src/declarative/qml/qmlcontext.cpp b/src/declarative/qml/qmlcontext.cpp index fa36eb1..ea72ebf 100644 --- a/src/declarative/qml/qmlcontext.cpp +++ b/src/declarative/qml/qmlcontext.cpp @@ -149,7 +149,7 @@ void QmlContextPrivate::addDefaultObject(QObject *object, Priority priority) QmlContext context(engine.rootContext()); context.setContextProperty("myModel", modelData); - QmlComponent component("ListView { model=myModel }"); + QmlComponent component(&engine, "ListView { model=myModel }"); component.create(&context); \endcode @@ -176,7 +176,7 @@ void QmlContextPrivate::addDefaultObject(QObject *object, Priority priority) QmlContext context(engine.rootContext()); context.addDefaultObject(&myDataSet); - QmlComponent component("ListView { model=myModel }"); + QmlComponent component(&engine, "ListView { model=myModel }"); component.create(&context); \endcode diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp index 425cba4..c0ea463 100644 --- a/src/declarative/qml/qmlengine.cpp +++ b/src/declarative/qml/qmlengine.cpp @@ -425,8 +425,8 @@ bool QmlEnginePrivate::loadCache(QmlBasicScriptNodeCache &cache, const QString & \code QmlEngine engine; - QmlComponent component("Text { text: \"Hello world!\" }"); - QFxItem *item = qobject_cast(component.create(&engine)); + QmlComponent component(&engine, "Text { text: \"Hello world!\" }"); + QFxItem *item = qobject_cast(component.create()); //add item to view, etc ... -- cgit v0.12 From ccc5039c22d2e507b61cf3fc3b9be9684638db12 Mon Sep 17 00:00:00 2001 From: Michael Brasser Date: Wed, 20 May 2009 09:43:58 +1000 Subject: Don't recreate text layout everytime it is used. --- src/declarative/fx/qfxtext.cpp | 18 ++++++------------ src/declarative/fx/qfxtext_p.h | 7 ++++++- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/declarative/fx/qfxtext.cpp b/src/declarative/fx/qfxtext.cpp index bc3856d..e84255d 100644 --- a/src/declarative/fx/qfxtext.cpp +++ b/src/declarative/fx/qfxtext.cpp @@ -458,10 +458,11 @@ void QFxTextPrivate::updateSize() singleline = !tmp.contains(QChar::LineSeparator); if (singleline && elideMode != Qt::ElideNone && q->widthValid()) tmp = fm.elidedText(tmp,elideMode,q->width()); // XXX still worth layout...? - QTextLayout layout; + layout.clearLayout(); layout.setFont(f); layout.setText(tmp); size = setupTextLayout(&layout); + cachedLayoutSize = size; } if (richText) { singleline = false; // richtext can't elide or be optimized for single-line case @@ -608,18 +609,11 @@ QImage QFxTextPrivate::wrappedTextImage(bool drawStyle) //do layout Q_Q(const QFxText); QFont f; if (_font) f = _font->font(); - QString tmp = text; - if (singleline && elideMode != Qt::ElideNone && q->widthValid()) { - QFontMetrics fm(f); - tmp = fm.elidedText(tmp,elideMode,q->width()); // XXX still worth layout...? - } - tmp.replace(QLatin1Char('\n'), QChar::LineSeparator); - QTextLayout textLayout(tmp, f); - QSize size = setupTextLayout(&textLayout); + QSize size = cachedLayoutSize; int x = 0; - for (int i = 0; i < textLayout.lineCount(); ++i) { - QTextLine line = textLayout.lineAt(i); + for (int i = 0; i < layout.lineCount(); ++i) { + QTextLine line = layout.lineAt(i); if (hAlign == QFxText::AlignLeft) { x = 0; } else if (hAlign == QFxText::AlignRight) { @@ -640,7 +634,7 @@ QImage QFxTextPrivate::wrappedTextImage(bool drawStyle) else p.setPen(color); p.setFont(f); - textLayout.draw(&p, QPointF(0, 0)); + layout.draw(&p, QPointF(0, 0)); return img; } diff --git a/src/declarative/fx/qfxtext_p.h b/src/declarative/fx/qfxtext_p.h index 4296891..8bb3142 100644 --- a/src/declarative/fx/qfxtext_p.h +++ b/src/declarative/fx/qfxtext_p.h @@ -56,6 +56,7 @@ #include "qfxitem.h" #include "qfxitem_p.h" #include "qml.h" +#include #if defined(QFX_RENDER_OPENGL) #include "gltexture.h" @@ -72,7 +73,9 @@ class QFxTextPrivate : public QFxItemPrivate Q_DECLARE_PUBLIC(QFxText) public: QFxTextPrivate() - : _font(0), color((QRgb)0), style(QFxText::Normal), imgDirty(true), hAlign(QFxText::AlignLeft), vAlign(QFxText::AlignTop), elideMode(Qt::ElideNone), dirty(false), wrap(false), richText(false), singleline(false), control(0), doc(0) + : _font(0), color((QRgb)0), style(QFxText::Normal), imgDirty(true), + hAlign(QFxText::AlignLeft), vAlign(QFxText::AlignTop), elideMode(Qt::ElideNone), + dirty(false), wrap(false), richText(false), singleline(false), control(0), doc(0) { } @@ -126,6 +129,8 @@ public: bool singleline; QTextControl *control; QTextDocument *doc; + QTextLayout layout; + QSize cachedLayoutSize; }; QT_END_NAMESPACE -- cgit v0.12 From 5dfacf0602c7337efe90576eeb90f1326e94d500 Mon Sep 17 00:00:00 2001 From: Warwick Allison Date: Wed, 20 May 2009 10:19:54 +1000 Subject: typo --- src/declarative/canvas/qsimplecanvasitem.cpp | 2 +- src/declarative/canvas/qsimplecanvasitem.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/declarative/canvas/qsimplecanvasitem.cpp b/src/declarative/canvas/qsimplecanvasitem.cpp index fb20e95..3666b82 100644 --- a/src/declarative/canvas/qsimplecanvasitem.cpp +++ b/src/declarative/canvas/qsimplecanvasitem.cpp @@ -181,7 +181,7 @@ void QSimpleCanvasItem::childrenChanged() { } -int QSimpleCanvasItem::setPaintMargin(qreal margin) +void QSimpleCanvasItem::setPaintMargin(qreal margin) { Q_D(QSimpleCanvasItem); if (margin < d->paintmargin) diff --git a/src/declarative/canvas/qsimplecanvasitem.h b/src/declarative/canvas/qsimplecanvasitem.h index 2d65469..cf23fc6 100644 --- a/src/declarative/canvas/qsimplecanvasitem.h +++ b/src/declarative/canvas/qsimplecanvasitem.h @@ -183,7 +183,7 @@ public: }; - int setPaintMargin(qreal margin); + void setPaintMargin(qreal margin); QRectF boundingRect() const; virtual void paintContents(QPainter &); virtual void paintGLContents(GLPainter &); -- cgit v0.12 From 5b3b730c915f806cc6eb7d63779f8c45a4c2df69 Mon Sep 17 00:00:00 2001 From: Warwick Allison Date: Wed, 20 May 2009 10:21:30 +1000 Subject: compile --- src/declarative/fx/qfxparticles.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/declarative/fx/qfxparticles.cpp b/src/declarative/fx/qfxparticles.cpp index 930d7a3..67c1208 100644 --- a/src/declarative/fx/qfxparticles.cpp +++ b/src/declarative/fx/qfxparticles.cpp @@ -1129,7 +1129,7 @@ void QFxParticlesPainter::paintContents(QPainter &p) update();//Should I need this? (GV does) } #elif defined(QFX_RENDER_OPENGL2) -void QFxParticles::paintGLContents(GLPainter &p) +void QFxParticles::paintGLContents(GLPainter &) { //painting is done by the ParticlesPainter, so it can have the right size } @@ -1155,8 +1155,8 @@ void QFxParticlesPainter::paintGLContents(GLPainter &p) glBindTexture(GL_TEXTURE_2D, d->tex.texture()); - const int myX = (int)(x() + parent->x()); - const int myY = (int)(y() + parent->y()); + const int myX = (int)(x() + parent()->x()); + const int myY = (int)(y() + parent()->y()); float widthV = d->image.width(); float heightV = d->image.height(); for (int i = 0; i < d->particles.count(); ++i) { -- cgit v0.12 From 7f872ea70d357788bbda18f28d4765d5c3a1510e Mon Sep 17 00:00:00 2001 From: Warwick Allison Date: Wed, 20 May 2009 11:08:20 +1000 Subject: Fix breakage. Line was accidentally deleted. --- src/declarative/fx/qfxrect.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/declarative/fx/qfxrect.cpp b/src/declarative/fx/qfxrect.cpp index b61baec..f1cbb58 100644 --- a/src/declarative/fx/qfxrect.cpp +++ b/src/declarative/fx/qfxrect.cpp @@ -751,6 +751,8 @@ void QFxRect::paintGLContents(GLPainter &p) 1, 1, 1, texbottom }; + glBindTexture(GL_TEXTURE_2D, d->_rectTexture.texture()); + shader->setAttributeArray(SingleTextureShader::Vertices, vert1, 2); shader->setAttributeArray(SingleTextureShader::TextureCoords, tex1, 2); glDrawArrays(GL_TRIANGLE_STRIP, 0, 8); -- cgit v0.12