summaryrefslogtreecommitdiffstats
path: root/src/script/parser/qscriptparser.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/script/parser/qscriptparser.cpp')
-rw-r--r--src/script/parser/qscriptparser.cpp33
1 files changed, 7 insertions, 26 deletions
diff --git a/src/script/parser/qscriptparser.cpp b/src/script/parser/qscriptparser.cpp
index 197a486..509c4b1 100644
--- a/src/script/parser/qscriptparser.cpp
+++ b/src/script/parser/qscriptparser.cpp
@@ -1,5 +1,3 @@
-// This file was generated by qlalr - DO NOT EDIT!
-
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
@@ -8,45 +6,28 @@
**
** This file is part of the QtScript module of the Qt Toolkit.
**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
+** $QT_BEGIN_LICENSE:LGPL-ONLY$
** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
+** This file may be used under the terms of the GNU Lesser
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
** If you have questions regarding the use of this file, please contact
** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
** $QT_END_LICENSE$
**
****************************************************************************/
+// This file was generated by qlalr - DO NOT EDIT!
+
+
#include <QtCore/QtDebug>
#include <string.h>
-#include "qscriptast_p.h"
-
#define Q_SCRIPT_UPDATE_POSITION(node, startloc, endloc) do { \
node->startLine = startloc.startLine; \
node->startColumn = startloc.startColumn; \
@@ -1136,9 +1117,9 @@ case 266: {
error_message += QLatin1String (", ");
first = false;
- error_message += QLatin1Char('`');
+ error_message += QLatin1String("`");
error_message += QLatin1String (spell [expected_tokens [s]]);
- error_message += QLatin1Char('\'');
+ error_message += QLatin1String("'");
}
}