quit using hand writing parser

cicada-lang · Apr 28, 2024 · 397398b · 397398b
1 parent a922f99
commit 397398b
Show file tree

Hide file tree

Showing 34 changed files with 11 additions and 366 deletions.
diff --git a/TODO.md b/TODO.md
@@ -8,15 +8,6 @@ type constraint should not be `String(x)`
 - should be `The(String, x)`
 - or just `x: String`
 
-# syntax
-
-> remove partech -- use hand write parser
-
-parseOperator
-parseOperand
-parseStmt & parseStmts
-loopUntilEnd
-
 # chimera
 
 [chimera] 如何在逻辑式中恢复部分的过程式 contral flow？

diff --git a/src/lang/syntax-old/index.ts b/src/lang/syntax-old/index.ts
diff --git a/src/lang/syntax/Lexer.test.ts b/src/lang/syntax/Lexer.test.ts
diff --git a/src/lang/syntax/Lexer.ts b/src/lang/syntax/Lexer.ts
diff --git a/src/lang/syntax/Parser.test.ts b/src/lang/syntax/Parser.test.ts
diff --git a/src/lang/syntax/Parser.ts b/src/lang/syntax/Parser.ts
diff --git a/src/lang/syntax/Span.ts b/src/lang/syntax/Span.ts
diff --git a/src/lang/syntax/Token.ts b/src/lang/syntax/Token.ts
diff --git a/src/lang/syntax/TokenTable.ts b/src/lang/syntax/TokenTable.ts
diff --git a/src/lang/syntax-old/grammars/arg.ts → src/lang/syntax/grammars/arg.ts b/src/lang/syntax-old/grammars/arg.ts → src/lang/syntax/grammars/arg.ts
diff --git a/src/lang/syntax-old/grammars/caze.ts → src/lang/syntax/grammars/caze.ts b/src/lang/syntax-old/grammars/caze.ts → src/lang/syntax/grammars/caze.ts
diff --git a/src/lang/syntax-old/grammars/else_if.ts → src/lang/syntax/grammars/else_if.ts b/src/lang/syntax-old/grammars/else_if.ts → src/lang/syntax/grammars/else_if.ts
diff --git a/src/lang/syntax-old/grammars/exp.ts → src/lang/syntax/grammars/exp.ts b/src/lang/syntax-old/grammars/exp.ts → src/lang/syntax/grammars/exp.ts
diff --git a/src/lang/syntax-old/grammars/goal.ts → src/lang/syntax/grammars/goal.ts b/src/lang/syntax-old/grammars/goal.ts → src/lang/syntax/grammars/goal.ts
diff --git a/...ang/syntax-old/grammars/import_binding.ts → src/lang/syntax/grammars/import_binding.ts b/...ang/syntax-old/grammars/import_binding.ts → src/lang/syntax/grammars/import_binding.ts
diff --git a/src/lang/syntax-old/grammars/index.ts → src/lang/syntax/grammars/index.ts b/src/lang/syntax-old/grammars/index.ts → src/lang/syntax/grammars/index.ts
diff --git a/src/lang/syntax-old/grammars/key.ts → src/lang/syntax/grammars/key.ts b/src/lang/syntax-old/grammars/key.ts → src/lang/syntax/grammars/key.ts
diff --git a/src/lang/syntax-old/grammars/name.ts → src/lang/syntax/grammars/name.ts b/src/lang/syntax-old/grammars/name.ts → src/lang/syntax/grammars/name.ts
diff --git a/src/lang/syntax-old/grammars/property.ts → src/lang/syntax/grammars/property.ts b/src/lang/syntax-old/grammars/property.ts → src/lang/syntax/grammars/property.ts
diff --git a/src/lang/syntax-old/grammars/stmt.ts → src/lang/syntax/grammars/stmt.ts b/src/lang/syntax-old/grammars/stmt.ts → src/lang/syntax/grammars/stmt.ts
diff --git a/src/lang/syntax/index.ts b/src/lang/syntax/index.ts
@@ -1,4 +1,10 @@
-export * from "./Lexer.js"
-export * from "./Parser.js"
-export * from "./Span.js"
-export * from "./Token.js"
+import * as pt from "@cicada-lang/partech"
+import * as grammars from "./grammars/index.js"
+import * as matchers from "./matchers/index.js"
+
+export const parseStmts = pt.gen_parse({
+  preprocess: pt.preprocess.erase_comment,
+  lexer: pt.lexers.common,
+  grammar: pt.grammar_start(grammars, "stmts"),
+  matcher: matchers.stmts_matcher,
+})
diff --git a/src/lang/syntax-old/matchers/arg_matcher.ts → src/lang/syntax/matchers/arg_matcher.ts b/src/lang/syntax-old/matchers/arg_matcher.ts → src/lang/syntax/matchers/arg_matcher.ts
diff --git a/src/lang/syntax-old/matchers/caze_matcher.ts → src/lang/syntax/matchers/caze_matcher.ts b/src/lang/syntax-old/matchers/caze_matcher.ts → src/lang/syntax/matchers/caze_matcher.ts
diff --git a/...ng/syntax-old/matchers/else_if_matcher.ts → src/lang/syntax/matchers/else_if_matcher.ts b/...ng/syntax-old/matchers/else_if_matcher.ts → src/lang/syntax/matchers/else_if_matcher.ts
diff --git a/src/lang/syntax-old/matchers/exp_matcher.ts → src/lang/syntax/matchers/exp_matcher.ts b/src/lang/syntax-old/matchers/exp_matcher.ts → src/lang/syntax/matchers/exp_matcher.ts
diff --git a/src/lang/syntax-old/matchers/goal_matcher.ts → src/lang/syntax/matchers/goal_matcher.ts b/src/lang/syntax-old/matchers/goal_matcher.ts → src/lang/syntax/matchers/goal_matcher.ts
diff --git a/...ax-old/matchers/import_binding_matcher.ts → ...syntax/matchers/import_binding_matcher.ts b/...ax-old/matchers/import_binding_matcher.ts → ...syntax/matchers/import_binding_matcher.ts
diff --git a/src/lang/syntax-old/matchers/index.ts → src/lang/syntax/matchers/index.ts b/src/lang/syntax-old/matchers/index.ts → src/lang/syntax/matchers/index.ts
diff --git a/src/lang/syntax-old/matchers/key_matcher.ts → src/lang/syntax/matchers/key_matcher.ts b/src/lang/syntax-old/matchers/key_matcher.ts → src/lang/syntax/matchers/key_matcher.ts
diff --git a/src/lang/syntax-old/matchers/name_matcher.ts → src/lang/syntax/matchers/name_matcher.ts b/src/lang/syntax-old/matchers/name_matcher.ts → src/lang/syntax/matchers/name_matcher.ts
diff --git a/...g/syntax-old/matchers/property_matcher.ts → src/lang/syntax/matchers/property_matcher.ts b/...g/syntax-old/matchers/property_matcher.ts → src/lang/syntax/matchers/property_matcher.ts
diff --git a/src/lang/syntax-old/matchers/stmt_matcher.ts → src/lang/syntax/matchers/stmt_matcher.ts b/src/lang/syntax-old/matchers/stmt_matcher.ts → src/lang/syntax/matchers/stmt_matcher.ts
diff --git a/src/lang/syntax/parseExp.ts b/src/lang/syntax/parseExp.ts