Noratrieb/riverdelta
1
0
Fork 0
mirror of https://github.com/Noratrieb/riverdelta.git synced 2026-01-15 00:45:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

struct literals

Browse source
This commit is contained in:
nora 2023-07-27 22:00:04 +02:00
parent b52abed441
commit 39a995b765
6 changed files with 149 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

52
src/parser.ts
View file

@ -5,9 +5,11 @@ import {
BinaryKind,
COMPARISON_KINDS,
Expr,
ExprStructLiteral,
FieldDef,
FunctionArg,
FunctionDef,
Identifier,
Item,
LOGICAL_KINDS,
Type,
@ -98,10 +100,16 @@ function parseItem(t: Token[]): [Token[], Item] {
[t] = expectNext(t, ":");
let type;
[t, type] = parseType(t);
return [t, { name: {
name: name.ident,
span: name.span,
}, type }];
return [
t,
{
name: {
name: name.ident,
span: name.span,
},
type,
},
];
});
[t] = expectNext(t, ";");
@ -137,8 +145,9 @@ function parseExpr(t: Token[]): [Token[], Expr] {
CALL = ATOM { "(" EXPR_LIST ")" }
ATOM = "(" { EXPR ";" } EXPR ")" | IDENT | LITERAL | EMPTY
ATOM = "(" { EXPR ";" } EXPR ")" | IDENT { STRUCT_INIT } | LITERAL | EMPTY
EMPTY =
STRUCT_INIT = "{" { NAME ":" EXPR } { "," NAME ":" EXPR } { "," } "}"
EXPR_LIST = { EXPR { "," EXPR } { "," } }
*/
const [, peak] = next(t);
@ -309,6 +318,22 @@ function parseExprAtom(startT: Token[]): [Token[], Expr] {
}
if (tok.kind === "identifier") {
console.log(t);
if (maybeNextT(t)[1]?.kind === "{") {
let fields;
[t, fields] = parseStructInit(t);
return [
t,
{
kind: "structLiteral",
name: { name: tok.ident, span },
fields,
span,
},
];
}
return [
t,
{
@ -323,6 +348,23 @@ function parseExprAtom(startT: Token[]): [Token[], Expr] {
return [startT, { kind: "empty", span }];
}
function parseStructInit(t: Token[]): [Token[], ExprStructLiteral["fields"]] {
[t] = expectNext(t, "{");
let fields;
[t, fields] = parseCommaSeparatedList<[Identifier, Expr]>(t, "}", (t) => {
let name;
[t, name] = expectNext<TokenIdent>(t, "identifier");
[t] = expectNext(t, ":");
let expr;
[t, expr] = parseExpr(t);
return [t, [{ name: name.ident, span: name.span }, expr]];
});
return [t, fields];
}
function parseType(t: Token[]): [Token[], Type] {
let tok;
[t, tok] = next(t);