summaryrefslogtreecommitdiff
path: root/src/libs/glsl/glslparser.cpp
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* Use only interned (unique) strings.Roberto Raggi2010-11-111-1/+1
|
* Get rid of glsl.g.in and start working on the semantic actions.Roberto Raggi2010-11-111-26/+1903
|
* Include stdio and regenerated the parser.Roberto Raggi2010-11-101-0/+1
|
* Introduced a simple incremental lexer for GLSL.Roberto Raggi2010-11-101-0/+29
|
* Imported our new GLSL front-end.Roberto Raggi2010-11-101-0/+141
View Lorry Controller Status