Commit Graph

2255 Commits

Author SHA1 Message Date
Jan (janneke) Nieuwenhuizen fbd2408260
srfi-13 2021-05-16 13:20:32 +02:00
Jan (janneke) Nieuwenhuizen f083b8f133
(mes guile) 2021-05-16 13:18:15 +02:00
Jan (janneke) Nieuwenhuizen 2f30c97952
srfi-14 2021-05-16 13:17:16 +02:00
Jan (janneke) Nieuwenhuizen 4be9c3d96d
srfi-13 2021-05-16 13:15:08 +02:00
Jan (janneke) Nieuwenhuizen 05424975ee
DRAFT mes: (mes guile): Switch to Guile modules.
* mes/module/mes/boot-0.scm (mes): Use (mes display), (mes simple-format).
* mes/module/mes/boot-5.mes (mes): Likewise.
* mes/module/mes/guile.mes: Do not use (mes catch), (mes
posix), (srfi-srfi-16), (mes display), (mes simple-format).
(with-input-from-string,
with-input-from-file, with-output-to-file, with-error-to-file,
with-output-to-port, with-error-to-file, open-input-file, dirname,
file-exists?, set-port-encoding!): Move to...
* mes/module/mes/guile.scm: ...this new file.
2021-05-16 13:05:20 +02:00
Jan (janneke) Nieuwenhuizen bc1a687703
sqaush! rdelim
* mes/module/mes/guile.mes (read-line): Move to ...
* mes/module/ice-9/rdelim.scm (read-line): ...here.
2021-05-16 12:58:49 +02:00
Jan (janneke) Nieuwenhuizen 842d9b7978
SRFI-13 2021-05-16 12:43:03 +02:00
Jan (janneke) Nieuwenhuizen 5d26964f14
srfi-13 2021-05-16 12:37:21 +02:00
Jan (janneke) Nieuwenhuizen 8e944b53cb
DRAFT mes: repl: Switch to Guile modules.
* mes/module/mes/repl.mes: Rename to...
* mes/module/mes/repl.scm: ...this.
2021-05-16 12:36:01 +02:00
Jan (janneke) Nieuwenhuizen a965e8983e
DRAFT mes: srfi-14: Switch to Guile modules.
* mes/module/srfi/srfi-14.mes: Rename to...
* mes/module/srfi/srfi-14.scm: ...this.
2021-05-16 12:34:59 +02:00
Jan (janneke) Nieuwenhuizen 077963441f
DRAFT mes: srfi-13: Switch to Guile modules.
* mes/module/srfi/srfi-13.mes: Rename to...
* mes/module/srfi/srfi-13.scm: ...this.  Add module header.
* mes/module/mes/boot-5.mes: Do not use srfi-13.
2021-05-16 12:33:03 +02:00
Jan (janneke) Nieuwenhuizen 4c12900281
TEST getopt-long.test ?? 2021-05-16 12:28:29 +02:00
Jan (janneke) Nieuwenhuizen 7664d5f989
DRAFT mes: srfi-9: Switch to Guile modules.
* mes/module/srfi/srfi-9-struct.mes: Rename to...
* mes/module/srfi/srfi-9-struct.scm: ...this.
* mes/module/srfi/srfi-9-vector.mes: Rename to...
* mes/module/srfi/srfi-9-vector.scm: ...this.
* mes/module/srfi/srfi-9.mes: Rename to...
* mes/module/srfi/srfi-9.scm: ...this.
* mes/module/mes/boot-0.scm: Update accordingly.
* tests/srfi-9.test: Update accordingly.
2021-05-16 12:25:41 +02:00
Jan (janneke) Nieuwenhuizen 1a1e545104
DRAFT mes: srfi-43.scm: Switch to Guile modules.
* mes/module/srfi/srfi-43.mes: Rename to...
* mes/module/srfi/srfi-43.scm: ...this.
2021-05-16 12:23:50 +02:00
Jan (janneke) Nieuwenhuizen 72895e5de2
DRAFT mes: rdelim.scm: Switch to Guile modules.
* mes/module/ice-9/rdelim.mes: Rename to...
* mes/module/ice-9/rdelim.scm: ...this.
2021-05-16 12:15:53 +02:00
Jan (janneke) Nieuwenhuizen 433ab6c388
DRAFT mes: mes-0: Switch to Guile module.
* module/mes/mes-0.mes: Rename to...
* mes/module/mes/mes-0.scm: ...this.
2021-05-16 12:14:52 +02:00
Jan (janneke) Nieuwenhuizen 6b6bd70e23
DRAFT mes: srfi-1: Switch to Guile modules.
* mes/module/srfi/srfi-1.scm: Rename to...
* mes/module/srfi/srfi-1-guile.scm: ...this.
* AUTHORS: Update accordingly.
* mes/module/srfi/srfi-1.mes: Rename to...
* mes/module/srfi/srfi-1.scm: ..this.
* mes/module/mes/scm.mes (member): Rename to...
(mes:member): ...this.
(member): New define.
(iota): Rename to...
(mes:iota): ...this.
(iota): New define.
* mes/module/mes/boot-5.mes (srfi): Do not use srfi-1.
2021-05-16 12:14:14 +02:00
Jan (janneke) Nieuwenhuizen 30a280b3e9
squash! DRAFT tests: Switch to Guile modules. 2021-05-16 11:44:39 +02:00
Jan (janneke) Nieuwenhuizen c29fe38f9d
squash! mes-boot6: Bump arena.
* src/gc.c (gc_init)[!M2_PLANET]: Double ARENA_SIZE for boot-6.mes.
2021-05-16 09:52:09 +02:00
Jan (janneke) Nieuwenhuizen 20abfea632
DRAFT mescc: Switch to Guile modules.
* mes/module/mescc/M1.mes,
mes/module/mescc/armv4/as.mes,
mes/module/mescc/armv4/info.mes,
mes/module/mescc/as.mes,
mes/module/mescc/bytevectors.mes,
mes/module/mescc/compile.mes,
mes/module/mescc/i386/as.mes,
mes/module/mescc/i386/info.mes,
mes/module/mescc/info.mes,
mes/module/mescc/mescc.mes,
mes/module/mescc/preprocess.mes,
mes/module/mescc/x86_64/as.mes,
mes/module/mescc/x86_64/info.mes: Remove.
2021-05-16 09:21:39 +02:00
Jan (janneke) Nieuwenhuizen 3360eb1ea6
mes: pretty-print: Switch to Guile modules.
* mes/module/mes/pretty-print.mes: Move to...
* mes/module/ice-9/pretty-print.scm: ...here.
2021-05-16 09:21:39 +02:00
Jan (janneke) Nieuwenhuizen c0a28c79f8
mes: Add set-port-encoding!
* module/mescc.scm (set-port-encoding!): Move to...
* mes/module/mes/guile.mes: ...here.
2021-05-16 09:21:39 +02:00
Jan (janneke) Nieuwenhuizen 0c08423fde
Revert "WIP psyntax.test"
This reverts commit 2e950e304f.
2021-05-16 09:21:39 +02:00
Jan (janneke) Nieuwenhuizen 296141c700
DRAFT core: Switch to Guile modules.
TODO XXX:
  * tests/psyntax.test fails
  * mescc

* src/mes.c (open_boot): Default to boot-5.mes.
(try_open_boot): Update messages.
2021-05-16 09:21:39 +02:00
Jan (janneke) Nieuwenhuizen 601acb876c
WIP psyntax.test 2021-05-16 09:21:39 +02:00
Jan (janneke) Nieuwenhuizen 35996be527
mes: psyntax.pp: Prune.
* mes/module/mes/psyntax.pp (let*, do, quasiquote, include, unquote,
unquote-splicing, case): Remove.
2021-05-16 09:21:38 +02:00
Jan (janneke) Nieuwenhuizen ea19c73185
DRAFT tests: Switch to Guile modules.
* boot-5, boot-6, boot-0

* 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/guile.mes: Add module header.
* mes/module/mes/main.mes: Likewise.
* 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.
2021-05-16 09:21:37 +02:00
Jan (janneke) Nieuwenhuizen 21e1a3d424
DRAFT mes: match: Switch to Guile module.
* mes/module/mes/match.scm: Move to ...
* mes/module/ice-9/match.scm: ...here.  Add Guile module header.
* tests/match.test (tests): Update accordingly.
2021-05-16 09:21:18 +02:00
Jan (janneke) Nieuwenhuizen 38d896c067
DRAFT mes: pmatch: Switch to Guile module.
XXX TODO: Convert mescc to Guile module use.

* tests/pmatch.test: Use boot-5.mes.
Remove (mes pmatch).
* mes/module/mes/pmatch.mes: Remove.
2021-05-16 09:21:18 +02:00
Jan (janneke) Nieuwenhuizen bd0378048c
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.
2021-05-16 09:21:16 +02:00
Jan (janneke) Nieuwenhuizen 6b6fd8e668
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.
2021-05-16 09:20:46 +02:00
Jan (janneke) Nieuwenhuizen b7442cba59
DRAFT 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.
2021-05-16 09:20:46 +02:00
Jan (janneke) Nieuwenhuizen c2b6b1fbb9
mes: boot-6: Do not redefine exit as quit.
* mes/module/mes/boot-6.mes (exit): Remove redefinition.
2021-05-16 09:20:46 +02:00
Jan (janneke) Nieuwenhuizen e1ed6ebdf4
DRAFT boot-6: Define module-procedure.
XXX Does this still work with primitive-load fix?

* mes/module/mes/boot-6.mes (define-module): Also define
module-procedure.
2021-05-16 09:20:46 +02:00
Jan (janneke) Nieuwenhuizen f097242690
DRAFT boot-6: Support Guile modules.
XXX TODO:
 * cleanup boot-6.mes
 * resurrect m2-planet build: kaem --verbose --strict

* 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 callers.
* src/eval-apply.c (set_x, macro_get_handle, expand_variable_,
eval_apply): Likewise.
* 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: Likewise.
* scaffold/boot/60-let-syntax-expanded.scm: Likewise.
* mes/module/mes/boot-5.mes,
mes/module/mes/boot-6.mes: New files.
2021-05-16 09:20:46 +02:00
Jan (janneke) Nieuwenhuizen b7ed3e5525
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.
2021-05-16 09:20:46 +02:00
Jan (janneke) Nieuwenhuizen f25f171a84
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.
2021-05-16 09:20:45 +02:00
Jan (janneke) Nieuwenhuizen 3c4fc6d380
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.
2021-05-16 09:20:39 +02:00
Jan (janneke) Nieuwenhuizen c8809ebe98
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.
2021-05-16 09:19:51 +02:00
Jan (janneke) Nieuwenhuizen c8057604b9
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.
2021-05-16 09:19:15 +02:00
Jan (janneke) Nieuwenhuizen ed52ed1b95
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.
2021-05-16 09:19:15 +02:00
Jan (janneke) Nieuwenhuizen 83fa900238
mes: Add hash-for-each.
* mes/module/mes/scm.mes (hash-for-each): New function.
2021-05-16 09:19:14 +02:00
Jan (janneke) Nieuwenhuizen e724e82f7b
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.
2021-05-16 09:19:14 +02:00
Jan (janneke) Nieuwenhuizen 48299fdb74
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.
2021-05-16 09:19:14 +02:00
Jan (janneke) Nieuwenhuizen 12db5d51dd
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.
2021-05-16 09:19:14 +02:00
Jan (janneke) Nieuwenhuizen e08cc2dadb
mes: Resurrect cell:type-name.
* mes/module/mes/type-0.mes (cell:type-name): Resurrect.
2021-05-16 09:19:14 +02:00
Jan (janneke) Nieuwenhuizen 8da15f8d64
mes: Add hash-fold.
* mes/module/mes/scm.mes (hash-fold): New function.
2021-05-16 09:19:14 +02:00
Jan (janneke) Nieuwenhuizen 4bcd401f8d
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.
2021-05-16 09:19:13 +02:00
Jan (janneke) Nieuwenhuizen 998dc01ef2
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.
2021-05-16 09:19:13 +02:00
Jan (janneke) Nieuwenhuizen 7e4ddab776
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.
2021-05-16 09:19:13 +02:00