Skip to content

Commit 3780435

Browse files
committed
change -> back to --
1 parent 2f9a413 commit 3780435

17 files changed

+97
-97
lines changed

README.md

+11-11
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ as a [forth-like language](https://en.wikipedia.org/wiki/Forth_(programming_lang
1010
## Syntax
1111

1212
```xml
13-
define-node <name> <input-ports> -> <output-ports> end
13+
define-node <name> <input-ports> -- <output-ports> end
1414
define-rule <name> <name> <function-body> end
1515
define <name> <function-body> end
1616
```
@@ -20,9 +20,9 @@ define <name> <function-body> end
2020
### Natural Number
2121

2222
```
23-
define-node nzero -> value! end
24-
define-node nadd1 prev -> value! end
25-
define-node nadd target! addend -> result end
23+
define-node nzero -- value! end
24+
define-node nadd1 prev -- value! end
25+
define-node nadd target! addend -- result end
2626
```
2727

2828
The rule between `(nadd1)` and `(nadd)` as ASCII art:
@@ -104,9 +104,9 @@ Example interaction:
104104
The whole program with test:
105105

106106
```
107-
define-node nzero -> value! end
108-
define-node nadd1 prev -> value! end
109-
define-node nadd target! addend -> result end
107+
define-node nzero -- value! end
108+
define-node nadd1 prev -- value! end
109+
define-node nadd target! addend -- result end
110110
111111
define-rule nzero nadd
112112
( addend result )
@@ -164,9 +164,9 @@ wire-print-net
164164
### List
165165

166166
```
167-
define-node nil -> value! end
168-
define-node cons tail head -> value! end
169-
define-node append target! rest -> result end
167+
define-node nil -- value! end
168+
define-node cons tail head -- value! end
169+
define-node append target! rest -- result end
170170
171171
define-rule nil append
172172
( rest result )
@@ -179,7 +179,7 @@ define-rule cons append
179179
head cons result connect
180180
end
181181
182-
define-node sole -> value! end
182+
define-node sole -- value! end
183183
184184
nil sole cons sole cons sole cons
185185
nil sole cons sole cons sole cons

docs/articles/programming-with-interaction-nets.md

+21-21
Original file line numberDiff line numberDiff line change
@@ -212,9 +212,9 @@ We design the statement to define node as follows:
212212
The aforementioned nodes are defined as follows:
213213

214214
```
215-
define-node nzero -> value! end
216-
define-node nadd1 prev -> value! end
217-
define-node nadd target! addend -> result end
215+
define-node nzero -- value! end
216+
define-node nadd1 prev -- value! end
217+
define-node nadd target! addend -- result end
218218
```
219219

220220
# 5
@@ -275,9 +275,9 @@ In which we will use `define` to define new words,
275275
and use `--` to comment a line.
276276

277277
```
278-
define-node nzero -> value! end
279-
define-node nadd1 prev -> value! end
280-
define-node nadd target! addend -> result end
278+
define-node nzero -- value! end
279+
define-node nadd1 prev -- value! end
280+
define-node nadd target! addend -- result end
281281
282282
define-rule nzero nadd
283283
( addend result )
@@ -381,7 +381,7 @@ first! second
381381
Node definition:
382382

383383
```
384-
define-node nat-max first! second -> result end
384+
define-node nat-max first! second -- result end
385385
```
386386

387387
The interaction between `(nzero)` and `(nzero)` is simple:
@@ -434,7 +434,7 @@ first second!
434434
Node definition:
435435

436436
```
437-
define-node nat-max-aux first second! -> result end
437+
define-node nat-max-aux first second! -- result end
438438
```
439439

440440
Using the auxiliary node to define
@@ -501,8 +501,8 @@ end
501501
```
502502

503503
```
504-
define-node nat-max first! second -> result end
505-
define-node nat-max-aux first second! -> result end
504+
define-node nat-max first! second -- result end
505+
define-node nat-max-aux first second! -- result end
506506
507507
define-rule nzero nat-max
508508
( second result )
@@ -560,7 +560,7 @@ Thus when we want to factor out a subsequence from a sequence of words,
560560
there will be no complicated syntax preventing us from doing so.
561561

562562
```
563-
define-node nat-erase target! -> end
563+
define-node nat-erase target! -- end
564564
565565
define-rule nzero nat-erase end
566566
@@ -569,7 +569,7 @@ define-rule nadd1 nat-erase
569569
prev nat-erase
570570
end
571571
572-
define-node nat-dup target! -> first second end
572+
define-node nat-dup target! -- first second end
573573
574574
define-rule nzero nat-dup
575575
( first second )
@@ -585,7 +585,7 @@ define-rule nadd1 nat-dup
585585
prev-first nadd1 first connect
586586
end
587587
588-
define-node nmul target! mulend -> result end
588+
define-node nmul target! mulend -- result end
589589
590590
define-rule nzero nmul
591591
( mulend result )
@@ -617,9 +617,9 @@ The difference is that the `(nadd1)` of natural number only nadd one node,
617617
while the `(cons)` of list nadd one node and link to an extra node.
618618

619619
```
620-
define-node nil -> value! end
621-
define-node cons tail head -> value! end
622-
define-node append target! rest -> result end
620+
define-node nil -- value! end
621+
define-node cons tail head -- value! end
622+
define-node append target! rest -- result end
623623
624624
define-rule nil append
625625
( rest result )
@@ -634,7 +634,7 @@ end
634634
635635
-- test
636636
637-
define-node sole -> value! end
637+
define-node sole -- value! end
638638
639639
nil sole cons sole cons sole cons
640640
nil sole cons sole cons sole cons
@@ -669,9 +669,9 @@ But in interaction nets,
669669
the relationship between all nodes is symmetric.
670670

671671
```
672-
define-node diff front -> back value! end
673-
define-node diff-append target! rest -> result end
674-
define-node diff-open new-back target! -> old-back end
672+
define-node diff front -- back value! end
673+
define-node diff-append target! rest -- result end
674+
define-node diff-open new-back target! -- old-back end
675675
676676
define-rule diff diff-append
677677
( rest result ) ( front back )
@@ -687,7 +687,7 @@ end
687687
688688
-- test
689689
690-
define-node sole -> value! end
690+
define-node sole -- value! end
691691
692692
define sole-diff-list
693693
wire-pair ( front front-op )

docs/articles/反应网编程.md

+21-21
Original file line numberDiff line numberDiff line change
@@ -209,9 +209,9 @@ year: 2023
209209
前文提到的节点定义如下:
210210

211211
```
212-
define-node nzero -> value! end
213-
define-node nadd1 prev -> value! end
214-
define-node nadd target! addend -> result end
212+
define-node nzero -- value! end
213+
define-node nadd1 prev -- value! end
214+
define-node nadd target! addend -- result end
215215
```
216216

217217
# 5
@@ -270,9 +270,9 @@ end
270270
在其中,我们还用了 `define` 来定义新词,用 `--` 来注释一行。
271271

272272
```
273-
define-node nzero -> value! end
274-
define-node nadd1 prev -> value! end
275-
define-node nadd target! addend -> result end
273+
define-node nzero -- value! end
274+
define-node nadd1 prev -- value! end
275+
define-node nadd target! addend -- result end
276276
277277
define-rule nzero nadd
278278
( addend result )
@@ -369,7 +369,7 @@ first! second
369369
定义如下:
370370

371371
```
372-
define-node nat-max first! second -> result end
372+
define-node nat-max first! second -- result end
373373
```
374374

375375
`(nzero)``(nzero)` 的反应很简单:
@@ -423,7 +423,7 @@ first second!
423423
定义如下:
424424

425425
```
426-
define-node nat-max-aux first second! -> result end
426+
define-node nat-max-aux first second! -- result end
427427
```
428428

429429
利用辅助节点定义 `(nadd1)``(nat-max)` 之间的规则:
@@ -489,8 +489,8 @@ end
489489
```
490490

491491
```
492-
define-node nat-max first! second -> result end
493-
define-node nat-max-aux first second! -> result end
492+
define-node nat-max first! second -- result end
493+
define-node nat-max-aux first second! -- result end
494494
495495
define-rule nzero nat-max
496496
( second result )
@@ -546,7 +546,7 @@ one two nat-max
546546
不用考虑那么多语法上相互影响的地方。
547547

548548
```
549-
define-node nat-erase target! -> end
549+
define-node nat-erase target! -- end
550550
551551
define-rule nzero nat-erase end
552552
@@ -555,7 +555,7 @@ define-rule nadd1 nat-erase
555555
prev nat-erase
556556
end
557557
558-
define-node nat-dup target! -> first second end
558+
define-node nat-dup target! -- first second end
559559
560560
define-rule nzero nat-dup
561561
( first second )
@@ -571,7 +571,7 @@ define-rule nadd1 nat-dup
571571
prev-first nadd1 first connect
572572
end
573573
574-
define-node nmul target! mulend -> result end
574+
define-node nmul target! mulend -- result end
575575
576576
define-rule nzero nmul
577577
( mulend result )
@@ -604,9 +604,9 @@ two two nmul
604604
还连接到了一个额外的节点。
605605

606606
```
607-
define-node nil -> value! end
608-
define-node cons tail head -> value! end
609-
define-node append target! rest -> result end
607+
define-node nil -- value! end
608+
define-node cons tail head -- value! end
609+
define-node append target! rest -- result end
610610
611611
define-rule nil append
612612
( rest result )
@@ -621,7 +621,7 @@ end
621621
622622
-- test
623623
624-
define-node sole -> value! end
624+
define-node sole -- value! end
625625
626626
nil sole cons sole cons sole cons
627627
nil sole cons sole cons sole cons
@@ -652,9 +652,9 @@ append
652652
而在反应网中,所有节点之间的关系是对称的。
653653

654654
```
655-
define-node diff front -> back value! end
656-
define-node diff-append target! rest -> result end
657-
define-node diff-open new-back target! -> old-back end
655+
define-node diff front -- back value! end
656+
define-node diff-append target! rest -- result end
657+
define-node diff-open new-back target! -- old-back end
658658
659659
define-rule diff diff-append
660660
( rest result ) ( front back )
@@ -670,7 +670,7 @@ end
670670
671671
-- test
672672
673-
define-node sole -> value! end
673+
define-node sole -- value! end
674674
675675
define sole-diff-list
676676
wire-pair ( front front-op )

examples/combinators.fth

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
// D: duplicate
33
// E: erase
44

5-
define-node C car cdr -> value! end
6-
define-node D target! -> first second end
7-
define-node E target! -> end
5+
define-node C car cdr -- value! end
6+
define-node D target! -- first second end
7+
define-node E target! -- end
88

99
define-rule C C
1010
( top-car top-cdr )

examples/combinators.play.fth

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
// D: duplicate
33
// E: erase
44

5-
define-node C car cdr -> value! end
6-
define-node D target! -> first second end
7-
define-node E target! -> end
5+
define-node C car cdr -- value! end
6+
define-node D target! -- first second end
7+
define-node E target! -- end
88

99
define-rule C C
1010
( top-car top-cdr )

examples/datatypes/diff-list.test.fth

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
define-node diff front -> back value! end
2-
define-node diff-append target! rest -> result end
3-
define-node diff-open new-back target! -> old-back end
1+
define-node diff front -- back value! end
2+
define-node diff-append target! rest -- result end
3+
define-node diff-open new-back target! -- old-back end
44

55
// plug the front of the `target` to the back of `rest`.
66

@@ -18,9 +18,9 @@ end
1818

1919
// import nil cons append "list.fth"
2020

21-
define-node nil -> value! end
22-
define-node cons tail head -> value! end
23-
define-node append target! rest -> result end
21+
define-node nil -- value! end
22+
define-node cons tail head -- value! end
23+
define-node append target! rest -- result end
2424

2525
define-rule nil append
2626
( rest result )
@@ -35,7 +35,7 @@ end
3535

3636
// test
3737

38-
define-node sole -> value! end
38+
define-node sole -- value! end
3939

4040
define sole-diff-list
4141
wire-pair ( front front-op )

examples/datatypes/list.test.fth

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
define-node nil -> value! end
2-
define-node cons tail head -> value! end
3-
define-node append target! rest -> result end
1+
define-node nil -- value! end
2+
define-node cons tail head -- value! end
3+
define-node append target! rest -- result end
44

55
define-rule nil append
66
( rest result )
@@ -13,7 +13,7 @@ define-rule cons append
1313
head cons result connect
1414
end
1515

16-
define-node sole -> value! end
16+
define-node sole -- value! end
1717

1818
nil sole cons sole cons sole cons
1919
nil sole cons sole cons sole cons

0 commit comments

Comments
 (0)