fez-lisp 1.2.35 → 1.2.37
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/README.md +1 -1
- package/package.json +1 -1
- package/src/compiler.js +2 -3
- package/src/interpreter.js +1 -52
- package/src/keywords.js +0 -1
package/README.md
CHANGED
@@ -246,5 +246,5 @@ console.log(fez(tree(`(+ (|> 1 (+ 2) (* 3) (- 1)) (- (* (+ 1 2) 3) 1))`)))
|
|
246
246
|
(/ ...) (+ ...) (* ...) (- ...) (= ...) (< ...) (> ...) (>= ...) (<= ...) (& ...) (~ ...) (| ...) (^ ...) (<< ...) (>> ...) (>>> ...)
|
247
247
|
(mod ...) (let ...) (if ...) (not ...) (and ...) (or ...) (cond ...) (atom? ...) (lambda? ...)
|
248
248
|
(length ...) (do ...) (array ...) (set! ...) (get ...) (lambda ...) (apply ...)
|
249
|
-
(throw ...)
|
249
|
+
(throw ...)
|
250
250
|
```
|
package/package.json
CHANGED
package/src/compiler.js
CHANGED
@@ -130,7 +130,8 @@ const semiColumnEdgeCases = new Set([
|
|
130
130
|
';?',
|
131
131
|
',,',
|
132
132
|
';;',
|
133
|
-
';]'
|
133
|
+
';]',
|
134
|
+
';^'
|
134
135
|
])
|
135
136
|
const parse = (Arguments, Drill) => Arguments.map((x) => compile(x, Drill))
|
136
137
|
const parseArgs = (Arguments, Drill, separator = ',') =>
|
@@ -142,8 +143,6 @@ const compile = (tree, Drill) => {
|
|
142
143
|
const token = first[VALUE]
|
143
144
|
if (first[TYPE] === APPLY) {
|
144
145
|
switch (token) {
|
145
|
-
case KEYWORDS.ASSERT:
|
146
|
-
return '0'
|
147
146
|
case KEYWORDS.BLOCK: {
|
148
147
|
if (Arguments.length > 1) {
|
149
148
|
return `(${Arguments.map((x) =>
|
package/src/interpreter.js
CHANGED
@@ -1,13 +1,4 @@
|
|
1
|
-
import {
|
2
|
-
TYPE,
|
3
|
-
VALUE,
|
4
|
-
WORD,
|
5
|
-
KEYWORDS,
|
6
|
-
FALSE,
|
7
|
-
TRUE,
|
8
|
-
TYPES,
|
9
|
-
APPLY
|
10
|
-
} from './keywords.js'
|
1
|
+
import { TYPE, VALUE, WORD, KEYWORDS, FALSE, TRUE, TYPES } from './keywords.js'
|
11
2
|
import { evaluate } from './evaluator.js'
|
12
3
|
import { isForbiddenVariableName, stringifyArgs } from './utils.js'
|
13
4
|
const keywords = {
|
@@ -827,48 +818,6 @@ const keywords = {
|
|
827
818
|
}) but got (${expression}) (${KEYWORDS.THROW} ${stringifyArgs(args)})`
|
828
819
|
)
|
829
820
|
throw new Error(expression.map((x) => String.fromCharCode(x)).join(''))
|
830
|
-
},
|
831
|
-
|
832
|
-
[KEYWORDS.ASSERT]: (args, env) => {
|
833
|
-
if (args.length < 2)
|
834
|
-
throw new RangeError(
|
835
|
-
`Invalid number of arguments for (${
|
836
|
-
KEYWORDS.ASSERT
|
837
|
-
}), expected (> 2 required) but got ${args.length} (${
|
838
|
-
KEYWORDS.ASSERT
|
839
|
-
} ${stringifyArgs(args)})`
|
840
|
-
)
|
841
|
-
if (args.length % 2 !== 0)
|
842
|
-
throw new RangeError(
|
843
|
-
`Invalid number of arguments for (${
|
844
|
-
KEYWORDS.ASSERT
|
845
|
-
}), expected even number of arguments but got ${args.length} (${
|
846
|
-
KEYWORDS.ASSERT
|
847
|
-
} ${stringifyArgs(args)})`
|
848
|
-
)
|
849
|
-
for (let i = 0; i < args.length; i += 2) {
|
850
|
-
const condition = evaluate(args[i], env)
|
851
|
-
if (condition !== FALSE && condition !== TRUE)
|
852
|
-
throw new TypeError(
|
853
|
-
`Condition of (${
|
854
|
-
KEYWORDS.ASSERT
|
855
|
-
}) must be ${TRUE} or ${FALSE} but got (${
|
856
|
-
KEYWORDS.ASSERT
|
857
|
-
} ${stringifyArgs(args)})`
|
858
|
-
)
|
859
|
-
if (condition) {
|
860
|
-
const error = args[i + 1]
|
861
|
-
if (error[0][TYPE] === APPLY && error[0][VALUE] === KEYWORDS.THROW)
|
862
|
-
return evaluate(error, env)
|
863
|
-
else
|
864
|
-
throw new TypeError(
|
865
|
-
`Concequence of (${KEYWORDS.ASSERT}) must be (${
|
866
|
-
KEYWORDS.THROW
|
867
|
-
}) but got (${KEYWORDS.ASSERT} ${stringifyArgs(args)})`
|
868
|
-
)
|
869
|
-
}
|
870
|
-
}
|
871
|
-
return 0
|
872
821
|
}
|
873
822
|
}
|
874
823
|
|