starred/pkl
1
0
Fork 0
mirror of https://github.com/apple/pkl.git synced 2026-08-27 06:04:03 +02:00
Code Issues 198 Packages Projects Releases 10 Wiki Activity

Add hex/binary/octal support to String.toInt() (#1808)

Browse Source
This commit is contained in:
Jen Basch
2026-08-18 09:44:02 -04:00
committed by GitHub
parent 762db144ce
commit ac43bdbb17
8 changed files with 279 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkl-parser/src/main/java/org/pkl/parser/Lexer.java
+11 -9
View File
@@ -236,7 +236,7 @@ public final class Lexer {
} else {
throw unexpectedChar("..", ".", "...", "...?");
}
} else if (lookahead >= 48 && lookahead <= 57) {
} else if (lookahead >= '0' && lookahead <= '9') {
yield lexNumber(ch);
} else {
yield Token.DOT;
@@ -574,7 +574,7 @@ public final class Lexer {
return Token.FLOAT;
}
while ((lookahead >= 48 && lookahead <= 57) || lookahead == '_') {
while ((lookahead >= '0' && lookahead <= '9') || lookahead == '_') {
nextChar();
}
@@ -587,7 +587,7 @@ public final class Lexer {
if (lookahead == '_') {
throw lexError("invalidSeparatorPosition");
}
if (lookahead < 48 || lookahead > 57) {
if (lookahead < '0' || lookahead > '9') {
backup();
return Token.INT;
}
@@ -661,10 +661,10 @@ public final class Lexer {
throw lexError("invalidSeparatorPosition");
}
var ch = lookahead;
if (!(ch >= 48 && ch <= 55)) {
if (!(ch >= '0' && ch <= '7')) {
throw unexpectedChar(ch, "octal number");
}
while ((ch >= 48 && ch <= 55) || ch == '_') {
while ((ch >= '0' && ch <= '7') || ch == '_') {
nextChar();
ch = lookahead;
}
@@ -677,10 +677,10 @@ public final class Lexer {
if (lookahead == '_') {
throw lexError("invalidSeparatorPosition");
}
if (lookahead < 48 || lookahead > 57) {
if (lookahead < '0' || lookahead > '9') {
throw unexpectedChar(lookahead, "number");
}
while ((lookahead >= 48 && lookahead <= 57) || lookahead == '_') {
while ((lookahead >= '0' && lookahead <= '9') || lookahead == '_') {
nextChar();
}
}
@@ -689,7 +689,7 @@ public final class Lexer {
if (lookahead == '_') {
throw lexError("invalidSeparatorPosition");
}
while ((lookahead >= 48 && lookahead <= 57) || lookahead == '_') {
while ((lookahead >= '0' && lookahead <= '9') || lookahead == '_') {
nextChar();
}
if (lookahead == 'e' || lookahead == 'E') {
@@ -706,7 +706,9 @@ public final class Lexer {
}
private boolean isHex(int code) {
return (code >= 48 && code <= 57) || (code >= 97 && code <= 102) || (code >= 65 && code <= 70);
return (code >= '0' && code <= '9')
|| (code >= 'a' && code <= 'f')
|| (code >= 'A' && code <= 'F');
}
private static boolean isIdentifierStart(int c) {