mirror of
https://github.com/Noratrieb/riverdelta.git
synced 2026-01-14 16:35:03 +01:00
more eslint rules and fix bugs
This commit is contained in:
parent
12fcc4f1bb
commit
854112da3c
13 changed files with 67 additions and 29 deletions
|
|
@ -460,7 +460,7 @@ export type Folder = {
|
|||
type: FoldFn<Type>;
|
||||
};
|
||||
|
||||
const ITEM_DEFAULT: symbol = Symbol("item must not be overriden");
|
||||
const ITEM_DEFAULT = Symbol("item must not be overriden");
|
||||
|
||||
export const DEFAULT_FOLDER: Folder = {
|
||||
ast() {
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ export class CompilerError extends Error {
|
|||
}
|
||||
}
|
||||
|
||||
export function withErrorHandler(input: string, f: () => void) {
|
||||
export function withErrorHandler(input: string, f: () => void): void {
|
||||
try {
|
||||
f();
|
||||
} catch (e) {
|
||||
|
|
|
|||
|
|
@ -44,12 +44,13 @@ function main() {
|
|||
}
|
||||
|
||||
if (!isValidIdent(packageName)) {
|
||||
console.error(`error: package name \`${packageName}\` is not a valid identifer`);
|
||||
console.error(
|
||||
`error: package name \`${packageName}\` is not a valid identifer`
|
||||
);
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
console.log(`package name: '${packageName}'`);
|
||||
|
||||
|
||||
withErrorHandler(input, () => {
|
||||
const start = Date.now();
|
||||
|
|
@ -92,7 +93,7 @@ function main() {
|
|||
if (error && error.code === 1) {
|
||||
console.log(stderr);
|
||||
} else if (error) {
|
||||
console.error(`failed to spawn wasm-tools: ${error}`);
|
||||
console.error(`failed to spawn wasm-tools: ${error.message}`);
|
||||
} else {
|
||||
if (stderr) {
|
||||
console.log(stderr);
|
||||
|
|
|
|||
|
|
@ -36,8 +36,7 @@ export type DatalessToken =
|
|||
| "=="
|
||||
| "<="
|
||||
| ">="
|
||||
| "!="
|
||||
| "!";
|
||||
| "!=";
|
||||
|
||||
export type TokenIdent = { kind: "identifier"; ident: string };
|
||||
|
||||
|
|
|
|||
|
|
@ -441,6 +441,7 @@ function lowerExpr(fcx: FuncContext, instrs: wasm.Instr[], expr: Expr) {
|
|||
kind = `${valty}.ne`;
|
||||
break;
|
||||
}
|
||||
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
|
||||
const instr: wasm.NumericInstr = { kind } as any; // Typescript is buggy.
|
||||
instrs.push(instr);
|
||||
} else if (lhsTy.kind === "bool" && rhsTy.kind === "bool") {
|
||||
|
|
@ -582,11 +583,11 @@ function lowerExpr(fcx: FuncContext, instrs: wasm.Instr[], expr: Expr) {
|
|||
switch (expr.lhs.ty!.kind) {
|
||||
case "tuple": {
|
||||
// Tuples have a by-value ABI, so we can simply index.
|
||||
const lhsSize = argRetAbi(expr.lhs.ty!).length;
|
||||
const lhsSize = argRetAbi(expr.lhs.ty).length;
|
||||
const resultAbi = argRetAbi(expr.ty!);
|
||||
const resultSize = resultAbi.length;
|
||||
const wasmIdx = wasmTypeIdxForTupleField(
|
||||
expr.lhs.ty!,
|
||||
expr.lhs.ty,
|
||||
expr.field.fieldIdx!
|
||||
);
|
||||
|
||||
|
|
@ -625,7 +626,7 @@ function lowerExpr(fcx: FuncContext, instrs: wasm.Instr[], expr: Expr) {
|
|||
break;
|
||||
}
|
||||
case "if": {
|
||||
lowerExpr(fcx, instrs, expr.cond!);
|
||||
lowerExpr(fcx, instrs, expr.cond);
|
||||
|
||||
fcx.currentBlockDepth++;
|
||||
const thenInstrs: wasm.Instr[] = [];
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ function printItem(item: Item): string {
|
|||
return id + printImportDef(item.node);
|
||||
}
|
||||
case "mod": {
|
||||
return id +printMod(item.node);
|
||||
return id + printMod(item.node);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -444,7 +444,7 @@ export class InferContext {
|
|||
}
|
||||
}
|
||||
|
||||
public assign(lhs_: Ty, rhs_: Ty, span: Span) {
|
||||
public assign(lhs_: Ty, rhs_: Ty, span: Span): void {
|
||||
const lhs = this.resolveIfPossible(lhs_);
|
||||
const rhs = this.resolveIfPossible(rhs_);
|
||||
|
||||
|
|
@ -586,7 +586,7 @@ export function checkBody(
|
|||
|
||||
const type: Type | undefined = loweredBindingTy && {
|
||||
...expr.type!,
|
||||
ty: loweredBindingTy!,
|
||||
ty: loweredBindingTy,
|
||||
};
|
||||
|
||||
return {
|
||||
|
|
@ -689,7 +689,7 @@ export function checkBody(
|
|||
case "call": {
|
||||
const lhs = this.expr(expr.lhs);
|
||||
lhs.ty = infcx.resolveIfPossible(lhs.ty!);
|
||||
const lhsTy = lhs.ty!;
|
||||
const lhsTy = lhs.ty;
|
||||
if (lhsTy.kind !== "fn") {
|
||||
throw new CompilerError(
|
||||
`expression of type ${printTy(lhsTy)} is not callable`,
|
||||
|
|
@ -700,7 +700,7 @@ export function checkBody(
|
|||
const args = expr.args.map((arg) => this.expr(arg));
|
||||
|
||||
lhsTy.params.forEach((param, i) => {
|
||||
if (!args[i]) {
|
||||
if (args.length <= i) {
|
||||
throw new CompilerError(
|
||||
`missing argument of type ${printTy(param)}`,
|
||||
expr.span
|
||||
|
|
@ -905,7 +905,8 @@ export function checkBody(
|
|||
|
||||
const resolveTy = (ty: Ty, span: Span) => {
|
||||
const resTy = infcx.resolveIfPossible(ty);
|
||||
if (!resTy) {
|
||||
// TODO: When doing deep resolution, we need to check for _any_ vars.
|
||||
if (resTy.kind === "var") {
|
||||
throw new CompilerError("cannot infer type", span);
|
||||
}
|
||||
return resTy;
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ export function encodeUtf8(s: string): Uint8Array {
|
|||
}
|
||||
|
||||
export class Ids {
|
||||
nextId: number = 0;
|
||||
nextId = 0;
|
||||
|
||||
public next(): number {
|
||||
return this.nextId++;
|
||||
|
|
@ -22,13 +22,13 @@ export function unwrap<T>(value: T | undefined): T {
|
|||
* It uses JSON+string equality instead of refernece equality.
|
||||
*/
|
||||
export class ComplexMap<K, V> {
|
||||
inner: Map<string | number, V> = new Map();
|
||||
inner = new Map<string | number, V>();
|
||||
|
||||
public get(key: K): V | undefined {
|
||||
return this.inner.get(this.mangleKey(key));
|
||||
}
|
||||
|
||||
public set(key: K, value: V) {
|
||||
public set(key: K, value: V): void {
|
||||
this.inner.set(this.mangleKey(key), value);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -265,6 +265,7 @@ export type ControlInstr =
|
|||
|
||||
export type Instr =
|
||||
| NumericInstr
|
||||
// eslint-disable-next-line @typescript-eslint/no-redundant-type-constituents
|
||||
| VectorInstr
|
||||
| ReferenceInstr
|
||||
| ParametricInstr
|
||||
|
|
|
|||
|
|
@ -140,8 +140,8 @@ function printString(s: string, f: FmtCtx) {
|
|||
|
||||
function printBinaryString(buf: Uint8Array, f: FmtCtx) {
|
||||
const parts: string[] = [];
|
||||
for (let i = 0; i < buf.length; i++) {
|
||||
const byte = buf[i];
|
||||
|
||||
buf.forEach((byte) => {
|
||||
const noEscape =
|
||||
(byte > 0x30 && byte <= 0x5a) || (byte > 0x61 && byte <= 0x71);
|
||||
if (noEscape) {
|
||||
|
|
@ -149,13 +149,13 @@ function printBinaryString(buf: Uint8Array, f: FmtCtx) {
|
|||
} else {
|
||||
parts.push(`\\${byte.toString(16).padStart(2, "0")}`);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
f.word(`"${parts.join("")}"`);
|
||||
}
|
||||
|
||||
function printId(id: string | undefined, f: FmtCtx) {
|
||||
if (id) {
|
||||
if (id !== undefined) {
|
||||
f.word(`$${id}`);
|
||||
}
|
||||
}
|
||||
|
|
@ -215,7 +215,7 @@ function printBlockType(type: Blocktype, f: FmtCtx) {
|
|||
}
|
||||
|
||||
function printMemarg(arg: MemArg, f: FmtCtx) {
|
||||
if (arg.offset /*0->false*/) {
|
||||
if (arg.offset === undefined || arg.offset === 0) {
|
||||
f.word(`offset=${arg.offset}`);
|
||||
}
|
||||
if (arg.align !== undefined) {
|
||||
|
|
@ -437,7 +437,7 @@ function printInstr(instr: Instr, f: FmtCtx) {
|
|||
f.controlFlow(instr.kind);
|
||||
f.word(instr.func);
|
||||
const name = f.mod.funcs[instr.func]?._name;
|
||||
if (name) {
|
||||
if (name !== undefined) {
|
||||
f.comment(name);
|
||||
}
|
||||
break;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue