fez-lisp 1.4.14 → 1.4.16
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/baked/std.js +1 -1
- package/package.json +1 -1
- package/src/interpreter.js +0 -1
- package/src/macros.js +48 -38
- package/src/parser.js +2 -14
package/package.json
CHANGED
package/src/interpreter.js
CHANGED
|
@@ -776,7 +776,6 @@ export const keywords = {
|
|
|
776
776
|
}`
|
|
777
777
|
)
|
|
778
778
|
const localEnv = Object.create(env)
|
|
779
|
-
// localEnv[KEYWORDS.BLOCK] = block[KEYWORDS.BLOCK]
|
|
780
779
|
for (let i = 0; i < props.length; ++i) {
|
|
781
780
|
const value = evaluate(props[i], scope)
|
|
782
781
|
Object.defineProperty(localEnv, params[i][VALUE], {
|
package/src/macros.js
CHANGED
|
@@ -520,6 +520,7 @@ export const deSuggarAst = (ast, scope) => {
|
|
|
520
520
|
},
|
|
521
521
|
last
|
|
522
522
|
)
|
|
523
|
+
|
|
523
524
|
exp[exp.length - 1] = [
|
|
524
525
|
[APPLY, KEYWORDS.CALL_FUNCTION],
|
|
525
526
|
[
|
|
@@ -531,58 +532,66 @@ export const deSuggarAst = (ast, scope) => {
|
|
|
531
532
|
[WORD, newName],
|
|
532
533
|
last
|
|
533
534
|
],
|
|
534
|
-
|
|
535
|
-
[
|
|
536
|
-
[WORD, newName],
|
|
537
|
-
[
|
|
538
|
-
[APPLY, KEYWORDS.ANONYMOUS_FUNCTION],
|
|
539
|
-
[WORD, '*fn*'],
|
|
540
|
-
[
|
|
541
|
-
[APPLY, KEYWORDS.ANONYMOUS_FUNCTION],
|
|
542
|
-
...args,
|
|
535
|
+
args.length < 5
|
|
536
|
+
? [
|
|
543
537
|
[
|
|
544
|
-
|
|
545
|
-
|
|
546
|
-
|
|
547
|
-
|
|
548
|
-
|
|
549
|
-
|
|
550
|
-
|
|
551
|
-
|
|
552
|
-
|
|
538
|
+
APPLY,
|
|
539
|
+
`optimization:tail-calls-${args.length}`
|
|
540
|
+
],
|
|
541
|
+
[WORD, newName]
|
|
542
|
+
]
|
|
543
|
+
: [
|
|
544
|
+
[APPLY, KEYWORDS.CALL_FUNCTION],
|
|
545
|
+
[WORD, newName],
|
|
546
|
+
[
|
|
547
|
+
[APPLY, KEYWORDS.ANONYMOUS_FUNCTION],
|
|
548
|
+
[WORD, '*fn*'],
|
|
553
549
|
[
|
|
554
|
-
[APPLY, KEYWORDS.
|
|
550
|
+
[APPLY, KEYWORDS.ANONYMOUS_FUNCTION],
|
|
551
|
+
...args,
|
|
555
552
|
[
|
|
556
|
-
[APPLY, KEYWORDS.
|
|
553
|
+
[APPLY, KEYWORDS.BLOCK],
|
|
557
554
|
[
|
|
558
|
-
[APPLY, KEYWORDS.
|
|
555
|
+
[APPLY, KEYWORDS.DEFINE_VARIABLE],
|
|
559
556
|
[WORD, '*res*'],
|
|
560
|
-
[
|
|
561
|
-
|
|
562
|
-
|
|
563
|
-
|
|
564
|
-
|
|
565
|
-
[WORD, '*res*'],
|
|
566
|
-
[ATOM, 0],
|
|
557
|
+
[
|
|
558
|
+
[APPLY, KEYWORDS.CREATE_ARRAY],
|
|
559
|
+
[[APPLY, '*fn*'], ...args]
|
|
560
|
+
]
|
|
561
|
+
],
|
|
567
562
|
[
|
|
568
|
-
[APPLY, KEYWORDS.
|
|
563
|
+
[APPLY, KEYWORDS.LOOP],
|
|
569
564
|
[
|
|
570
|
-
[APPLY, KEYWORDS.
|
|
565
|
+
[APPLY, KEYWORDS.IS_LAMBDA],
|
|
566
|
+
[
|
|
567
|
+
[APPLY, KEYWORDS.GET_ARRAY],
|
|
568
|
+
[WORD, '*res*'],
|
|
569
|
+
[ATOM, 0]
|
|
570
|
+
]
|
|
571
|
+
],
|
|
572
|
+
[
|
|
573
|
+
[APPLY, KEYWORDS.SET_ARRAY],
|
|
571
574
|
[WORD, '*res*'],
|
|
572
|
-
[ATOM, 0]
|
|
575
|
+
[ATOM, 0],
|
|
576
|
+
[
|
|
577
|
+
[APPLY, KEYWORDS.CALL_FUNCTION],
|
|
578
|
+
[
|
|
579
|
+
[APPLY, KEYWORDS.GET_ARRAY],
|
|
580
|
+
[WORD, '*res*'],
|
|
581
|
+
[ATOM, 0]
|
|
582
|
+
]
|
|
583
|
+
]
|
|
573
584
|
]
|
|
585
|
+
],
|
|
586
|
+
[
|
|
587
|
+
[APPLY, KEYWORDS.GET_ARRAY],
|
|
588
|
+
[WORD, '*res*'],
|
|
589
|
+
[ATOM, 0]
|
|
574
590
|
]
|
|
575
591
|
]
|
|
576
|
-
],
|
|
577
|
-
[
|
|
578
|
-
[APPLY, KEYWORDS.GET_ARRAY],
|
|
579
|
-
[WORD, '*res*'],
|
|
580
|
-
[ATOM, 0]
|
|
581
592
|
]
|
|
582
593
|
]
|
|
583
594
|
]
|
|
584
|
-
]
|
|
585
|
-
]
|
|
586
595
|
]
|
|
587
596
|
]
|
|
588
597
|
]
|
|
@@ -659,6 +668,7 @@ export const deSuggarAst = (ast, scope) => {
|
|
|
659
668
|
]
|
|
660
669
|
]
|
|
661
670
|
]
|
|
671
|
+
deSuggarAst(exp[exp.length - 1])
|
|
662
672
|
}
|
|
663
673
|
}
|
|
664
674
|
}
|
package/src/parser.js
CHANGED
|
@@ -47,13 +47,7 @@ export const LISP = {
|
|
|
47
47
|
source: (ast) => {
|
|
48
48
|
const dfs = (exp) => {
|
|
49
49
|
let out = ''
|
|
50
|
-
|
|
51
|
-
if (isLeaf(exp)) head = exp
|
|
52
|
-
else {
|
|
53
|
-
head = exp[0]
|
|
54
|
-
if (head == undefined) return []
|
|
55
|
-
tail = exp.slice(1)
|
|
56
|
-
}
|
|
50
|
+
const [head, ...tail] = isLeaf(exp) ? [exp] : exp
|
|
57
51
|
if (head == undefined) return (out += '()')
|
|
58
52
|
switch (head[TYPE]) {
|
|
59
53
|
case WORD:
|
|
@@ -115,13 +109,7 @@ export const AST = {
|
|
|
115
109
|
struct: (ast) => {
|
|
116
110
|
const dfs = (exp) => {
|
|
117
111
|
let out = ''
|
|
118
|
-
|
|
119
|
-
if (isLeaf(exp)) head = exp
|
|
120
|
-
else {
|
|
121
|
-
head = exp[0]
|
|
122
|
-
if (head == undefined) return []
|
|
123
|
-
tail = exp.slice(1)
|
|
124
|
-
}
|
|
112
|
+
const [head, ...tail] = isLeaf(exp) ? [exp] : exp
|
|
125
113
|
if (head == undefined)
|
|
126
114
|
return (out +=
|
|
127
115
|
'(Expression::Apply(vec![Expression::Word("array".to_string())]))')
|