Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
F
flatpak-qt-creator
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
cf793418
Commit
cf793418
authored
Nov 30, 2010
by
Roberto Raggi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Handle logical xor.
parent
5aacd959
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
325 additions
and
326 deletions
+325
-326
src/libs/glsl/glsl.g
src/libs/glsl/glsl.g
+1
-5
src/libs/glsl/glsllexer.cpp
src/libs/glsl/glsllexer.cpp
+4
-1
src/libs/glsl/glslparser.cpp
src/libs/glsl/glslparser.cpp
+318
-318
src/libs/glsl/glslparser.h
src/libs/glsl/glslparser.h
+1
-1
src/libs/glsl/glslparsertable.cpp
src/libs/glsl/glslparsertable.cpp
+1
-1
No files found.
src/libs/glsl/glsl.g
View file @
cf793418
...
...
@@ -26,10 +26,6 @@
-- contact the sales department at http://qt.nokia.com/contact.
---------------------------------------------------------------------------
--
-- todo:
-- spelling of XOR_OP and CARET
%decl glslparser.h
%impl glslparser.cpp
%parser GLSLParserTable
...
...
@@ -204,7 +200,7 @@
%token VOID "void"
%token WHILE "while"
%token XOR_ASSIGN "^="
%token XOR_OP "^"
%token XOR_OP "^
^
"
%token TRUE "true"
%token FALSE "false"
%token PREPROC "preprocessor directive"
...
...
src/libs/glsl/glsllexer.cpp
View file @
cf793418
...
...
@@ -331,8 +331,11 @@ int Lexer::yylex_helper(const char **position, int *line)
if
(
_yychar
==
'='
)
{
yyinp
();
return
Parser
::
T_XOR_ASSIGN
;
}
else
if
(
_yychar
==
'^'
)
{
yyinp
();
return
Parser
::
T_XOR_OP
;
}
return
Parser
::
T_
XOR_OP
;
return
Parser
::
T_
CARET
;
// {
case
'{'
:
...
...
src/libs/glsl/glslparser.cpp
View file @
cf793418
This diff is collapsed.
Click to expand it.
src/libs/glsl/glslparser.h
View file @
cf793418
#line 21
7
"./glsl.g"
#line 21
3
"./glsl.g"
/**************************************************************************
**
...
...
src/libs/glsl/glslparsertable.cpp
View file @
cf793418
...
...
@@ -61,7 +61,7 @@ const char *const GLSLParserTable::spell [] = {
"samplerCube"
,
"samplerCubeArray"
,
"samplerCubeArrayShadow"
,
"samplerCubeShadow"
,
";"
,
"/"
,
"smooth"
,
"*"
,
"struct"
,
"subroutine"
,
"-="
,
"switch"
,
"~"
,
"type_name"
,
"uint"
,
"uniform"
,
"usampler1D"
,
"usampler1DArray"
,
"usampler2D"
,
"usampler2DArray"
,
"usampler2DMS"
,
"usampler2DMSarray"
,
"usampler2DRect"
,
"usampler3D"
,
"usamplerBuffer"
,
"usamplerCube"
,
"usamplerCubeArray"
,
"uvec2"
,
"uvec3"
,
"uvec4"
,
"varying"
,
"vec2"
,
"vec3"
,
"vec4"
,
"|"
,
"void"
,
"while"
,
"^="
,
"^"
,
"true"
,
"varying"
,
"vec2"
,
"vec3"
,
"vec4"
,
"|"
,
"void"
,
"while"
,
"^="
,
"^
^
"
,
"true"
,
"false"
,
"preprocessor directive"
,
"comment"
,
"error"
,
"reserved word"
};
const
short
GLSLParserTable
::
lhs
[]
=
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment