Skip to content

Commit 3172461

Browse files
mgretermgreter
committed
More unicode changes
1 parent 4b9947f commit 3172461

7 files changed

+127
-127
lines changed

‎src/ast_values.cpp

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1001,7 +1001,7 @@ namespace Sass {
10011001
using namespace Character;
10021002

10031003
if (quote != 0) {
1004-
buffer.writeCharCode(quote);
1004+
buffer.write(quote);
10051005
}
10061006

10071007
for (auto value : text_->elements()) {
@@ -1013,12 +1013,12 @@ namespace Sass {
10131013
uint8_t codeUnit = value[i];
10141014

10151015
if (isNewline(codeUnit)) {
1016-
buffer.writeCharCode($backslash);
1017-
buffer.writeCharCode($a);
1016+
buffer.write($backslash);
1017+
buffer.write($a);
10181018
if (i != value.size() - 1) {
10191019
uint8_t next = value[i + 1];
10201020
if (isWhitespace(next) || isHex(next)) {
1021-
buffer.writeCharCode($space);
1021+
buffer.write($space);
10221022
}
10231023
}
10241024
}
@@ -1030,9 +1030,9 @@ namespace Sass {
10301030
i < value.size() - 1 &&
10311031
value[i + 1] == $lbrace)) {
10321032
// std::cerr << "ADD BACKSLASH\n";
1033-
buffer.writeCharCode($backslash);
1033+
buffer.write($backslash);
10341034
}
1035-
buffer.writeCharCode(codeUnit);
1035+
buffer.write(codeUnit);
10361036
}
10371037

10381038
}
@@ -1046,7 +1046,7 @@ namespace Sass {
10461046
}
10471047

10481048
if (quote != 0) {
1049-
buffer.writeCharCode(quote);
1049+
buffer.write(quote);
10501050
}
10511051
return buffer.getInterpolation();
10521052

@@ -1216,7 +1216,7 @@ namespace Sass {
12161216
using namespace Character;
12171217

12181218
if (quote != 0) {
1219-
buffer.writeCharCode(quote);
1219+
buffer.write(quote);
12201220
}
12211221

12221222
for (auto value : elements()) {
@@ -1231,12 +1231,12 @@ namespace Sass {
12311231
uint8_t codeUnit = value[i];
12321232

12331233
if (isNewline(codeUnit)) {
1234-
buffer.writeCharCode($backslash);
1235-
buffer.writeCharCode($a);
1234+
buffer.write($backslash);
1235+
buffer.write($a);
12361236
if (i != value.size() - 1) {
12371237
uint8_t next = value[i + 1];
12381238
if (isWhitespace(next) || isHex(next)) {
1239-
buffer.writeCharCode($space);
1239+
buffer.write($space);
12401240
}
12411241
}
12421242
}
@@ -1247,9 +1247,9 @@ namespace Sass {
12471247
codeUnit == $hash &&
12481248
i < value.size() - 1 &&
12491249
value[i + 1] == $lbrace)) {
1250-
buffer.writeCharCode($backslash);
1250+
buffer.write($backslash);
12511251
}
1252-
buffer.writeCharCode(codeUnit);
1252+
buffer.write(codeUnit);
12531253
}
12541254

12551255
}
@@ -1260,7 +1260,7 @@ namespace Sass {
12601260
}
12611261

12621262
if (quote != 0) {
1263-
buffer.writeCharCode(quote);
1263+
buffer.write(quote);
12641264
}
12651265
return buffer.toSchema();
12661266
}

‎src/parser2.cpp

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ namespace Sass {
138138

139139
StringBuffer text;
140140
while (scanner.scanChar($dash)) {
141-
text.writeCharCode($dash);
141+
text.write($dash);
142142
}
143143

144144
auto first = scanner.peekChar();
@@ -148,7 +148,7 @@ namespace Sass {
148148
}
149149
else if (isNameStart(first)) {
150150
// std::cerr << "we start with name\n";
151-
text.writeCharCode(scanner.readChar());
151+
text.write(scanner.readChar());
152152
}
153153
else if (first == $backslash) {
154154
text.write(escape(true)); // identifierStart:
@@ -188,10 +188,10 @@ namespace Sass {
188188
// Disallow `-` followed by a dot or a digit digit in units.
189189
uint8_t second = scanner.peekChar(1);
190190
if (second != $nul && (second == $dot || isDigit(second))) break;
191-
text.writeCharCode(scanner.readChar());
191+
text.write(scanner.readChar());
192192
}
193193
else if (isName(next)) {
194-
text.writeCharCode(scanner.readChar());
194+
text.write(scanner.readChar());
195195
}
196196
else if (next == $backslash) {
197197
text.write(escape());
@@ -235,7 +235,7 @@ namespace Sass {
235235
}
236236
}
237237
else {
238-
buffer.writeCharCode(scanner.readChar());
238+
buffer.write(scanner.readChar());
239239
}
240240
}
241241

@@ -293,15 +293,15 @@ namespace Sass {
293293
buffer.write(rawText(&Parser2::loudComment));
294294
}
295295
else {
296-
buffer.writeCharCode(scanner.readChar());
296+
buffer.write(scanner.readChar());
297297
}
298298
wroteNewline = false;
299299
break;
300300

301301
case $space:
302302
case $tab:
303303
if (wroteNewline || !isWhitespace(scanner.peekChar(1))) {
304-
buffer.writeCharCode($space);
304+
buffer.write($space);
305305
}
306306
scanner.readChar();
307307
break;
@@ -317,7 +317,7 @@ namespace Sass {
317317
case $lparen:
318318
case $lbrace:
319319
case $lbracket:
320-
buffer.writeCharCode(next);
320+
buffer.write(next);
321321
brackets.push_back(opposite(scanner.readChar()));
322322
wroteNewline = false;
323323
break;
@@ -326,15 +326,15 @@ namespace Sass {
326326
case $rbrace:
327327
case $rbracket:
328328
if (brackets.empty()) goto outOfLoop;
329-
buffer.writeCharCode(next);
329+
buffer.write(next);
330330
scanner.expectChar(brackets.back());
331331
wroteNewline = false;
332332
brackets.pop_back();
333333
break;
334334

335335
case $semicolon:
336336
if (brackets.empty()) goto outOfLoop;
337-
buffer.writeCharCode(scanner.readChar());
337+
buffer.write(scanner.readChar());
338338
break;
339339

340340
case $u:
@@ -344,7 +344,7 @@ namespace Sass {
344344
buffer.write(url);
345345
}
346346
else {
347-
buffer.writeCharCode(scanner.readChar());
347+
buffer.write(scanner.readChar());
348348
}
349349
wroteNewline = false;
350350
break;
@@ -356,7 +356,7 @@ namespace Sass {
356356
buffer.write(identifier());
357357
}
358358
else {
359-
buffer.writeCharCode(scanner.readChar());
359+
buffer.write(scanner.readChar());
360360
}
361361
wroteNewline = false;
362362
break;
@@ -403,7 +403,7 @@ namespace Sass {
403403
next == $hash ||
404404
(next >= $asterisk && next <= $tilde) ||
405405
next >= 0x0080) {
406-
buffer.writeCharCode(scanner.readChar());
406+
buffer.write(scanner.readChar());
407407
}
408408
else if (next == $backslash) {
409409
buffer.write(escape());
@@ -413,7 +413,7 @@ namespace Sass {
413413
if (scanner.peekChar() != $rparen) break;
414414
}
415415
else if (next == $rparen) {
416-
buffer.writeCharCode(scanner.readChar());
416+
buffer.write(scanner.readChar());
417417
return buffer.toString();
418418
}
419419
else {
@@ -477,10 +477,10 @@ namespace Sass {
477477
value == 0x7F ||
478478
(identifierStart && isDigit(value))) {
479479
StringBuffer buffer;
480-
buffer.writeCharCode($backslash);
481-
if (value > 0xF) buffer.writeCharCode(hexCharFor(value >> 4));
482-
buffer.writeCharCode(hexCharFor(value & 0xF));
483-
buffer.writeCharCode($space);
480+
buffer.write($backslash);
481+
if (value > 0xF) buffer.write(hexCharFor(value >> 4));
482+
buffer.write(hexCharFor(value & 0xF));
483+
buffer.write($space);
484484
// std::cerr << "From buffer\n";
485485
return buffer.toString();
486486
}

‎src/parser2_scss.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -219,30 +219,30 @@ namespace Sass {
219219
buffer.add(singleInterpolation());
220220
}
221221
else {
222-
buffer.writeCharCode(scanner.readChar());
222+
buffer.write(scanner.readChar());
223223
}
224224
break;
225225

226226
case $asterisk:
227-
buffer.writeCharCode(scanner.readChar());
227+
buffer.write(scanner.readChar());
228228
if (scanner.peekChar() != $slash) break;
229229

230-
buffer.writeCharCode(scanner.readChar());
230+
buffer.write(scanner.readChar());
231231
return SASS_MEMORY_NEW(Comment, "[pstate]", buffer.getInterpolation(), true);
232232
// return LoudComment(buffer.interpolation(scanner.spanFrom(start)));
233233

234234
case $cr:
235235
scanner.readChar();
236-
if (scanner.peekChar() != $lf) buffer.writeCharCode($lf);
236+
if (scanner.peekChar() != $lf) buffer.write($lf);
237237
break;
238238

239239
case $ff:
240240
scanner.readChar();
241-
buffer.writeCharCode($lf);
241+
buffer.write($lf);
242242
break;
243243

244244
default:
245-
buffer.writeCharCode(scanner.readChar());
245+
buffer.write(scanner.readChar());
246246
break;
247247
}
248248
}

‎src/parser2_selector.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -424,33 +424,33 @@ namespace Sass {
424424

425425
case $plus:
426426
case $minus:
427-
buffer.writeCharCode(scanner.readChar());
427+
buffer.write(scanner.readChar());
428428
break;
429429
}
430430

431431
uint8_t first = scanner.peekChar();
432432
if (first != $nul && isDigit(first)) {
433433
while (isDigit(scanner.peekChar())) {
434-
buffer.writeCharCode(scanner.readChar());
434+
buffer.write(scanner.readChar());
435435
}
436436
whitespace();
437437
if (!scanCharIgnoreCase($n)) return buffer.toString();
438438
}
439439
else {
440440
expectCharIgnoreCase($n);
441441
}
442-
buffer.writeCharCode($n);
442+
buffer.write($n);
443443
whitespace();
444444

445445
uint8_t next = scanner.peekChar();
446446
if (next != $plus && next != $minus) return buffer.toString();
447-
buffer.writeCharCode(scanner.readChar());
447+
buffer.write(scanner.readChar());
448448
whitespace();
449449

450450
uint8_t last = scanner.peekChar();
451451
if (last == $nul || !isDigit(last)) scanner.error("Expected a number.");
452452
while (isDigit(scanner.peekChar())) {
453-
buffer.writeCharCode(scanner.readChar());
453+
buffer.write(scanner.readChar());
454454
}
455455
return buffer.toString();
456456
}

0 commit comments

Comments
 (0)