feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

GLSL: Re-generate parser

Browse Source 
...by running ./make-parser.sh to make a subsequent change less noisy.

qlalr in PATH is from Qt 5.9.1.

Change-Id: Ia39181b55cd0e16207fa809f0db92cdeba3b095c
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
This commit is contained in:
Nikolai Kosjar
2017-09-28 11:35:12 +02:00
parent 75395af824
commit aca8e8643c
4 changed files with 1790 additions and 1767 deletions
Download Patch File Download Diff File Expand all files Collapse all files

648
src/libs/glsl/glslparser.cpp
View File

File diff suppressed because it is too large Load Diff

4
src/libs/glsl/glslparser.h
View File

@@ -1,5 +1,5 @@
#line 215 "./glsl.g" #line 210 "./glsl.g"
/**************************************************************************** /****************************************************************************
** **
@@ -114,7 +114,7 @@ private:
inline int consumeToken() { inline int consumeToken() {
if (_index < int(_tokens.size())) if (_index < int(_tokens.size()))
return _index++; return _index++;
return static_cast<int>(_tokens.size()) - 1; return _tokens.size() - 1;
} }
inline const Token &tokenAt(int index) const { inline const Token &tokenAt(int index) const {
if (index == 0) if (index == 0)

1651
src/libs/glsl/glslparsertable.cpp
View File

File diff suppressed because it is too large Load Diff

16
src/libs/glsl/glslparsertable_p.h
View File

@@ -3,8 +3,9 @@
** Copyright (C) 2016 The Qt Company Ltd. ** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of Qt Creator. ** This file is part of the Qt Toolkit.
** **
** $QT_BEGIN_LICENSE:GPL-EXCEPT$
** Commercial License Usage ** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in ** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the ** accordance with the commercial license agreement provided with the
@@ -21,6 +22,8 @@
** information to ensure the GNU General Public License requirements will ** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
** **
** $QT_END_LICENSE$
**
****************************************************************************/ ****************************************************************************/
// //
@@ -35,9 +38,10 @@
// //
// This file was generated by qlalr - DO NOT EDIT! // This file was generated by qlalr - DO NOT EDIT!
#pragma once #ifndef GLSLPARSERTABLE_P_H
#define GLSLPARSERTABLE_P_H
#include <qglobal.h> #include <QtCore/qglobal.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
@@ -228,8 +232,8 @@ public:
NON_TERMINAL_COUNT = 85, NON_TERMINAL_COUNT = 85,
GOTO_INDEX_OFFSET = 463, GOTO_INDEX_OFFSET = 463,
GOTO_INFO_OFFSET = 4681, GOTO_INFO_OFFSET = 4708,
GOTO_CHECK_OFFSET = 4681 GOTO_CHECK_OFFSET = 4708
}; };
static const char *const spell[]; static const char *const spell[];
@@ -263,3 +267,5 @@ public:
QT_END_NAMESPACE QT_END_NAMESPACE
#endif // GLSLPARSERTABLE_P_H