Skip to content

Commit 02b8eaa

Browse files
committed
Merge branch 'partially-reverted-optimization' into resolve-compilation-time-issues
2 parents d72b6d7 + fb99b2f commit 02b8eaa

File tree

2 files changed

+244
-100
lines changed

2 files changed

+244
-100
lines changed

Sources/SwiftParser/Lexer/UnicodeScalarExtensions.swift

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ extension Unicode.Scalar {
124124
// N1518: Recommendations for extended identifier characters for C and C++
125125
// Proposed Annex X.2: Ranges of characters disallowed initially
126126
let c = self.value
127-
if (Bool(Bool(c >= 0x0300) && Bool(c <= 0x036F)) || Bool(Bool(c >= 0x1DC0) && Bool(c <= 0x1DFF)) || Bool(Bool(c >= 0x20D0) && Bool(c <= 0x20FF)) || Bool(Bool(c >= 0xFE20) && Bool(c <= 0xFE2F))) {
127+
if ((c >= 0x0300 && c <= 0x036F) || (c >= 0x1DC0 && c <= 0x1DFF) || (c >= 0x20D0 && c <= 0x20FF) || (c >= 0xFE20 && c <= 0xFE2F)) {
128128
return false
129129
}
130130

@@ -160,16 +160,16 @@ extension Unicode.Scalar {
160160

161161
// Unicode math, symbol, arrow, dingbat, and line/box drawing chars.
162162
let c = self.value
163-
return Bool(Bool(c >= 0x00A1) && Bool(c <= 0x00A7))
163+
return (c >= 0x00A1 && c <= 0x00A7)
164164
|| c == 0x00A9 || c == 0x00AB || c == 0x00AC || c == 0x00AE
165165
|| c == 0x00B0 || c == 0x00B1 || c == 0x00B6 || c == 0x00BB
166166
|| c == 0x00BF || c == 0x00D7 || c == 0x00F7
167-
|| c == 0x2016 || c == 0x2017 || Bool(Bool(c >= 0x2020) && Bool(c <= 0x2027))
168-
|| Bool(Bool(c >= 0x2030) && Bool(c <= 0x203E)) || Bool(Bool(c >= 0x2041) && Bool(c <= 0x2053))
169-
|| Bool(Bool(c >= 0x2055) && Bool(c <= 0x205E)) || Bool(Bool(c >= 0x2190) && Bool(c <= 0x23FF))
170-
|| Bool(Bool(c >= 0x2500) && Bool(c <= 0x2775)) || Bool(Bool(c >= 0x2794) && Bool(c <= 0x2BFF))
171-
|| Bool(Bool(c >= 0x2E00) && Bool(c <= 0x2E7F)) || Bool(Bool(c >= 0x3001) && Bool(c <= 0x3003))
172-
|| Bool(Bool(c >= 0x3008) && Bool(c <= 0x3030))
167+
|| c == 0x2016 || c == 0x2017 || (c >= 0x2020 && c <= 0x2027)
168+
|| (c >= 0x2030 && c <= 0x203E) || (c >= 0x2041 && c <= 0x2053)
169+
|| (c >= 0x2055 && c <= 0x205E) || (c >= 0x2190 && c <= 0x23FF)
170+
|| (c >= 0x2500 && c <= 0x2775) || (c >= 0x2794 && c <= 0x2BFF)
171+
|| (c >= 0x2E00 && c <= 0x2E7F) || (c >= 0x3001 && c <= 0x3003)
172+
|| (c >= 0x3008 && c <= 0x3030)
173173
}
174174

175175
/// isOperatorContinuationCodePoint - Return true if the specified code point
@@ -181,12 +181,12 @@ extension Unicode.Scalar {
181181

182182
// Unicode combining characters and variation selectors.
183183
let c = self.value
184-
return Bool(Bool(c >= 0x0300) && Bool(c <= 0x036F))
185-
|| Bool(Bool(c >= 0x1DC0) && Bool(c <= 0x1DFF))
186-
|| Bool(Bool(c >= 0x20D0) && Bool(c <= 0x20FF))
187-
|| Bool(Bool(c >= 0xFE00) && Bool(c <= 0xFE0F))
188-
|| Bool(Bool(c >= 0xFE20) && Bool(c <= 0xFE2F))
189-
|| Bool(Bool(c >= 0xE0100) && Bool(c <= 0xE01EF))
184+
return (c >= 0x0300 && c <= 0x036F)
185+
|| (c >= 0x1DC0 && c <= 0x1DFF)
186+
|| (c >= 0x20D0 && c <= 0x20FF)
187+
|| (c >= 0xFE00 && c <= 0xFE0F)
188+
|| (c >= 0xFE20 && c <= 0xFE2F)
189+
|| (c >= 0xE0100 && c <= 0xE01EF)
190190
}
191191

192192
/// Whether this character represents a printable ASCII character,

0 commit comments

Comments
 (0)