Commit Graph

335 Commits

Author SHA1 Message Date
Jan (janneke) Nieuwenhuizen 8d52b54958
core: Make primitive-load return properly.
* include/mes/symbols.h (cell_vm_primitive_load_return): New variable.
(SYMBOL_MAX): Update.
* mes/module/mes/boot-00.scm: Remove primitive-load chain-load hack.
* mes/module/mes/boot-01.scm: Likewise.
* mes/module/mes/boot-02.scm: Likewise.
* mes/module/mes/boot-03.scm: Likewise.
* src/eval-apply.c (eval_apply): Have primitive-load return properly.
2020-12-30 12:02:06 +01:00
Jan Nieuwenhuizen 5e4c085c63
remove debugging 2020-12-30 12:01:35 +01:00
Jan Nieuwenhuizen 9de6c42b21
debugging: C 2020-12-30 12:01:35 +01:00
Jan Nieuwenhuizen 472624f799
boot modules WIP 2020-12-30 12:01:32 +01:00
Jan Nieuwenhuizen 4f70be1c32
variable: display: WIP 2020-12-30 11:59:55 +01:00
Jan Nieuwenhuizen f7ffa7cfeb
flat->deep variable ref: it boots! 2020-12-30 11:59:55 +01:00
Jan Nieuwenhuizen 82dc8523f3
wip 2020-12-30 11:59:55 +01:00
Jan Nieuwenhuizen bd63d0e24c
wip 2020-12-30 11:59:55 +01:00
Jan Nieuwenhuizen 85bb22a22c
WIP 2020-12-30 11:59:55 +01:00
Jan Nieuwenhuizen 8edfdf255b
core: hashq_get_handle: FIX! 2020-12-30 11:59:55 +01:00
Jan Nieuwenhuizen 6ec8734bc2
WIP 2020-12-30 11:59:54 +01:00
Jan Nieuwenhuizen 447a258b48
WIP: module integration 2020-12-30 11:59:50 +01:00
Jan Nieuwenhuizen 8d06a90396
WIP: module 2020-12-30 11:59:35 +01:00
Jan Nieuwenhuizen 0fffcd0f91
module: raw import from guile 2020-12-30 11:59:35 +01:00
Jan Nieuwenhuizen c18ed2be4c
WIP: current-module 2020-12-30 11:59:35 +01:00
Jan Nieuwenhuizen 86744b24db
boot-module: primitive-load hack 2020-12-30 11:59:35 +01:00
Jan Nieuwenhuizen 543ff30bce
debugging 2020-12-30 11:59:35 +01:00
Jan Nieuwenhuizen ddf51ecba8
Revert "core: primitive-load: Force top level."
This reverts commit 5912cbefbb.
2020-12-30 11:59:34 +01:00
Jan Nieuwenhuizen 83fc300c76
core: primitive-load: Force top level.
* src/eval-apply.c (eval_apply): Force toplevel for primitive load.
2020-12-30 11:59:34 +01:00
Jan Nieuwenhuizen 40ea76e231
HACK: flat-variable. 2020-12-30 11:59:34 +01:00
Jan Nieuwenhuizen 674bed609b
display: <var> 2020-12-30 11:59:34 +01:00
Jan Nieuwenhuizen a455aa8f5b
core: Refactor lookup_variable.
* src/variable.c (lookup_variable, lookup_variable_, lookup_ref): Drop
lookup/env parameter.  Update users.
* src/builtins.c (mes_builtins): Update registration.
* include/mes/builtins.h: Update declarations.
* include/mes/mes.h: Likewise.
2020-12-30 11:59:32 +01:00
Jan Nieuwenhuizen 9091d70aad
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 11:59:16 +01:00
Jan Nieuwenhuizen 2c6f5dc3b9
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 11:59:16 +01:00
Jan Nieuwenhuizen f612d8eb45
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 11:59:14 +01:00
Jan Nieuwenhuizen 3b752d4ef6
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 11:58:45 +01:00
Jan Nieuwenhuizen a35bb1c9eb
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 11:58:45 +01:00
Jan Nieuwenhuizen ff97c556c0
WIP: variable 2020-12-30 11:58:45 +01:00
Jan Nieuwenhuizen 554d9525d0
Revert "display: <var>"
This reverts commit cb28b55f886dd8ebb50b2336d8dc440a953b2897.
2020-12-30 11:58:45 +01:00
Jan Nieuwenhuizen 03ef34bfd3
display: <var> 2020-12-30 11:58:45 +01:00
Jan Nieuwenhuizen f123b8b75b
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 11:58:44 +01:00
Jan Nieuwenhuizen 3dfbeb9c8d
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 11:58:44 +01:00
Jan Nieuwenhuizen 6d380c4cb5
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 11:58:44 +01:00
Jan Nieuwenhuizen d54c96afdf
Revert "mes: Add hash-for-each. WIP! split me: fixup hash/make-hash table hacks."
This reverts commit ef63ad04f8.
2020-12-30 11:58:44 +01:00
Jan Nieuwenhuizen 9b3934d332
mes: Add hash-for-each. WIP! split me: fixup hash/make-hash table hacks.
* mes/module/mes/scm.mes (hash-for-each): New function.
* mes/module/mes/type-0.mes (cell:type-name): Resurrect.
* src/hash.c (hash_): Hack: allow non-string keys.
(make_hash_table_type): Rename from make_hash_type.  WIP
(hash_table_p): New function.
(hash_clear_x): New function.
* src/module.c (make_module_type): Rewrite.
(module_p): x
(get_pre_modules_obarray): x
2020-12-30 11:58:44 +01:00
Jan Nieuwenhuizen 0d77236aa8
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 11:58:43 +01:00
Jan Nieuwenhuizen 6b5145ad53
core: variable: Guile interface compliancy. WIP
* 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 11:58:43 +01:00
Jan Nieuwenhuizen 022666a8ff
core: Use exceptions instead of asserts. WIP
* src/lib.c (assert_num, assert_struct): New function.
* src/struct.c (struct_ref_): Use them.
2020-12-30 11:58:43 +01:00
Jan Nieuwenhuizen fd83f6d05e
core: Add abort.
* build-aux/configure-lib.sh (libmes_SOURCES): Add abort.c.
* src/posix.c (abort_): New function: use it.
* include/mes/builtins.h: Declare it.
* kaem.run: Add it.
* simple.make (M2_SOURCES): Likewise.
2020-12-30 11:58:42 +01:00
Jan Nieuwenhuizen 3afd6044a9
mes: hash: Guile interface compliancy.
* 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 11:58:42 +01:00
Jan Nieuwenhuizen bd7353298e
hash-table: use erro iso assert... 2020-12-30 11:58:42 +01:00
Jan Nieuwenhuizen 23ba160476
core: WIP exceptions 2020-12-30 11:58:42 +01:00
Jan Nieuwenhuizen bd58f2a258
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 11:58:41 +01:00
Jan (janneke) Nieuwenhuizen 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
Jan (janneke) Nieuwenhuizen 0c697453b7
core: Prepare for M2-Planet 1.7.0.
* src/eval-apply.c (expand_variable_, apply_builtin): Declare variables
at toplevel.
* src/gc.c (gc_cellcpy, gc_loop, gc_dump_arena): Likewise.
* src/hash.c (hash_table_printer): Likewise.
* src/lib.c (equal2_p): Likewise.
* src/math.c (greater_p, less_p, is_p, minus, plus, divide, multiply,
logand, logior, logxor): Likewise.
* src/posix.c (current_input_port, execl_): Likewise.
* src/reader.c (reader_read_string): Likewise.
* src/stack.c (make_stack): Likewise.
* src/string.c (list_to_cstring, bytes_to_list, string_append):
Likewise.
* src/struct.c (make_struct): Likewise.
* src/vector.c (vector_to_list): Likewise.
2020-12-29 18:25:57 +01:00
Jan (janneke) Nieuwenhuizen 189b381d99
core: Use casting functions.
Silence all casting errors by using casting functions.

* src/cc.c (cast_charp_to_scmp, cast_charp_to_scmpp,
cast_voidp_to_charp, cast_scmp_to_long, cast_scmp_to_charp): New function.
* src/m2.c (cast_charp_to_scmp, cast_charp_to_scmpp,
cast_voidp_to_charp, cast_scmp_to_long, cast_scmp_to_charp): New function.
* include/mes/mes.h: Declare them.
(struct scm): Add car_value, cdr_value, function.
(g_continuations): Change to long.
* src/mes.c: Silence all casting errors by using casting functions.
2020-12-29 18:25:56 +01:00
Jan (janneke) Nieuwenhuizen b56c5fd3d5
core: Switch to pointer cells.
Run

   build-aux/pointer.sh

* include/mes/macros.h: Remove.
* src/*.c: Update.
* include/mes/*.h: Update.
* simple.make: Update.
* kaem.run: Update.
2020-12-29 18:11:12 +01:00
Jan (janneke) Nieuwenhuizen 1733b0186f
core: Drop support for number based cells.
This removes the POINTER_CELLS define and all its references.

* simple.make (CFLAGS): Remove -D POINTER_CELLS.
* include/mes/mes.h: Remove #define POINTER_CELLS.
* include/mes/cc.h: Remove !POINTER_CELLS branches.
* include/mes/macros.h: Likewise.
* src/gc.c: Likewise.
* src/symbol.c: Likewise.
* src/test/gc.c: Likewise.
2020-12-29 18:11:12 +01:00
Jan (janneke) Nieuwenhuizen 898190df5f
core: gc: Pointer cells: Drop cells->news->cells flipping.
* src/gc.c (gc_init): Undo doubling of initial memory.
(gc_init_news)[!GC_NOFLIP]: Remove.
(gc_)[!GC_NOFLIP]: Remove symbol relocation.
(gc)[!GC_NOFLIP]: Remove second gc.
2020-12-29 18:11:12 +01:00
Jan (janneke) Nieuwenhuizen 6720641493
core: gc: Abort upon broken heart failure.
* src/gc.c (gc_cellcpy, gc_loop): Abort upon broken heart failure.
2020-12-29 18:11:11 +01:00