[syntax] use "@cicada-lang/partech" to implement new syntax

TODO.md

@@ -1,8 +1,8 @@
-[syntax] use "@cicada-lang/partech" to implement new syntax
+`"head" let` instead of `(let head)`
 
 `Node` with optionally named port
 
-- `NetRenderer` show free port names
+`defnode` instead of `defcons` and `defelim`
 
 `NetRenderer` -- format to simple text representation of graph
 
@@ -12,6 +12,8 @@ change the `render` command to simple `run` command
 
 [maybe] quit using `ActiveEdge`
 
+`NetRenderer` show free port names
+
 # the paper
 
 phase space and monoid -- understand the model theory of linear logic

docs/notes/design-of-new-syntax.md

@@ -59,13 +59,12 @@ defrule add1 add
 end
 ```
 
-`defn` is a short hand for simple `defrule`,
-to define rules that works like a function.
+`defru` is a short hand for simple `defrule`.
 
 ```inet
-defn zero add end
+defru zero add end
 
-defn add1 add add add1 end
+defru add1 add add add1 end
 ```
 
 ```inet
@@ -111,12 +110,12 @@ defrule cons append
   return-(append)
 end
 
-defn null append end
+defru null append end
 
 # the syntax for `let` and `get` is yet to be designed.
 # I use `<...>` and description for work-in-progress syntax design.
 
-defn cons append
+defru cons append
   <let head> append <get head> cons
 end
 
@@ -158,13 +157,13 @@ defrule diff diff_open
   (diff)-left return-(diff_open)
 end
 
-defn diff diff_append
+defru diff diff_append
   <let diff_list end start>
   <get end> <get diff_list>
   diff_open <get start> diff
 end
 
-defn diff diff_open
+defru diff diff_open
   <let list end start>
   <get list> <get end> connect
   <get start>

docs/tests/diff-list.inet

@@ -1,29 +1,33 @@
-(defcons sole 0 1)
+defcons sole 0 1 end
 
-(defcons null 0 1)
-(defcons cons 2 1)
+defcons null 0 1 end
+defcons cons 2 1 end
 
-(defcons diff 2 1)
+defcons diff 2 1 end
 
-(defelim diff-append 2 1)
+defelim diff_append 2 1 end
 
-(defrule (diff diff-append)
-  (let diff-list end start)
-  end diff-list diff-open start diff)
+defru diff diff_append
+  (let start) (let fin) (let diff_list)
+  fin diff_list diff_open start diff
+end
 
-(defelim diff-open 2 1)
+defelim diff_open 2 1 end
 
-(defrule (diff diff-open)
-  (let list end start)
-  list end connect
-  start)
+defru diff diff_open
+  (let start) (let fin) (let list)
+  list fin connect
+  start
+end
 
-(defnet one-two-soles
+defnet one_two_soles
   wire sole cons diff
   wire sole cons sole cons diff
-  diff-append)
+  diff_append
+end
 
-(defnet two-two-soles
+defnet two_two_soles
   wire sole cons sole cons diff
   wire sole cons sole cons diff
-  diff-append)
+  diff_append
+end

docs/tests/diff-list.inet.one-two-soles.initial.txt → docs/tests/diff-list.inet.one_two_soles.initial.txt

@@ -16,18 +16,18 @@ cons#8
 diff#9 -- cons#8 [label="0-2"]
 cons#8
 diff#9
-diff-append#10 -- diff#3 [label="1-2"]
+diff_append#10 -- diff#3 [label="1-2"]
 diff#3
-diff-append#10
+diff_append#10
 cons#2 -- diff#3 [label="1-1"]
 diff#3
 cons#2
 cons#6 -- diff#9 [label="1-1"]
 diff#9
 cons#6
-diff-append#10 -- diff#9 [label="0-2" color=red]
+diff_append#10 -- diff#9 [label="0-2" color=red]
 diff#9
-diff-append#10
-diff-append#10(2) -- diff-append#10
-diff-append#10
-diff-append#10(2)
+diff_append#10
+diff_append#10(2) -- diff_append#10
+diff_append#10
+diff_append#10(2)

docs/tests/diff-list.inet.two-two-soles.initial.txt → docs/tests/diff-list.inet.two_two_soles.initial.txt

@@ -22,18 +22,18 @@ cons#24
 diff#25 -- cons#24 [label="0-2"]
 cons#24
 diff#25
-diff-append#26 -- diff#19 [label="1-2"]
+diff_append#26 -- diff#19 [label="1-2"]
 diff#19
-diff-append#26
+diff_append#26
 cons#16 -- diff#19 [label="1-1"]
 diff#19
 cons#16
 cons#22 -- diff#25 [label="1-1"]
 diff#25
 cons#22
-diff-append#26 -- diff#25 [label="0-2" color=red]
+diff_append#26 -- diff#25 [label="0-2" color=red]
 diff#25
-diff-append#26
-diff-append#26(2) -- diff-append#26
-diff-append#26
-diff-append#26(2)
+diff_append#26
+diff_append#26(2) -- diff_append#26
+diff_append#26
+diff_append#26(2)

docs/tests/list.inet

@@ -1,16 +1,17 @@
-(defcons sole 0 1)
+defcons sole 0 1 end
 
-(defcons null 0 1)
+defcons null 0 1 end
 
-(defcons cons 2 1)
+defcons cons 2 1 end
 
-(defelim append 2 1)
+defelim append 2 1 end
 
-(defrule (null append))
+defru null append end
 
-(defrule (cons append) (let head) append head cons)
+defru cons append (let head) append head cons end
 
-(defnet six-soles
+defnet six_soles
   null sole cons sole cons sole cons
   null sole cons sole cons sole cons
-  append)
+  append
+end

docs/tests/nat.inet

@@ -1,17 +1,19 @@
-(defcons zero 0 1)
+defcons zero 0 1 end
 
-(defcons add1 1 1)
+defcons add1 1 1 end
 
-(defelim add 2 1)
+defelim add 2 1 end
 
-(defrule (zero add))
+defru zero add end
 
-(defrule (add1 add) add add1)
+defru add1 add add add1 end
 
-(defnet two
+defnet two
   zero add1
   zero add1
-  add)
+  add
+end
 
-(defnet four
-  two two add)
+defnet four
+  two two add
+end

package.json

@@ -24,7 +24,7 @@
     "typescript": "^5.1.6"
   },
   "dependencies": {
-    "@cicada-lang/sexp": "^0.0.36",
+    "@cicada-lang/partech": "^0.2.5",
     "@xieyuheng/command-line": "^0.0.10",
     "@xieyuheng/ty": "^0.1.22"
   },

src/console/commands/RenderCommand.ts

@@ -1,4 +1,4 @@
-import { ParsingError } from "@cicada-lang/sexp/lib/errors"
+import { ParsingError } from "@cicada-lang/partech/lib/errors"
 import { Command, CommandRunner } from "@xieyuheng/command-line"
 import ty from "@xieyuheng/ty"
 import fs from "fs"
@@ -68,7 +68,7 @@ export class RenderCommand extends Command<Args, Opts> {
       }
     } catch (error) {
       if (error instanceof ParsingError) {
-        const report = error.span.report(text)
+        const report = error.report(text)
         console.error(report)
       }
 

src/lang/errors/ParsingError.ts

@@ -1 +1 @@
-export { ParsingError } from "@cicada-lang/sexp/lib/errors"
+export { ParsingError } from "@cicada-lang/partech/lib/errors"

src/lang/span/index.ts

@@ -1 +1 @@
-export { Span } from "@cicada-lang/sexp/lib/span"
+export { Span } from "@cicada-lang/partech/lib/span"

src/lang/syntax/grammars/index.ts

@@ -0,0 +1,10 @@
+import * as pt from "@cicada-lang/partech"
+
+export const zero_or_more = pt.grammars.zero_or_more
+export const one_or_more = pt.grammars.one_or_more
+export const optional = pt.grammars.optional
+export const dashline = pt.grammars.dashline
+
+export * from "./name"
+export * from "./stmt"
+export * from "./word"