diff options
| author | Kai Stevenson <kai@kaistevenson.com> | 2025-11-08 17:30:19 -0800 |
|---|---|---|
| committer | Kai Stevenson <kai@kaistevenson.com> | 2025-11-08 17:32:01 -0800 |
| commit | 8442ed67628e5d51e02b876d0f27479f9215bf0a (patch) | |
| tree | e63c4afce5c29bb2e1edbf5899291508e211d1fe /src/lang | |
| parent | b32604eef0cec59798cdfea53b82766819429717 (diff) | |
add more tests, fix issues, add support for booleans
Diffstat (limited to 'src/lang')
| -rw-r--r-- | src/lang/js-lang/core/lexer.ts | 7 | ||||
| -rw-r--r-- | src/lang/js-lang/core/parser.ts | 16 | ||||
| -rw-r--r-- | src/lang/ts-lang/core/parser.ts | 8 |
3 files changed, 29 insertions, 2 deletions
diff --git a/src/lang/js-lang/core/lexer.ts b/src/lang/js-lang/core/lexer.ts index 95e0e19..e47844a 100644 --- a/src/lang/js-lang/core/lexer.ts +++ b/src/lang/js-lang/core/lexer.ts @@ -6,7 +6,7 @@ const WHITESPACE_TOKENS = [ TokenType.SEMICOLON, ] as string[]; -export const lex = <const Raw extends string>(raw: Raw): Lex<Raw> => { +const _lex = (raw: string): Token[] => { let _raw: string = raw; let nameCollection = ""; const tokens: Token[] = []; @@ -42,5 +42,8 @@ export const lex = <const Raw extends string>(raw: Raw): Lex<Raw> => { nameCollection += head; } - return tokens as Lex<Raw>; + return tokens; }; + +export const lex = <const Raw extends string>(raw: Raw): Lex<Raw> => + _lex(`${raw};`) as Lex<Raw>; diff --git a/src/lang/js-lang/core/parser.ts b/src/lang/js-lang/core/parser.ts index f193d6a..9078f06 100644 --- a/src/lang/js-lang/core/parser.ts +++ b/src/lang/js-lang/core/parser.ts @@ -11,6 +11,22 @@ const resolveNodeFromToken = (token: Token): ASTNode => { children: [], }; } + if (token.name === "true") { + return { + type: NodeType.INT, + name: "", + value: true, + children: [], + }; + } + if (token.name === "false") { + return { + type: NodeType.INT, + name: "", + value: false, + children: [], + }; + } if (token.name[0] === '"' && token.name[token.name.length - 1] === '"') { return { type: NodeType.INT, diff --git a/src/lang/ts-lang/core/parser.ts b/src/lang/ts-lang/core/parser.ts index db6f3aa..3a497a2 100644 --- a/src/lang/ts-lang/core/parser.ts +++ b/src/lang/ts-lang/core/parser.ts @@ -64,10 +64,18 @@ export type ParseNumberLiteral<T extends string> = export type ParseStringLiteral<T extends string> = T extends `"${infer Inner extends string}"` ? Inner : NULL_SENTINEL; +export type ParseBooleanLiteral<T extends string> = T extends `true` + ? true + : T extends `false` + ? false + : NULL_SENTINEL; + export type ResolveNodeFromToken<_Token extends Token> = ParseNumberLiteral< _Token["name"] > extends number ? ASTNode<NodeType.INT, "", ParseNumberLiteral<_Token["name"]>, []> + : ParseBooleanLiteral<_Token["name"]> extends boolean + ? ASTNode<NodeType.INT, "", ParseBooleanLiteral<_Token["name"]>, []> : ParseStringLiteral<_Token["name"]> extends string ? ASTNode<NodeType.INT, "", ParseStringLiteral<_Token["name"]>, []> : ASTNode<NodeType.EXT, _Token["name"], null, []>; |
