fa17c5dc78
Revert "WIP psyntax.test"
...
This reverts commit 9cf899db95dd77d3d4477ddb3bc288307940a1e6.
2020-12-30 23:01:04 +01:00
db0eb02ed3
WIP psyntax.test
2020-12-30 23:01:04 +01:00
2075c4aeb7
mes: psyntax.pp: Prune.
...
* mes/module/mes/psyntax.pp (let*, do, quasiquote, include, unquote,
unquote-splicing, case): Remove.
2020-12-30 23:01:04 +01:00
b2aa041021
DRAFT tests: Switch to Guile modules.
...
* mes/module/mes/getopt-long.scm: Movo to ...
* mes/module/ice-9/getopt-long.scm: ...here.
* module/mes/optargs.scm,
mes/module/mes/optargs.mes: Remove.
* mes/module/ice-9/optargs.scm: Add functions used by macros to export
* module/mes/test.scm: Likewise.
* mes/module/mes/main.mes: Add module header.
* mes/module/mes/repl.mes: Likewise.
* mes/module/mes/syntax.mes: Likewise.
* mes/module/srfi/srfi-0.mes: Likewise.
* mes/module/srfi/srfi-1.mes: Likewise.
* mes/module/srfi/srfi-14.mes: Likewise.
* mes/module/srfi/srfi-43.mes: Likewise.
* mes/module/srfi/srfi-8.mes: Likewise.
* mes/module/srfi/srfi-9-struct.mes: Likewise.
* mes/module/srfi/srfi-9/gnu-vector.mes: Likewise.
* mes/module/srfi/srfi-9/gnu.mes: Likewise.
2020-12-30 22:53:09 +01:00
67ac2f92e1
DRAFT mes: Remove (mes match).
...
* mes/module/mes/match.scm: Move to ...
* mes/module/ice-9/match.scm: ...here. Add Guile module header.
* tests/match.test (tests): Update accordingly.
2020-12-30 21:22:55 +01:00
de705b697d
DRAFT mes: Remove (mes pmatch).
...
XXX TODO: Convert mescc to Guile module use.
* tests/pmatch.test: Use boot-5.mes.
Remove (mes pmatch).
* mes/module/mes/pmatch.mes: Remove.
2020-12-30 21:22:54 +01:00
8dd0d00304
.dir-locals: Add test macro indentation.
...
* .dir-locals.el (scheme-mode): Add indentation for pass-if,
pass-if-not, pass-if-eq, pass-if-equal, expect-fail, pass-if-timeout.
2020-12-30 21:22:54 +01:00
37a10ae7ef
tests: string-join: Be noisy.
...
* scaffold/boot/50-string-join.scm ("string-join\n"): Avoid exit 0
without output.
2020-12-30 21:22:54 +01:00
e1500c8eca
mes: Remove PEG.
...
PEG is not used and mostly broken.
* mes/module/mes/peg.mes,
mes/module/mes/peg/cache.scm,
mes/module/mes/peg/codegen.scm,
mes/module/mes/peg/simplify-tree.scm,
mes/module/mes/peg/string-peg.scm,
mes/module/mes/peg/using-parsers.scm,
tests/peg.test: Remove.
2020-12-30 21:22:54 +01:00
f4fd6b6084
core: Make primitive-load return properly.
...
* include/mes/symbols.h (cell_vm_primitive_load_return): New variable.
(SYMBOL_MAX): Update.
* src/eval-apply.c (eval_apply): Have primitive-load return properly.
2020-12-30 21:22:54 +01:00
e63d7c9517
build: check-boot.sh: Allow overriding of TESTS.
...
* build-aux/check-boot.sh (TESTS): Rename to...
(boot_tests): ...this.
(TESTS): Use boot_tests as fall-back.
(XFAIL_TESTS): Use empty as fall-back.
2020-12-30 21:22:54 +01:00
ff40b59175
test: Resurrect tests with module support.
...
* mes/module/mes/misc.mes: Remove.
* mes/module/srfi/srfi-26.mes: Remove.
* module/mes/misc.scm (logf, stderr, pk, pke): Remove.
(mes?, guile?, guile-1.8?, guile-2?): Move to...
* module/mes/mes-0.mes: ...new file.
* module/mes/mes-0.scm (%program, pmatch-car, pmatch-cdr): New
variables.
* tests/guile.test: Remove (mes misc) use.
* tests/pmatch.test: Use (mes guile).
* tests/data/bar.scm,
tests/data/foo.scm,: New files.
* tests/module.test: Use them to test basic Guile module support.
* build-aux/check-mes.sh (TESTS): Move it up, also fluids.test,
guile.test.
* mes/module/srfi/srfi-26.mes: Remove.
* mes/module/ice-9/rdelim.mes: New file.
* tests/scm.test ("builtin? car", "builtin? car", "builtin? cdr",
"builtin? cons", "builtin? cdr", "builtin? eq?", "builtin? eval"):
Remove.
2020-12-30 21:22:54 +01:00
f6ab5da988
mes: boot-6: Do not redefine exit as quit.
...
* mes/module/mes/boot-6.mes (exit): Remove redefinition.
2020-12-30 21:22:08 +01:00
8cff0f178f
boot-6: Define module-procedure.
...
* mes/module/mes/boot-6.mes (define-module): Also define
module-procedure.
2020-12-30 21:22:08 +01:00
3ab1d4b0a5
boot-6: Support Guile modules.
...
* src/hash.c (hashq_get_handle_): Remove default "dflt" parameter.
(hashq_ref_): Update user.
* src/module.c (module_handle, module_variable, current_module,
module_defines): New functions.
* src/variable.c (lookup_variable): Rename to ...
(lookup_handle): ...this. Implement module lookup.
(lookup_variable_): Rename to ...
(lookup_ref_); ...this.
(handle_set_x): New function.
* include/mes/builtins.h: Update prototypes.
* src/core.c (error): Update users.
* src/eval-apply.c (set_x, macro_get_handle, expand_variable_,
eval_apply): Likewise.
2020-12-30 21:22:07 +01:00
134080318e
mescc: Use (format (current-error-port) ...) instead of stderr.
...
* module/mescc/M1.scm: Use (format (current-error-port) ...) instead of
stderr.
* module/mescc/compile.scm: Likewise.
* module/mescc/mescc.scm: Likewise.
* module/mescc/preprocess.scm: Likewise.
2020-12-30 21:22:07 +01:00
6fd245047d
mes: simple-format: Use core display.
...
* mes/module/mes/simple-format.mes: Do not import (mes display).
2020-12-30 21:19:54 +01:00
775cd34ed0
core: Refactor lookup_variable.
...
* src/variable.c (lookup_variable, lookup_variable_, lookup_ref): Drop
lookup/env parameter. Update users.
* mes/module/mes/boot-0.scm (defined?): Update users.
* mes/module/mes/boot-00.scm (defined?): Likewise.
* mes/module/mes/boot-01.scm (defined?): Likewise.
* mes/module/mes/boot-02.scm (defined?): Likewise.
* mes/module/mes/boot-03.scm (defined?): Likewise.
* scaffold/boot/53-closure-display.scm (guile): Likewise.
* scaffold/boot/60-let-syntax-expanded.scm (defined?): Likewise.
* src/builtins.c (mes_builtins): Update registration.
* include/mes/builtins.h: Update declarations.
* include/mes/mes.h: Likewise.
* mes/module/mes/display.mes (display): Update variable display.
2020-12-30 21:19:54 +01:00
430a4dfc44
core: Remove set-env! as builtin.
...
* src/eval-apply.c (set_x): Rename from set_env_x. Drop environment
parameter.
* include/mes/mes.h: Declare it.
* include/mes/builtins.h (set_env_x): Remove declaration.
* src/builtins.c (mes_builtins): Remove registration.
2020-12-30 21:19:54 +01:00
da54a56256
core: Replace special cell_boot_module with initial-module builtin.
...
* src/module.c (initial_module): New builtin.
* include/mes/builtins.h: Declare it.
* src/builtins.c (mes_builtins): Register it.
* include/mes/symbols.h (cell_boot_module): Remove.
* src/symbol.c (init_symbols_): Update.
(init_symbols): Likewise.
* src/eval-apply.c (eval_apply): Likewise.
(expand_variable_): Likewise.
* tests/macro.test (make-fluid): Likewise.
* mes/module/mes/fluids.mes (make-fluid): Likewise.
2020-12-30 21:19:54 +01:00
9c7d9dda3b
core: Remove make_module_type, module_printer, module_variable, module_ref.
...
* src/module.c (make_module_type, module_printer, module_variable,
module_ref): Remove.
* include/mes/builtins.h: Remove declarations.
* src/builtins.c (mes_builtins): Remove registrations.
* src/eval-apply.c (assert_defined): Remove.
(set_env_x, eval_apply): Use lookup_variable and variable_ref.
* src/core.c (error): Likewise.
* mes/module/mes/boot-01.scm (defined?): Likewise.
* mes/module/mes/boot-02.scm (defined?): Likewise.
* mes/module/mes/boot-03.scm (defined?): Likewise.
* mes/module/mes/boot-0.scm (defined?): Likewise.
* scaffold/boot/53-closure-display.scm (guile): Likewise.
* scaffold/boot/60-let-syntax-expanded.scm (defined?): Likewise.
* src/mes.c (main): Use hash_table_printer for debugging.
2020-12-30 21:19:53 +01:00
61d85501b3
core: Add lookup_variable_, lookup_variable, lookup_ref.
...
* src/variable.c (lookup_variable, lookup_ref): New builtins, and
(lookup_variable_): New function.
* include/mes/builtins.h: Declare them.
* include/mes/mes.h: Declare it.
* src/builtins.c (mes_builtins): Register them.
2020-12-30 21:19:53 +01:00
20b34b8b51
core: Add hashq_set_handle_x.
...
* src/hash.c (hash_set_x_): Return handle instead of value. Update
callers and and use it in ...
(hashq_set_handle_x): New function.
* include/mes/builtins.h: Declare it.
2020-12-30 21:19:53 +01:00
c03415333d
mes: Add hash-for-each.
...
* mes/module/mes/scm.mes (hash-for-each): New function.
2020-12-30 21:19:53 +01:00
126aa3f5eb
core: Add hash_clear!.
...
* src/hash.c (hash_clear_x): New builtin.
* include/mes/builtins.h: Declare it.
* src/builtins.c (mes_builtins): Register it.
2020-12-30 21:19:53 +01:00
d481048c10
core: Add hash-table?.
...
* include/mes/mes.h (scm_hash_table_type): New type.
* src/hash.c (make_hash_table_type): Rename from make_hash_type, and
initialize it.
* src/symbol.c (init_symbols): Add it to environment.
2020-12-30 21:19:53 +01:00
e9e4e60b00
core: Allow non-string hash keys.
...
This merely allows adding non-string keys to a hash table and puts them
non-string keys in bucket 0. Efficiency is lost. TODO: calculate a
proper hash.
* src/hash.c (hash_): Allow non-string keys in bucket 0.
2020-12-30 21:19:52 +01:00
cc9f93cde0
mes: Resurrect cell:type-name.
...
* mes/module/mes/type-0.mes (cell:type-name): Resurrect.
2020-12-30 21:19:52 +01:00
49f4378b6e
mes: Add hash-fold.
...
* mes/module/mes/scm.mes (hash-fold): New function.
2020-12-30 21:19:52 +01:00
41ef524cfc
core: Add hash-map->list.
...
* src/hash.c (hash_map_to_list): New function.
* src/builtins.c (mes_builtins): Update.
* include/mes/builtins.h: Update.
2020-12-30 21:19:52 +01:00
34b4c3b1d2
core: variable: Guile interface compliance.
...
* src/lib.c (assert_variable):
* src/gc.c (make_variable): Move from
* src/eval-apply.c (make_variable): here; Remove.
* include/mes/builtins.h: Update.
* src/builtins.c (mes_builtins): Update.
* mes/module/mes/scm.mes (make-undefined-variable): New function.
* src/variable.c: New file.
* build-aux/configure-lib.sh (mes_SOURCES): Add it.
* kaem.run: Likewise.
* simple.make (LIBMES_SOURCES): Likewise.
* build-aux/snarf.sh (srcdest): Likewise.
2020-12-30 21:19:52 +01:00
97ce3d20e5
DRAFT core: Use exceptions instead of asserts.
...
XXX prototypes
* src/lib.c (assert_num, assert_struct, (assert_range): New functions.
* src/struct.c (struct_ref_): Use them.
* src/hash.c (make_hash_table): Use assert_number.
2020-12-30 21:19:52 +01:00
faced2b413
mes: Resurrect backtraces.
...
* mes/module/mes/catch.mes (%eh): Resurrect backtraces.
(display-frame): New function.
(display-backtrace): Use it.
2020-12-30 21:19:52 +01:00
aa222d34cb
core: Add abort.
...
* lib/stub/__raise.c: New file.
* kaem.run: Use it.
* src/posix.c (__raise)[SYSTEM_LIBC]: New macro.
(abort_): New function: possibly use it.
* include/mes/builtins.h: Declare it.
* src/builtins.c (mes_builtins): Register it.
2020-12-30 21:19:51 +01:00
33ed192ca4
mes: hash: Guile interface compatibility.
...
* mes/module/mes/scm.mes (hashq-get-handle, hashq-ref, hash-ref): New
function.
* src/hash.c (hashq_get_handle_): Rename from hashq_get_handle.
Update users.
(hashq_ref_): Likewise.
(hash_ref_): Likewise.
2020-12-30 15:38:12 +01:00
1a47fe45e4
mes: srfi-9: Guile interface compatibility.
...
* tests/srfi-9.test: Convert to bootstrap test, do not use
mes-use-module.
* mes/module/srfi/srfi-9-vector.mes: Resurrect.
2020-12-30 15:38:08 +01:00
dbd96dc473
mes: srfi-9: Guile interface compatibility.
...
* mes/module/srfi/srfi-9-struct.mes (record-type-name): Rename from
record-type. Update users.
(record-type-descriptor): New function.
* mes/module/srfi/srfi-9/gnu-struct.mes (set-field): Update.
* tests/srfi-9.test ("make-record-type", "record-constructor",
"record?", "record-predicate", "zero?", "zero-one", "zero-one-set!",
"record-type-descriptor", "record-type-name", "record-type-fields"):
New test.
2020-12-30 15:38:05 +01:00
6a65ae02bb
mes: srfi-9: Guile interface compatibility.
...
* mes/module/srfi/srfi-9-struct.mes (record-type-fields): Rename from
record-field-names. Update users.
* mes/module/srfi/srfi-9-vector.mes (record-type-fields): Likewise.
* mes/module/srfi/srfi-9/gnu-struct.mes (set-field): Update.
2020-12-30 15:38:02 +01:00
83736385de
core: make-hash-table: Fix optional argument.
...
* src/hash.c (make_hash_table): Fix optional argument.
* src/builtins.c (mes_builtins): Update arity.
2020-12-30 15:38:02 +01:00
5073bc73c2
mes: srfi-9: Guile interface compatibility.
...
* mes/module/srfi/srfi-9-struct.mes (record-accessor): Rename from
record-getter. Update users.
* mes/module/srfi/srfi-9-vector.mes (record-modifier): Rename from
record-setter. Update users.
* mes/module/srfi/srfi-9/gnu-struct.mes: Update.
2020-12-30 15:37:59 +01:00
698598850e
mes: srfi-9: Guile interface compatibility.
...
* mes/module/srfi/srfi-9-struct.mes (record-constructor): Remove name
argument, make field-names optional. Update users.
* mes/module/srfi/srfi-9-vector.mes: Likewise.
* mes/module/srfi/srfi-9/gnu-struct.mes: Update.
2020-12-30 15:37:40 +01:00
1f56ef6c33
core: Avoid Floating point exception dividing negative numbers.
...
This fixes
kaem --verbose --strict
bin/mes-m2 -c '(display (/ -1 1))'
* src/math.c (divide): Use signed division.
2020-12-29 22:41:24 +01:00
29b574271e
DRAFT doc: Update.
2020-12-29 19:51:15 +01:00
f046b2df44
Mes C Library: m2/execve.c: Remove specialization.
...
* lib/linux/execve.c (execve): Cater for M2-Planet.
* lib/m2/execve.c: Remove.
* kaem.run: Update accordingly.
* simple.make (M2_SOURCES): Likewise.
2020-12-29 19:51:15 +01:00
cef2b41b47
Mes C Library: m2/getcwd.c: Remove specialization.
...
* lib/posix/getcwd.c (getcwd): Cater for M2-Planet.
* lib/m2/getcwd.c: Remove.
* kaem.run: Update accordingly.
* simple.make (M2_SOURCES): Likewise.
2020-12-29 19:18:03 +01:00
d4a5dc339b
Mes C Library: m2/ioctl.c: Remove specialization.
...
* lib/stub/ioctl.c (ioctl3): Move to...
* lib/stub/ioctl3.c: ...new file.
* lib/m2/ioctl3.c: Move to...
* lib/linux/ioctl3.c: ...here.
* include/mes/lib.h (ioctl3): Declare it.
* lib/m2/isatty.c (isatty): Use it.
* build-aux/configure-lib.sh (libc_SOURCES): Include it; move
lib/linux/ioctl.c to ...
(libc_gnu_SOURCES): ... here.
* kaem.run: Update accordingly.
* simple.make (M2_SOURCES): Likewise.
* simple.sh (compiler): Likewise.
2020-12-29 19:15:38 +01:00
ec0123f855
Mes C Library: m2/waitpid.c: Remove specialization.
...
* lib/linux/waitpid.c: Cater for M2-Planet.
* lib/m2/waitpid.c: Remove.
* kaem.run: Update accordingly.
* simple.make (M2_SOURCES, M2_TODO): Likewise.
2020-12-29 19:15:33 +01:00
309e3800c0
Mes C Library: m2/ntoab.c: Remove specialization.
...
* lib/mes/ntoab.c (__mesabi_uldiv)[__M2_PLANET__ || !(__MESC__ &&
__arm__)]: New function.
* lib/mes/ntoab.c (ntoab): Use it to cater for M2-Planet.
* lib/m2/ntoab.c: Remove.
* kaem.run: Update accordingly.
* simple.make (M2_SOURCES, (M2_TODO): Likewise.
2020-12-29 19:15:23 +01:00
aa1a6cd9ca
build: Resurrect simple.sh.
...
* simple.sh: Do not attempt to build multiple C files with mescc.
Update for new and split C files.
2020-12-29 18:25:58 +01:00
c2a0b5b9d3
guix: m2-planet: Update to 1.7.0.
...
* guix/git/mes.scm (m2-planet)[source]: Update to 1.7.0.
[arguments]: Add CC to make-flags. Update sha256sum patch.
2020-12-29 18:25:58 +01:00
Jan (janneke) Nieuwenhuizen