Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
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
community
godot
Commits
7217a7ed
Unverified
Commit
7217a7ed
authored
Jun 11, 2020
by
Rémi Verschelde
Committed by
GitHub
Jun 11, 2020
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #39230 from ntfshard/expression_string_singlequote
Fix for Expression class: string inside an expression can't be single quoted
parents
786fc63f
ec164b23
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
1 deletion
+3
-1
expression.cpp
core/math/expression.cpp
+3
-1
No files found.
core/math/expression.cpp
View file @
7217a7ed
...
@@ -896,6 +896,7 @@ Error Expression::_get_token(Token &r_token) {
...
@@ -896,6 +896,7 @@ Error Expression::_get_token(Token &r_token) {
return
OK
;
return
OK
;
}
}
case
'\''
:
case
'"'
:
{
case
'"'
:
{
String
str
;
String
str
;
while
(
true
)
{
while
(
true
)
{
...
@@ -905,7 +906,8 @@ Error Expression::_get_token(Token &r_token) {
...
@@ -905,7 +906,8 @@ Error Expression::_get_token(Token &r_token) {
_set_error
(
"Unterminated String"
);
_set_error
(
"Unterminated String"
);
r_token
.
type
=
TK_ERROR
;
r_token
.
type
=
TK_ERROR
;
return
ERR_PARSE_ERROR
;
return
ERR_PARSE_ERROR
;
}
else
if
(
ch
==
'"'
)
{
}
else
if
(
ch
==
cchar
)
{
// cchar contain a corresponding quote symbol
break
;
break
;
}
else
if
(
ch
==
'\\'
)
{
}
else
if
(
ch
==
'\\'
)
{
//escaped characters...
//escaped characters...
...
...
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