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

refactorings

Browse source
This commit is contained in:
nora 2023-08-02 19:18:52 +02:00
parent 7eeaf548d0
commit 2f1f4a9798
12 changed files with 85 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/parser.ts
View file

@ -32,7 +32,7 @@ import {
GlobalItem,
StructLiteralField,
} from "./ast";
import { CompilerError, eofSpan, LoadedFile, Span, spanMerge } from "./error";
import { CompilerError, LoadedFile, Span } from "./error";
import { BaseToken, Token, TokenIdent, TokenLitString } from "./lexer";
import { ComplexMap, ComplexSet, Ids } from "./utils";
@ -297,7 +297,7 @@ function mkParserExprBinary(
[t, tok] = next(t);
let rhs;
[t, rhs] = parser(t);
const span = spanMerge(lhs.span, rhs.span);
const span = lhs.span.merge(rhs.span);
return [t, mkExpr(lhs, rhs, span, tok.kind)];
}
@ -380,7 +380,7 @@ function parseExprCall(t: State): [State, Expr<Parsed>] {
kind: "fieldAccess",
lhs,
field: { span: access.span, value },
span: spanMerge(lhs.span, access.span),
span: lhs.span.merge(access.span),
};
}
}
@ -676,7 +676,7 @@ function expectNext<T extends BaseToken>(
if (!tok) {
throw new CompilerError(
`expected \`${kind}\`, found end of file`,
eofSpan(t.file)
Span.eof(t.file)
);
}
if (tok.kind !== kind) {
@ -691,7 +691,7 @@ function expectNext<T extends BaseToken>(
function next(t: State): [State, Token] {
const [rest, next] = maybeNextT(t);
if (!next) {
throw new CompilerError("unexpected end of file", eofSpan(t.file));
throw new CompilerError("unexpected end of file", Span.eof(t.file));
}
return [rest, next];
}