rebase

umut-sahin · Nov 7, 2024 · 318c449 · 318c449
1 parent 5ee6afe
commit 318c449
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 53 deletions.
diff --git a/bindings/typescript/build.js b/bindings/typescript/build.js
@@ -2,15 +2,22 @@ import { execSync } from "child_process";
 import fs from "fs/promises";
 
 async function init() {
-    console.log("Starting build...")
-    await fs.unlink("./src/pkg/dotlr_bg.wasm.d.ts").catch(() => console.warn("No dotlr_bg.wasm.d.ts found"));
-    execSync('tsc', {stdio: 'inherit'});
-    await fs.cp("./src/pkg", "./dist/pkg", {recursive: true});
-    await fs.unlink("./dist/pkg/package.json").catch(() => console.warn("No package.json found"));
-    await fs.unlink("./dist/pkg/README.md").catch(() => console.warn("No README.md found"));
-    await fs.unlink("./dist/pkg/.gitignore").catch(() => console.warn("No .gitignore found"));
-    console.log("Build complete")
-
+  console.log("Starting build...");
+  await fs
+    .unlink("./src/pkg/dotlr_bg.wasm.d.ts")
+    .catch(() => console.warn("No dotlr_bg.wasm.d.ts found"));
+  execSync("tsc", { stdio: "inherit" });
+  await fs.cp("./src/pkg", "./dist/pkg", { recursive: true });
+  await fs
+    .unlink("./dist/pkg/package.json")
+    .catch(() => console.warn("No package.json found"));
+  await fs
+    .unlink("./dist/pkg/README.md")
+    .catch(() => console.warn("No README.md found"));
+  await fs
+    .unlink("./dist/pkg/.gitignore")
+    .catch(() => console.warn("No .gitignore found"));
+  console.log("Build complete");
 }
 
 init();
diff --git a/bindings/typescript/package-lock.json b/bindings/typescript/package-lock.json
diff --git a/bindings/typescript/package.json b/bindings/typescript/package.json
@@ -1,6 +1,6 @@
 {
   "type": "module",
-  "name": "dotlr",
+  "name": "@specy/dotlr",
   "description": "An LR(1) parser generator and visualizer created for educational purposes.",
   "keywords": [
     "educational",
@@ -9,7 +9,7 @@
     "parser-generator"
   ],
   "license": "MIT OR Apache-2.0",
-  "version": "0.3.0",
+  "version": "0.3.15",
   "main": "dist/index.js",
   "exports": {
     ".": "./dist/index.js",

diff --git a/bindings/typescript/src/utils.ts b/bindings/typescript/src/utils.ts
@@ -11,11 +11,12 @@ import type {
 } from "./types";
 
 export function stringifyToken(token: Token, noApostrophes = false) {
-    if (token.type === 'Eof') return "$"
-    if (token.type === 'Empty') return 'ε'
-    if (token.type === "Regex") return `%${token.value}`
-    if (token.type === "Constant") return noApostrophes ? token.value : `'${token.value}'`
-    return ""
+  if (token.type === "Eof") return "$";
+  if (token.type === "Empty") return "ε";
+  if (token.type === "Regex") return `%${token.value}`;
+  if (token.type === "Constant")
+    return noApostrophes ? token.value : `'${token.value}'`;
+  return "";
 }
 
 export function stringifyAtom(atom: AtomicPattern, noApostrophes = false) {
@@ -76,18 +77,22 @@ export function stringifyTreeStack(
   });
 }
 
-export function stringifyTree(tree: Tree, indent: string = '', isLast: boolean = true): string {
-    const linePrefix = isLast ? '└─ ' : '├─ ';
-    let result = '';
-
-    if (tree.type === 'Terminal') {
-        const {token, slice} = tree.value;
-        if (token.type !== 'Eof' && token.type !== 'Empty') {
-            result += `${indent}${linePrefix}${token.value} [${slice}]\n`;
-        }
-    } else {
-        const {symbol, pattern} = tree.value;
-        result += `${indent}${linePrefix}${symbol}\n`;
+export function stringifyTree(
+  tree: Tree,
+  indent: string = "",
+  isLast: boolean = true,
+): string {
+  const linePrefix = isLast ? "└─ " : "├─ ";
+  let result = "";
+
+  if (tree.type === "Terminal") {
+    const { token, slice } = tree.value;
+    if (token.type !== "Eof" && token.type !== "Empty") {
+      result += `${indent}${linePrefix}${token.value} [${slice}]\n`;
+    }
+  } else {
+    const { symbol, pattern } = tree.value;
+    result += `${indent}${linePrefix}${symbol}\n`;
 
     const newIndent = indent + (isLast ? "   " : "│  ");
     pattern.forEach((child, index) => {

diff --git a/src/parser.rs b/src/parser.rs
@@ -40,16 +40,6 @@ impl Parser {
         parser.check_conflicts_internal()
     }
 }
-#[cfg(feature = "wasm")]
-#[cfg_attr(feature = "wasm", wasm_bindgen)]
-impl Parser {
-    pub fn new_wasm(grammar: Grammar) -> Result<Parser, WasmParserError> {
-        Parser::lr(grammar).map_err(WasmParserError::new)
-    }
-    pub fn new_lalr_wasm(grammar: Grammar) -> Result<Parser, WasmParserError> {
-        Parser::lalr(grammar).map_err(WasmParserError::new)
-    }
-}
 
 
 impl Parser {
@@ -600,18 +590,11 @@ impl Parser {
 #[cfg(feature = "wasm")]
 #[cfg_attr(feature = "wasm", wasm_bindgen)]
 impl Parser {
-    pub fn new_wasm(grammar: Grammar) -> Result<Parser, JsValue> {
-        match Parser::lr(grammar) {
-            Ok(parser) => Ok(parser),
-            Err(error) => Err(serde_wasm_bindgen::to_value(&error)?),
-        }
+    pub fn new_wasm(grammar: Grammar) -> Result<Parser, WasmParserError> {
+        Parser::lr(grammar).map_err(WasmParserError::new)
     }
-
-    pub fn new_lalr_wasm(grammar: Grammar) -> Result<Parser, JsValue> {
-        match Parser::lalr(grammar) {
-            Ok(parser) => Ok(parser),
-            Err(error) => Err(serde_wasm_bindgen::to_value(&error)?),
-        }
+    pub fn new_lalr_wasm(grammar: Grammar) -> Result<Parser, WasmParserError> {
+        Parser::lalr(grammar).map_err(WasmParserError::new)
     }
 }