parsing strings

azizghuloum · Nov 25, 2024 · 9a318a2 · 9a318a2
1 parent a2fff5d
commit 9a318a2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/src/AST.ts b/src/AST.ts
@@ -8,7 +8,7 @@ export type atom_tag =
   | "regex_pattern"
   | "type_identifier"
   | "jsx_text"
-  | "string_fragment"
+  | "string"
   | "ERROR"
   | "other";
 
@@ -19,9 +19,9 @@ export const id_tags: { [k in atom_tag]: boolean } = {
   shorthand_property_identifier: true,
   jsx_text: false,
   number: false,
+  string: false,
   other: false,
   regex_pattern: false,
-  string_fragment: false,
   ERROR: false,
 };
 
@@ -39,7 +39,7 @@ export type list_tag =
   | "statement_block"
   | "empty_statement"
   | "array"
-  | "string"
+  | "required_parameter"
   | "member_expression"
   | "parenthesized_expression"
   | "ternary_expression"
@@ -73,7 +73,7 @@ export const list_tags: { [k in list_tag]: list_tag } = {
   empty_statement: "empty_statement",
   slice: "slice",
   array: "array",
-  string: "string",
+  required_parameter: "required_parameter",
   member_expression: "member_expression",
   parenthesized_expression: "parenthesized_expression",
   ternary_expression: "ternary_expression",

diff --git a/src/parser-loader.ts b/src/parser-loader.ts
@@ -37,7 +37,6 @@ function absurdly(node: Parser.SyntaxNode): AST {
       case "type_identifier":
       case "shorthand_property_identifier":
       case "property_identifier":
-      case "string_fragment":
       case "ERROR": {
         return { type: "atom", tag: node.type, content: node.text };
       }
@@ -52,6 +51,9 @@ function absurdly(node: Parser.SyntaxNode): AST {
       }
     }
   } else {
+    if (node.type === "string") {
+      return { type: "atom", tag: "string", content: node.text };
+    }
     const ls = children.filter((x) => x.type !== "comment").map(absurdly);
     switch (node.type) {
       case "expression_statement": {
@@ -67,9 +69,11 @@ function absurdly(node: Parser.SyntaxNode): AST {
         }
       }
       case "required_parameter": {
-        assert(ls.length === 1);
-        const x = ls[0];
-        return x;
+        if (ls.length === 1) {
+          return ls[0];
+        } else {
+          return { type: "list", tag: "required_parameter", content: array_to_ll(ls) };
+        }
       }
       case "arrow_function": {
         if (ls.length === 3) {