Add Pyodide Evaluators to all slang

Author: veehz

rollup.config.js

@@ -52,11 +52,55 @@ const config = [
     plugins: plugins(),
   },
   {
-    input: "src/pyodide/index.ts",
+    input: "src/pyodide/evaluators/full.ts",
     output: {
-      file: "dist/pyodide-evaluator.cjs",
+      file: "dist/pyodide-evaluator-full.cjs",
       format: "cjs",
-      name: "PyodideEvaluator",
+      name: "PyodideEvaluatorFull",
+      sourcemap: true,
+      inlineDynamicImports: true,
+    },
+    plugins: plugins(),
+  },
+  {
+    input: "src/pyodide/evaluators/chapter1.ts",
+    output: {
+      file: "dist/pyodide-evaluator-1.cjs",
+      format: "cjs",
+      name: "PyodideEvaluator1",
+      sourcemap: true,
+      inlineDynamicImports: true,
+    },
+    plugins: plugins(),
+  },
+  {
+    input: "src/pyodide/evaluators/chapter2.ts",
+    output: {
+      file: "dist/pyodide-evaluator-2.cjs",
+      format: "cjs",
+      name: "PyodideEvaluator2",
+      sourcemap: true,
+      inlineDynamicImports: true,
+    },
+    plugins: plugins(),
+  },
+  {
+    input: "src/pyodide/evaluators/chapter3.ts",
+    output: {
+      file: "dist/pyodide-evaluator-3.cjs",
+      format: "cjs",
+      name: "PyodideEvaluator3",
+      sourcemap: true,
+      inlineDynamicImports: true,
+    },
+    plugins: plugins(),
+  },
+  {
+    input: "src/pyodide/evaluators/chapter4.ts",
+    output: {
+      file: "dist/pyodide-evaluator-4.cjs",
+      format: "cjs",
+      name: "PyodideEvaluator4",
       sourcemap: true,
       inlineDynamicImports: true,
     },

src/parser/python-grammar.ts

@@ -1,10 +1,11 @@
+// @ts-nocheck
 // Generated automatically by nearley, version 2.20.1
 // http://github.com/Hardmath123/nearley
 function id(x) {
   return x[0];
 }
 
-import { StmtNS, ExprNS } from "../ast-types";
+import { ExprNS, StmtNS } from "../ast-types";
 import pythonLexer from "./lexer";
 import { toAstToken } from "./token-bridge";
 

src/pyodide/PyodideEvaluator.ts

@@ -1,11 +1,13 @@
 import { BasicEvaluator, IRunnerPlugin } from "@sourceacademy/conductor/runner";
 import type { PyodideInterface } from "pyodide";
+import { parse } from "../parser/parser-adapter";
+import { analyze } from "../resolver/analysis";
+import { getNonTorchImportRoots, rewriteTorchImports } from "./importAnalyzer";
 import { loadPyodideGeneric } from "./loadPyodide";
 import { loadTorch } from "./loadTorch";
-import { rewriteTorchImports, getNonTorchImportRoots } from "./importAnalyzer";
 
-export default class PyodideEvaluator extends BasicEvaluator {
-  private pyodide: Promise<PyodideInterface>;
+export default abstract class PyodideEvaluator extends BasicEvaluator {
+  protected pyodide: Promise<PyodideInterface>;
   private torchLoaded = false;
 
   constructor(conductor: IRunnerPlugin) {
@@ -21,7 +23,11 @@ export default class PyodideEvaluator extends BasicEvaluator {
     });
   }
 
+  protected abstract validateChunk(_chunk: string): void;
+
   async evaluateChunk(chunk: string): Promise<void> {
+    this.validateChunk(chunk);
+
     const pyodide = await this.pyodide;
 
     // --- Use Python's ast module (via Pyodide) to detect and rewrite torch imports ---
@@ -57,3 +63,18 @@ if missing:
     this.conductor.sendOutput(output);
   }
 }
+
+export class ChapterPyodideEvaluator extends PyodideEvaluator {
+  private chapter: number;
+
+  constructor(conductor: IRunnerPlugin, chapter: number) {
+    super(conductor);
+    this.chapter = chapter;
+  }
+
+  protected validateChunk(chunk: string): void {
+    const script = chunk + "\n";
+    const ast = parse(script);
+    analyze(ast, script, this.chapter);
+  }
+}

src/pyodide/evaluators/chapter1.ts

@@ -0,0 +1,8 @@
+import { IRunnerPlugin } from "@sourceacademy/conductor/runner";
+import { ChapterPyodideEvaluator } from "../PyodideEvaluator";
+
+export default class PyodideEvaluator1 extends ChapterPyodideEvaluator {
+  constructor(conductor: IRunnerPlugin) {
+    super(conductor, 1);
+  }
+}

src/pyodide/evaluators/chapter2.ts

@@ -0,0 +1,8 @@
+import { IRunnerPlugin } from "@sourceacademy/conductor/runner";
+import { ChapterPyodideEvaluator } from "../PyodideEvaluator";
+
+export default class PyodideEvaluator2 extends ChapterPyodideEvaluator {
+  constructor(conductor: IRunnerPlugin) {
+    super(conductor, 2);
+  }
+}

src/pyodide/evaluators/chapter3.ts

@@ -0,0 +1,8 @@
+import { IRunnerPlugin } from "@sourceacademy/conductor/runner";
+import { ChapterPyodideEvaluator } from "../PyodideEvaluator";
+
+export default class PyodideEvaluator3 extends ChapterPyodideEvaluator {
+  constructor(conductor: IRunnerPlugin) {
+    super(conductor, 3);
+  }
+}

src/pyodide/evaluators/chapter4.ts

@@ -0,0 +1,8 @@
+import { IRunnerPlugin } from "@sourceacademy/conductor/runner";
+import { ChapterPyodideEvaluator } from "../PyodideEvaluator";
+
+export default class PyodideEvaluator4 extends ChapterPyodideEvaluator {
+  constructor(conductor: IRunnerPlugin) {
+    super(conductor, 4);
+  }
+}

src/pyodide/evaluators/full.ts

@@ -0,0 +1,10 @@
+import { IRunnerPlugin } from "@sourceacademy/conductor/runner";
+import PyodideEvaluator from "../PyodideEvaluator";
+
+export default class PyodideEvaluatorFull extends PyodideEvaluator {
+  constructor(conductor: IRunnerPlugin) {
+    super(conductor);
+  }
+
+  protected validateChunk(_chunk: string): void {}
+}

src/pyodide/index.ts

@@ -1,2 +1,3 @@
 export { default as PyodideEvaluator } from "./PyodideEvaluator";
+export { ChapterPyodideEvaluator } from "./PyodideEvaluator";
 export { detectTorchImports, getNonTorchImportRoots, rewriteTorchImports } from "./importAnalyzer";