summaryrefslogtreecommitdiff
path: root/src/parse
diff options
context:
space:
mode:
Diffstat (limited to 'src/parse')
-rw-r--r--src/parse/expr.cpp3
-rw-r--r--src/parse/lex.cpp8
2 files changed, 7 insertions, 4 deletions
diff --git a/src/parse/expr.cpp b/src/parse/expr.cpp
index d4edb208..15a3e179 100644
--- a/src/parse/expr.cpp
+++ b/src/parse/expr.cpp
@@ -669,6 +669,9 @@ bool Parse_IsTokValue(eTokenType tok_type)
case TOK_PAREN_OPEN:
case TOK_SQUARE_OPEN:
+ case TOK_INTERPOLATED_PATH:
+ case TOK_INTERPOLATED_EXPR:
+
case TOK_MACRO:
case TOK_PIPE:
diff --git a/src/parse/lex.cpp b/src/parse/lex.cpp
index 7b99c433..57a0bedc 100644
--- a/src/parse/lex.cpp
+++ b/src/parse/lex.cpp
@@ -1010,12 +1010,12 @@ bool Codepoint::isxdigit() const {
s += (char)(0xC0 | ((cp.v >> 6) & 0x1F));
s += (char)(0x80 | ((cp.v >> 0) & 0x3F));
}
- else if( cp.v <= (0x0F+1)<<(2*6) ) {
+ else if( cp.v < (0x0F+1)<<(2*6) ) {
s += (char)(0xE0 | ((cp.v >> 12) & 0x0F));
s += (char)(0x80 | ((cp.v >> 6) & 0x3F));
s += (char)(0x80 | ((cp.v >> 0) & 0x3F));
}
- else if( cp.v <= (0x07+1)<<(3*6) ) {
+ else if( cp.v < (0x07+1)<<(3*6) ) {
s += (char)(0xF0 | ((cp.v >> 18) & 0x07));
s += (char)(0x80 | ((cp.v >> 12) & 0x3F));
s += (char)(0x80 | ((cp.v >> 6) & 0x3F));
@@ -1035,12 +1035,12 @@ bool Codepoint::isxdigit() const {
os << (char)(0xC0 | ((cp.v >> 6) & 0x1F));
os << (char)(0x80 | ((cp.v >> 0) & 0x3F));
}
- else if( cp.v <= (0x0F+1)<<(2*6) ) {
+ else if( cp.v < (0x0F+1)<<(2*6) ) {
os << (char)(0xE0 | ((cp.v >> 12) & 0x0F));
os << (char)(0x80 | ((cp.v >> 6) & 0x3F));
os << (char)(0x80 | ((cp.v >> 0) & 0x3F));
}
- else if( cp.v <= (0x07+1)<<(2*6) ) {
+ else if( cp.v < (0x07+1)<<(2*6) ) {
os << (char)(0xF0 | ((cp.v >> 18) & 0x07));
os << (char)(0x80 | ((cp.v >> 12) & 0x3F));
os << (char)(0x80 | ((cp.v >> 6) & 0x3F));