Move grammar into parser

voyd-lang · Sep 11, 2024 · 394bb69 · 394bb69
1 parent 4c1f473
commit 394bb69
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 5 deletions.
diff --git a/src/lib/index.ts b/src/lib/index.ts
@@ -1,2 +1,2 @@
-export * as grammar from "./grammar.js";
+export * as grammar from "../parser/grammar.js";
 export * from "../parser/utils/parse-file.js";
diff --git a/src/lib/grammar.ts → src/parser/grammar.ts b/src/lib/grammar.ts → src/parser/grammar.ts
diff --git a/src/parser/lexer.ts b/src/parser/lexer.ts
@@ -6,7 +6,7 @@ import {
   isWhitespace,
   isDigit,
   isDigitSign,
-} from "../lib/grammar.js";
+} from "./grammar.js";
 
 export const lexer = (chars: CharStream): Token => {
   const token = new Token({

diff --git a/src/parser/syntax-macros/functional-notation.ts b/src/parser/syntax-macros/functional-notation.ts
@@ -1,4 +1,4 @@
-import { isOp } from "../../lib/grammar.js";
+import { isOp } from "../grammar.js";
 import { Expr, List } from "../../syntax-objects/index.js";
 
 export const functionalNotation = (list: List): List => {

diff --git a/src/parser/syntax-macros/interpret-whitespace.ts b/src/parser/syntax-macros/interpret-whitespace.ts
@@ -1,4 +1,4 @@
-import { isContinuationOp, isGreedyOp } from "../../lib/grammar.js";
+import { isContinuationOp, isGreedyOp } from "../grammar.js";
 import { Expr, List } from "../../syntax-objects/index.js";
 
 export const interpretWhitespace = (list: List, indentLevel?: number): List => {

diff --git a/src/parser/syntax-macros/primary.ts b/src/parser/syntax-macros/primary.ts
@@ -1,4 +1,4 @@
-import { infixOps, isPrefixOp, prefixOps } from "../../lib/grammar.js";
+import { infixOps, isPrefixOp, prefixOps } from "../grammar.js";
 import { Expr, List } from "../../syntax-objects/index.js";
 
 /**