summaryrefslogtreecommitdiff
path: root/src/libs/glsl/glslparser.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Replace GPL-3.0 with GPL-3.0-onlyKai Köhne2023-01-101-1/+1
| | | | | | | | | | | | | GPL-3.0 is deprecated by SPDX. Change done by find . -type f -exec perl -pi -e 's/LicenseRef-Qt-Commercial OR GPL-3.0(?!-)/LicenseRef-Qt-Commercial OR GPL-3.0-only/g' {} \; Change-Id: If316a498e3f27d2030b86d4e7743b3237ce09939 Reviewed-by: Lucie Gerard <lucie.gerard@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Use SPDX license identifiersLucie Gérard2022-08-261-24/+2
| | | | | | | | | Replace the current license disclaimer in files by a SPDX-License-Identifier. Task-number: QTBUG-67283 Change-Id: I708fd1f9f2b73d60f57cc3568646929117825813 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* GLSL: Fix freeze on unexpected end of fileChristian Stenger2020-06-111-0/+2
| | | | | | Fixes: QTCREATORBUG-24070 Change-Id: I2c503932cb2064f4871a4467c26f7af0efb50bc8 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Some clang-tidy -use-modernize-nullptrhjk2019-08-011-26/+26
| | | | | Change-Id: I1bed5e85a5b7948d08502a72a10f80baa075c204 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* GLSL: Limit recovery attemptsNikolai Kosjar2018-01-181-317/+319
| | | | | | | | | "switch(" was recovered with number, ), ), ), ... Task-number: QTCREATORBUG-18967 Change-Id: I12ccea0925fb2956de7405d9c8afea5dddeaf4f9 Reviewed-by: David Schulz <david.schulz@qt.io> Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
* GLSL: Avoid infinite loop at error recoveryNikolai Kosjar2017-09-281-320/+335
| | | | | | | | | | | | | | | | | | | | | | For error recovery additional tokens are tried to produce a valid grammar rule. For the specific case in the bug report for(int x=0; x y the two consecutive identifiers in the end triggered an infinite loop since the identifier token is also part of those additional tokens that are tried. Circumvent this by trying a more conservative list of tokens on the second try. Done-by: Erik Verbruggen Change-Id: I271dddecf947a06ed3af5f9955ee630441533342 Task-number: QTCREATORBUG-18967 Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
* GLSL: Fix conversion warnings on WindowsNikolai Kosjar2017-09-281-6/+6
| | | | | | | | | | | | | | This was actually already fixed with Fix compiler warnings on windows. commit cc04b84917ef0f90e2017bf652b7327ce5edda9c. However, glslparser.{h,cpp} were changed, which are generated from glsl.g. Fix the warnings in the source file glsl.g so the next time the parser is re-generated the changes are not lost. Change-Id: If7e5f45ff1a93d1d7b6c9213697884f5a7e9ec5f Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
* GLSL: Re-generate parserNikolai Kosjar2017-09-281-324/+324
| | | | | | | | | ...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>
* Fix compiler warnings on windows.David Schulz2016-04-221-6/+6
| | | | | | | | | | | Ignore some warnings inside 3rd party code and fix a lot of conversion warnings. Change-Id: I909f2f31a4639015bf7dd028d2d435ff1d1167bc Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com> Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* Update License according to agreement with Free Qt FoundationTobias Hunger2016-01-191-17/+12
| | | | | | | * Update remaining files in src Change-Id: I1896f17fcf34f71c3310c87899fb5171b8e4afb1 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Update LicenseEike Ziller2015-01-161-6/+6
| | | | | Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* License updateEike Ziller2014-10-091-7/+8
| | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* Incremented year in copyright infoRobert Loehning2014-01-081-1/+1
| | | | | | Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Merge remote-tracking branch 'origin/2.6'Oswald Buddenhagen2013-01-311-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in src/plugins/debugger/qtmessageloghandler.cpp src/plugins/debugger/qtmessagelogwindow.cpp src/plugins/madde/maemodeployconfigurationwidget.cpp src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp src/plugins/qmldesigner/designercore/include/widgetqueryview.h src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp src/plugins/qnx/bardescriptormagicmatcher.h src/plugins/qt4projectmanager/profilekeywords.cpp src/plugins/remotelinux/deployablefilesperprofile.cpp src/plugins/remotelinux/deployablefilesperprofile.h src/plugins/remotelinux/deploymentinfo.cpp src/plugins/remotelinux/deploymentsettingsassistant.cpp src/plugins/remotelinux/profilesupdatedialog.cpp tests/auto/icheckbuild/ichecklib.cpp tests/auto/icheckbuild/parsemanager.cpp tests/auto/icheckbuild/parsemanager.h Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
| * Incremented year in copyright infov2.6.2Robert Loehning2013-01-291-1/+1
| | | | | | | | | | Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | GLSL: Compile with QT_NO_CAST_FROM_ASCIIOrgad Shaneh2012-12-041-2/+2
|/ | | | | | Change-Id: Ib959a9aa39d8f87b0f0b5e297547913c1daa9c14 Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* Adjust license headershjk2012-10-051-21/+20
| | | | | Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* GLSL: Fix recovery token order to avoid infinite loop.Christian Kamm2012-08-071-319/+319
| | | | | | | | The case 'a = b ? ;' recovered with T_NUMBER, T_COMMA, T_NUMBER, ... Task-number: QTCREATORBUG-7517 Change-Id: I3546266b21d11ce08e4af1331be94a78d3b24c19 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Contact -> qt-project.orgEike Ziller2012-07-191-3/+1
| | | | | Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Removed module names from #include directives.Erik Verbruggen2012-02-151-1/+1
| | | | | | | | Getting the #include directives ready for Qt5. This includes the new-project wizards. Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Long live the king!hjk2012-01-261-1/+1
| | | | | Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* all: s/info@qt.nokia.com/qt-info@nokia.com/hjk2011-11-031-2/+2
| | | | | Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Fix/add copyright headersTobias Hunger2011-05-061-1/+1
| | | | Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
* Fix possible crash when parsing layout qualifiers nodes.Roberto Raggi2011-04-181-325/+325
| | | | | Task-number: QTCREATORBUG-4563 Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
* Update license.hjk2011-04-131-14/+13
|
* Fixed (C)opyright headers.Erik Verbruggen2011-02-211-318/+318
|
* It's 2011 now.con2011-01-121-1/+1
| | | | Reviewed-by: hjk
* License headers, part 2con2010-12-171-7/+11
|
* Handle logical xor.Roberto Raggi2010-11-301-318/+318
|
* Recover from unfinished do-while loops.Roberto Raggi2010-11-291-317/+318
|
* Implemented some basic code completion.Roberto Raggi2010-11-291-322/+347
|
* Simple error recovery.Roberto Raggi2010-11-291-336/+380
| | | | Well, it's not very advanced but it is probably good enough for now.
* Remove type categories from the GLSL ASTRhys Weatherley2010-11-291-85/+85
| | | | | Type categories are now handled at semantic analysis time so we don't need to track them at syntax analysis time.
* Added Engine::blockDiagnosticMessages()Roberto Raggi2010-11-261-316/+316
|
* Fix AST for GLSL DeclarationStatementRhys Weatherley2010-11-261-1/+1
| | | | DeclarationStatement wraps a single declaration, not a list.
* Added the suffix AST to the ast nodes and some initial work on the GLSL type ↵Roberto Raggi2010-11-251-282/+282
| | | | system.
* Highlight reserved GLSL keywordsRhys Weatherley2010-11-231-316/+316
|
* Report the syntax errors.Roberto Raggi2010-11-191-318/+327
|
* Use QString instead of std::string in GLSL parserRhys Weatherley2010-11-181-3/+3
|
* Fix some bugs in GLSL AST generation in the parserRhys Weatherley2010-11-181-18/+16
|
* GLSL AST nodes for function and struct declsRhys Weatherley2010-11-181-330/+377
|
* Variable and parameter declarations for GLSLRhys Weatherley2010-11-171-347/+396
|
* Create AST nodes for qualified GLSL typesRhys Weatherley2010-11-151-354/+383
|
* Build AST nodes from within the parser.Rhys Weatherley2010-11-121-524/+543
|
* Making GLSL AST nodes while preserving lineno infoRhys Weatherley2010-11-121-323/+323
| | | | | | | Eventually we will need some way to locate an identifier's definition, so add "lineno" to each AST node. May want to change this to "position" later. The makeAstNode<T>() function takes care of automatically decorating nodes with line numbers.
* Convert GLSL AST nodes into managed typesRhys Weatherley2010-11-121-3/+3
|
* Handle parenthesized expressions.Roberto Raggi2010-11-111-3/+3
|
* Create AST nodes for multiplicative expressions.Roberto Raggi2010-11-111-317/+317
|
* There's nothing to do for the chain rules.Roberto Raggi2010-11-111-20/+20
|
* Introduced a simple memory pool.Roberto Raggi2010-11-111-319/+320
|
View Lorry Controller Status