Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
glslang
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
glslang
Commits
3494d71c
Commit
3494d71c
authored
Feb 28, 2017
by
John Kessenich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
PP: Fix issue #738: don't assert on characters within a string.
parent
fb22b69f
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
6 deletions
+9
-6
badChars.frag
Test/badChars.frag
+2
-0
badChars.frag.out
Test/baseResults/badChars.frag.out
+2
-1
revision.h
glslang/Include/revision.h
+1
-1
PpContext.h
glslang/MachineIndependent/preprocessor/PpContext.h
+1
-1
PpTokens.cpp
glslang/MachineIndependent/preprocessor/PpTokens.cpp
+3
-3
No files found.
Test/badChars.frag
View file @
3494d71c
No preview for this file type
Test/baseResults/badChars.frag.out
View file @
3494d71c
...
@@ -5,8 +5,9 @@ ERROR: 0:3: '#error' : A <bad token> B
...
@@ -5,8 +5,9 @@ ERROR: 0:3: '#error' : A <bad token> B
ERROR: 0:4: 'preprocessor evaluation' : bad expression
ERROR: 0:4: 'preprocessor evaluation' : bad expression
ERROR: 0:4: '#if' : unexpected tokens following directive
ERROR: 0:4: '#if' : unexpected tokens following directive
ERROR: 0:6: '€' : unexpected token
ERROR: 0:6: '€' : unexpected token
ERROR: 0:7: 'string' : End of line in string
ERROR: 0:7: '' : syntax error
ERROR: 0:7: '' : syntax error
ERROR:
7
compilation errors. No code generated.
ERROR:
8
compilation errors. No code generated.
Shader version: 100
Shader version: 100
...
...
glslang/Include/revision.h
View file @
3494d71c
...
@@ -2,5 +2,5 @@
...
@@ -2,5 +2,5 @@
// For the version, it uses the latest git tag followed by the number of commits.
// For the version, it uses the latest git tag followed by the number of commits.
// For the date, it uses the current date (when then script is run).
// For the date, it uses the current date (when then script is run).
#define GLSLANG_REVISION "Overload400-PrecQual.186
1
"
#define GLSLANG_REVISION "Overload400-PrecQual.186
5
"
#define GLSLANG_DATE "28-Feb-2017"
#define GLSLANG_DATE "28-Feb-2017"
glslang/MachineIndependent/preprocessor/PpContext.h
View file @
3494d71c
...
@@ -236,7 +236,7 @@ public:
...
@@ -236,7 +236,7 @@ public:
void
reset
()
{
current
=
0
;
}
void
reset
()
{
current
=
0
;
}
protected
:
protected
:
void
putSubtoken
(
int
);
void
putSubtoken
(
char
);
int
getSubtoken
();
int
getSubtoken
();
void
ungetSubtoken
();
void
ungetSubtoken
();
...
...
glslang/MachineIndependent/preprocessor/PpTokens.cpp
View file @
3494d71c
...
@@ -96,9 +96,8 @@ NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
...
@@ -96,9 +96,8 @@ NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
namespace
glslang
{
namespace
glslang
{
// push onto back of stream
// push onto back of stream
void
TPpContext
::
TokenStream
::
putSubtoken
(
int
subtoken
)
void
TPpContext
::
TokenStream
::
putSubtoken
(
char
subtoken
)
{
{
assert
((
subtoken
&
~
0xff
)
==
0
);
data
.
push_back
(
static_cast
<
unsigned
char
>
(
subtoken
));
data
.
push_back
(
static_cast
<
unsigned
char
>
(
subtoken
));
}
}
...
@@ -125,7 +124,8 @@ void TPpContext::TokenStream::putToken(int token, TPpToken* ppToken)
...
@@ -125,7 +124,8 @@ void TPpContext::TokenStream::putToken(int token, TPpToken* ppToken)
const
char
*
s
;
const
char
*
s
;
char
*
str
=
NULL
;
char
*
str
=
NULL
;
putSubtoken
(
token
);
assert
((
token
&
~
0xff
)
==
0
);
putSubtoken
(
static_cast
<
char
>
(
token
));
switch
(
token
)
{
switch
(
token
)
{
case
PpAtomIdentifier
:
case
PpAtomIdentifier
:
...
...
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