ambr Parenthesis Bracket

Author: xieyuheng

src/sexp/lexer/Lexer.test.ts

@@ -57,40 +57,40 @@ test("quotes", () => {
 
 test("parentheses", () => {
   assertTokens("()", [
-    { kind: "ParenthesisStart", value: "(" },
-    { kind: "ParenthesisEnd", value: ")" },
+    { kind: "BracketStart", value: "(" },
+    { kind: "BracketEnd", value: ")" },
   ])
 
   assertTokens("( )", [
-    { kind: "ParenthesisStart", value: "(" },
-    { kind: "ParenthesisEnd", value: ")" },
+    { kind: "BracketStart", value: "(" },
+    { kind: "BracketEnd", value: ")" },
   ])
 
   assertTokens("(a)(b)", [
-    { kind: "ParenthesisStart", value: "(" },
+    { kind: "BracketStart", value: "(" },
     { kind: "Symbol", value: "a" },
-    { kind: "ParenthesisEnd", value: ")" },
-    { kind: "ParenthesisStart", value: "(" },
+    { kind: "BracketEnd", value: ")" },
+    { kind: "BracketStart", value: "(" },
     { kind: "Symbol", value: "b" },
-    { kind: "ParenthesisEnd", value: ")" },
+    { kind: "BracketEnd", value: ")" },
   ])
 
   assertTokens("([{x}])", [
-    { kind: "ParenthesisStart", value: "(" },
-    { kind: "ParenthesisStart", value: "[" },
-    { kind: "ParenthesisStart", value: "{" },
+    { kind: "BracketStart", value: "(" },
+    { kind: "BracketStart", value: "[" },
+    { kind: "BracketStart", value: "{" },
     { kind: "Symbol", value: "x" },
-    { kind: "ParenthesisEnd", value: "}" },
-    { kind: "ParenthesisEnd", value: "]" },
-    { kind: "ParenthesisEnd", value: ")" },
+    { kind: "BracketEnd", value: "}" },
+    { kind: "BracketEnd", value: "]" },
+    { kind: "BracketEnd", value: ")" },
   ])
 
   assertTokens("(head . tail)", [
-    { kind: "ParenthesisStart", value: "(" },
+    { kind: "BracketStart", value: "(" },
     { kind: "Symbol", value: "head" },
     { kind: "Symbol", value: "." },
     { kind: "Symbol", value: "tail" },
-    { kind: "ParenthesisEnd", value: ")" },
+    { kind: "BracketEnd", value: ")" },
   ])
 
   assertTokens("abc", [{ kind: "Symbol", value: "abc" }])

src/sexp/lexer/Lexing.ts

@@ -12,8 +12,8 @@ export class Lexing implements Iterator<Token> {
     //   try `NumberHandler` before `SymbolHandler`.
     new SpaceHandler(this),
     new QuoteHandler(this),
-    new ParenthesisStartHandler(this),
-    new ParenthesisEndHandler(this),
+    new BracketStartHandler(this),
+    new BracketEndHandler(this),
     new CommentHandler(this),
     new StringHandler(this),
     new NumberHandler(this),
@@ -103,8 +103,8 @@ class SpaceHandler extends CharHandler {
   }
 }
 
-class ParenthesisStartHandler extends CharHandler {
-  kind = "ParenthesisStart" as const
+class BracketStartHandler extends CharHandler {
+  kind = "BracketStart" as const
 
   canHandle(char: string): boolean {
     return this.lexer.config.parentheses
@@ -118,8 +118,8 @@ class ParenthesisStartHandler extends CharHandler {
   }
 }
 
-class ParenthesisEndHandler extends CharHandler {
-  kind = "ParenthesisEnd" as const
+class BracketEndHandler extends CharHandler {
+  kind = "BracketEnd" as const
 
   canHandle(char: string): boolean {
     return this.lexer.config.parentheses.map(({ end }) => end).includes(char)

src/sexp/parser/Parsing.ts

@@ -71,16 +71,16 @@ export class Parsing {
         }
       }
 
-      case "ParenthesisStart": {
+      case "BracketStart": {
         return this.parseList(
           tokens[0],
           tokens.slice(1),
           Sexps.Null(tokens[0].span),
         )
       }
 
-      case "ParenthesisEnd": {
-        throw new ParsingError(`I found extra ParenthesisEnd`, tokens[0].span)
+      case "BracketEnd": {
+        throw new ParsingError(`I found extra BracketEnd`, tokens[0].span)
       }
 
       case "Quote": {
@@ -111,32 +111,26 @@ export class Parsing {
     list: Sexps.Cons | Sexps.Null,
   ): Result {
     if (tokens[0] === undefined) {
-      throw new ParsingError(`Missing ParenthesisEnd`, start.span)
+      throw new ParsingError(`Missing BracketEnd`, start.span)
     }
 
     if (tokens[0].kind === "Symbol" && tokens[0].value === ".") {
       const { sexp, remain } = this.parse(tokens.slice(1))
 
       if (remain[0] === undefined) {
-        throw new ParsingError(`Missing ParenthesisEnd`, start.span)
+        throw new ParsingError(`Missing BracketEnd`, start.span)
       }
 
       if (!this.parser.config.matchParentheses(start.value, remain[0].value)) {
-        throw new ParsingError(
-          `I expect a matching ParenthesisEnd`,
-          remain[0].span,
-        )
+        throw new ParsingError(`I expect a matching BracketEnd`, remain[0].span)
       }
 
       return { sexp, remain: remain.slice(1) }
     }
 
-    if (tokens[0].kind === "ParenthesisEnd") {
+    if (tokens[0].kind === "BracketEnd") {
       if (!this.parser.config.matchParentheses(start.value, tokens[0].value)) {
-        throw new ParsingError(
-          `I expect a matching ParenthesisEnd`,
-          tokens[0].span,
-        )
+        throw new ParsingError(`I expect a matching BracketEnd`, tokens[0].span)
       }
 
       list.span = tokens[0].span

src/sexp/token/Token.ts

@@ -4,8 +4,8 @@ export type TokenKind =
   | "Symbol"
   | "String"
   | "Number"
-  | "ParenthesisStart"
-  | "ParenthesisEnd"
+  | "BracketStart"
+  | "BracketEnd"
   | "Quote"
 
 export class Token {