From 70cbcec3601c6b0d96091adc4e1739d439f2b9e6 Mon Sep 17 00:00:00 2001
From: Roman Lukash <2893931+happytomatoe@users.noreply.github.com>
Date: Fri, 11 Oct 2024 20:51:39 +0200
Subject: [PATCH] WIP

---
 components/src/stores/compiler.store.ts                     | 2 +-
 simulator/src/jack/listener/error.listener.ts               | 6 +++---
 simulator/src/jack/listener/global.symbol.table.listener.ts | 1 -
 simulator/src/jack/listener/validator.listener.ts           | 1 -
 simulator/src/jack/listener/vm.writer.listener.ts           | 2 +-
 5 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/components/src/stores/compiler.store.ts b/components/src/stores/compiler.store.ts
index 7dfd9544..6b397e31 100644
--- a/components/src/stores/compiler.store.ts
+++ b/components/src/stores/compiler.store.ts
@@ -1,5 +1,5 @@
 import { FileSystem } from "@davidsouther/jiffies/lib/esm/fs.js";
-import { compile, validate } from "@nand2tetris/simulator/jack/compiler.js";
+import { compile, validate } from "@nand2tetris/simulator/jack/anltr.compiler.js";
 import { CompilationError } from "@nand2tetris/simulator/languages/base.js";
 import { Dispatch, MutableRefObject, useContext, useMemo, useRef } from "react";
 import { useImmerReducer } from "../react.js";
diff --git a/simulator/src/jack/listener/error.listener.ts b/simulator/src/jack/listener/error.listener.ts
index 0bf5bcec..9a4f3691 100644
--- a/simulator/src/jack/listener/error.listener.ts
+++ b/simulator/src/jack/listener/error.listener.ts
@@ -10,12 +10,12 @@ import { assertExists } from "@davidsouther/jiffies/lib/esm/assert.js";
 interface LexerNoViableAltException {
   startIndex: number;
 }
-export class JackCustomErrorListener extends ErrorListener<any> {
+export class JackCustomErrorListener extends ErrorListener<unknown> {
   public errors: JackCompilerError[] = [];
 
   override syntaxError = (
-    recognizer: Recognizer<any>,
-    offendingSymbol: any,
+    recognizer: Recognizer<unknown>,
+    offendingSymbol: unknown,
     line: number,
     column: number,
     msg: string,
diff --git a/simulator/src/jack/listener/global.symbol.table.listener.ts b/simulator/src/jack/listener/global.symbol.table.listener.ts
index 93b4ffee..806c12ee 100644
--- a/simulator/src/jack/listener/global.symbol.table.listener.ts
+++ b/simulator/src/jack/listener/global.symbol.table.listener.ts
@@ -17,7 +17,6 @@ import { assertExists } from "@davidsouther/jiffies/lib/esm/assert.js";
 
 const primitives = new Set(builtInTypes);
 export type Primitive = typeof primitives extends Set<infer S> ? S : never;
-/* eslint-disable  @typescript-eslint/no-non-null-assertion */
 /**
  * Creates global symbol table that contains built-in functions and found classes and subroutines
  */
diff --git a/simulator/src/jack/listener/validator.listener.ts b/simulator/src/jack/listener/validator.listener.ts
index e47d2190..d1ede12d 100644
--- a/simulator/src/jack/listener/validator.listener.ts
+++ b/simulator/src/jack/listener/validator.listener.ts
@@ -50,7 +50,6 @@ import {
 } from "../symbol.js";
 import { CallType, getCallType } from "./common.js";
 import { assertExists } from "@davidsouther/jiffies/lib/esm/assert.js";
-/* eslint-disable  @typescript-eslint/no-non-null-assertion */
 /**
  * Validates Jack file
  */
diff --git a/simulator/src/jack/listener/vm.writer.listener.ts b/simulator/src/jack/listener/vm.writer.listener.ts
index ec0bbf04..9ac249e4 100644
--- a/simulator/src/jack/listener/vm.writer.listener.ts
+++ b/simulator/src/jack/listener/vm.writer.listener.ts
@@ -41,7 +41,7 @@ const unaryOperationToVmCmd: Record<string, string> = {
   "-": "neg",
   "~": "not",
 };
-/* eslint-disable  @typescript-eslint/no-non-null-assertion */
+
 /**
  * Transforms parse tree into VM code
  */