Commit Graph

261 Commits

Author SHA1 Message Date
Jan (janneke) Nieuwenhuizen 7129959318
core: Split-out stack.c
* src/lib.c (exit_, frame_printer, make_frame_type, make_frame,
make_stack_type, make_stack, stack_length, stack_ref_): Move to ..
* src/posix.c (exit_): Here and to ..
* src/core.c: New file.
* build-aux/configure-lib.sh (mes_SOURCES): Add it.
* simple.make (LIBMES_SOURCES): Likewise.
* build-aux/snarf.sh: Likewise.
* include/mes/builtins.h: Update.
* src/builtins.c (mes_builtins): Update.
2020-12-29 18:11:04 +01:00
Jan (janneke) Nieuwenhuizen 74668e9138
core: Split-out core.c.
* src/mes.c (assoc_string, car, cdr, list, null_p, eq_p, values, acons,
length__, length, error, append2, append_reverse, reverse_x_, assq,
assoc): Move to ...
* src/core.c: New file.
* build-aux/configure-lib.sh (mes_SOURCES): Add it.
* simple.make (MES_SOURCES): Likewise.
* build-aux/snarf.sh: Likewise.
* include/mes/builtins.h: Update.
* src/builtins.c (mes_builtins): Update.
2020-12-29 18:11:04 +01:00
Jan (janneke) Nieuwenhuizen e21ee56574
core: Prepare for M2-Planet: if (foo).
Rewrite C-constructs not supported by M2-Planet

    if (foo)              -> if (foo != 0)

* src/posix.c: Rewrite C-constructs not supported by M2-Planet.
(current_input_port): Likewise.
* src/display.c (display_helper): : Likewise.
* src/eval-apply.c (expand_variable_): : Likewise.
(eval_apply): : Likewise.
* src/mes.c (open_boot): : Likewise.
* src/reader.c (reader_read_identifier_or_number): : Likewise.
* src/symbols.c (init_symbol): : Likewise.
2020-12-29 18:11:03 +01:00
Jan (janneke) Nieuwenhuizen 339b2cea40
core: Outline hashq_get_handle, hash_set_x_.
* src/hash.c (hashq_ref): Use hashq_get_handle.
(hashq_set_x_): Enable.
(hash_set_x): Use it.
2020-12-29 18:11:03 +01:00
Jan (janneke) Nieuwenhuizen af354fc449
core: Prepare for M2-Planet: continue.
Rewrite C-constructs not supported by M2-Planet

    continue              -> goto LABEL

* src/eval-apply.c (eval_apply): Add label: begin_expand_while.  Use it
instead of continue.
2020-12-29 18:11:02 +01:00
Jan (janneke) Nieuwenhuizen e42c2ede12
core: Prepare for M2-Planet: VALUE/TYPE indirections.
Rewrite C-constructs not supported by M2-Planet

    VALUE (CAR (foo))           -> SCM a = CAR (foo); VALUE (a)
    TYPE (CAR (foo))            -> SCM t = CAR (foo); TYPE (a)

* src/builtins.c (builtin_function): Use VALUE indirections.
(builtin_printer): Likewise.
* src/eval-apply.c (apply_builtin): Likewise.
(get_macro): Likewise.
(expand_variable_): Likewise.
(eval_apply): Likewise.
* src/hash.c (hashq_get_handle): Likewise.
(hashq_ref): Likewise.
(hash_ref): Likewise.
(hash_set_x): Likewise.
(hash_table_printer): Likewise.
* src/math.c (greater_p): Likewise.
(less_p): Likewise.
(is_p): Likewise.
(minus): Likewise.
(plus): Likewise.
(divide): Likewise.
(multiply): Likewise.
(logand): Likewise.
(logior): Likewise.
(logxor): Likewise.
* src/posix.c (current_input_port): Likewise.
(set_current_output_port): Likewise.
* src/reader.c (reader_read_list): Likewise.
(reader_read_character): Likewise.
(reader_read_string): Likewise.
* src/string.c (list_to_cstring): Likewise.
(read_string): Likewise.
2020-12-29 18:11:02 +01:00
Jan (janneke) Nieuwenhuizen 136ea63d27
core: Prepare for M2-Planet: M2_CELL_SIZE.
* src/gc.c (M2_CELL_SIZE): Hack for missing pointer arithmetic in
M2-Planet.
(gc_init, alloc, make_cell, gc_up_arena, gc_copy, gc_loop, gc_): Use it.
2020-12-29 18:11:02 +01:00
Jan (janneke) Nieuwenhuizen 4fbdb05004
core: Use unique assert_msg.
* src/mes.c (error): Use unique assert_msg.
2020-12-29 18:11:02 +01:00
Jan (janneke) Nieuwenhuizen 4e0d9e1ac7
core: read_string: Prepare for M2-Planet.
* src/string.c (read_string): Prepare for M2-Planet.
2020-12-29 18:11:02 +01:00
Jan (janneke) Nieuwenhuizen c28605aec5
core: string_equal_p: Prepare for M2-Planet.
* src/string.c (string_equal_p): Prepare for M2-Planet.
2020-12-29 18:11:02 +01:00
Jan (janneke) Nieuwenhuizen ccb27b9705
core: reader_read_block_comment: Prepare for M2-Planet.
* src/reader.c (reader_read_block_comment): Prepare for M2-Planet.
2020-12-29 18:11:02 +01:00
Jan (janneke) Nieuwenhuizen 70ed273469
core: reader_eat_whitespace: Prepare for M2-Planet.
* src/reader.c (reader_eat_whitespace): Prepare for M2-Planet.
2020-12-29 18:11:01 +01:00
Jan (janneke) Nieuwenhuizen 18c416f307
core: reader_read_sexp_: Prepare for M2-Planet.
* src/reader.c (reader_read_sexp_): Prepare for M2-Planet.
2020-12-29 18:11:01 +01:00
Jan (janneke) Nieuwenhuizen c187ccf197
core: reader_read_identifier_or_number: Prepare for M2-Planet.
* src/reader.c (reader_read_identifier_or_number): Prepare for M2-Planet.
2020-12-29 18:11:01 +01:00
Jan (janneke) Nieuwenhuizen 5e08960a42
core: open_output_file: Prepare for M2-Planet.
* src/posix.c (open_output_file): Prepare for M2-Planet.
2020-12-29 18:11:01 +01:00
Jan (janneke) Nieuwenhuizen c2464bf24a
core: current_input_port: Prepare for M2-Planet.
* src/posix.c (current_input_port): Prepare for M2-Planet.
2020-12-29 18:11:01 +01:00
Jan (janneke) Nieuwenhuizen 322e308ab1
core: write_byte: Prepare for M2-Planet.
* src/posix.c (write_byte): Prepare for M2-Planet.
2020-12-29 18:11:01 +01:00
Jan (janneke) Nieuwenhuizen 5e6b3a9662
core: read_char: Prepare for M2-Planet.
* src/posix.c (read_char): Prepare for M2-Planet.
2020-12-29 18:11:00 +01:00
Jan (janneke) Nieuwenhuizen 269959a816
core: last_pair: Prepare for M2-Planet.
* src/lib.c (last_pair): Prepare for M2-Planet.
2020-12-29 18:11:00 +01:00
Jan (janneke) Nieuwenhuizen 430667bd5e
core: memq: Prepare for M2-Planet.
* src/lib.c (memq): Prepare for M2-Planet.
2020-12-29 18:11:00 +01:00
Jan (janneke) Nieuwenhuizen fbd8bfe240
core: xassq: Prepare for M2-Planet.
* src/lib.c (xassq): Prepare for M2-Planet.
2020-12-29 18:11:00 +01:00
Jan (janneke) Nieuwenhuizen e8a01aba29
core: hash_cstring: Prepare for M2-Planet.
* src/hash.c (hash_cstring): Prepare for M2-Planet.
2020-12-29 18:11:00 +01:00
Jan (janneke) Nieuwenhuizen d07cc02f1f
core: eval_apply: Prepare for M2-Planet.
* src/eval-apply.c (eval_apply): Prepare for M2-Planet.
2020-12-29 18:11:00 +01:00
Jan (janneke) Nieuwenhuizen 691a992830
core: apply_builtin: Prepare for M2-Planet.
* src/eval-apply.c (apply_builtin): Prepare for M2-Planet.
2020-12-29 18:10:59 +01:00
Jan (janneke) Nieuwenhuizen f512623c08
core: formal_p: Prepare for M2-Planet.
* src/eval-apply.c (formal_p): Prepare for M2-Planet.
2020-12-29 18:10:59 +01:00
Jan (janneke) Nieuwenhuizen 1aa60b94e5
core: builtin_p: Prepare for M2-Planet.
* src/builtins.c (builtin_p): Prepare for M2-Planet.
2020-12-29 18:10:59 +01:00
Jan (janneke) Nieuwenhuizen 51a3cee8d1
core: assoc: Prepare for M2-Planet.
* src/mes.c (assoc): Prepare for M2-Planet.
2020-12-29 18:10:59 +01:00
Jan (janneke) Nieuwenhuizen 1c69559575
core: assq: Prepare for M2-Planet.
* src/mes.c (assq): Prepare for M2-Planet.
2020-12-29 18:10:59 +01:00
Jan (janneke) Nieuwenhuizen 182b568097
core: eq_p: Prepare for M2-Planet.
* src/mes.c (eq_p): Prepare for M2-Planet.
2020-12-29 18:10:59 +01:00
Jan (janneke) Nieuwenhuizen 766344d72e
core: assoc_string: Prepare for M2-Planet.
src/mes.c (assoc_string): Prepare for M2-Planet.
2020-12-29 18:10:59 +01:00
Jan (janneke) Nieuwenhuizen 9284df5ba3
core: Prepare for pointer cells.
* include/mes/cc.h: Prepare for pointer-based cells.
* include/mes/macros.h[POINTER_CELLS]: Alternative set of macros.
* include/mes/mes.h (struct scm)[POINTER_CELLS]: Alternative definition.
* src/gc.c (copy_cell, copy_news): New function.
* include/mes/mes.h: Declare them.
2020-12-29 18:10:58 +01:00
Jan (janneke) Nieuwenhuizen 55b41ba11c
core: gc: FRAME_SIZE.
* src/gc.c (FRAME_SIZE): New constant.
(gc_loop, gc_): Use it.
2020-12-29 18:10:58 +01:00
Jan (janneke) Nieuwenhuizen ec0380e702
core: gc: Fixes.
* src/gc.c (gc_init, gc_up_arena, gc_flip): Change to void function.
Fixes 0 returns.
(make_bytes): Use plain.
(make_string): Add 1 to length, for zero-terminated C strings.
(gc_copy): Use plain bytes length.
(gc_loop): Manually reformat.
2020-12-29 18:10:58 +01:00
Jan (janneke) Nieuwenhuizen 5abf71249c
core: Create symbols dynamically.
* include/mes/symbols.h: New file.
* include/mes/mes.hh: Include it.
* include/mes/constants.h: Remove symbol constants.
* src/symbols.c (init_symbols): Create symbols dynamically.
* build-aux/mes-snarf.scm (snarf-symbols): Update.
2020-12-29 18:10:58 +01:00
Jan (janneke) Nieuwenhuizen bd6d933099
core: Remove CBYTES, CSTRING, NCBYTES macros.
* src/gc.c (cell_bytes, news_bytes): New function.
* include/mes/macros.h (CBYTES, CSTRING, NCBYTES): Remove.  Update
users.
* include/mes/m2.h: Likewise.
2020-12-29 18:10:58 +01:00
Jan (janneke) Nieuwenhuizen 986b3973bb
core: Prepare for conversion to pointer cells.
* src/posix.c (execl_): Prepare for conversion to pointer cells.
2020-12-29 18:10:57 +01:00
Jan (janneke) Nieuwenhuizen 2ec586b773
core: Remove macros from cell creation: make_char .. make_string.
* src/gc.c (make_char, make_continuation, make_macro, make_number,
make_ref, make_string0, make_string_port): New function.
(make_string): Move from string.c.
* include/mes/macros.h (MAKE_CHAR, MAKE_CONTINUATION, MAKE_MACRO,
MAKE_NUMBER, MAKE_REF, MAKE_STRING0, MAKE_STRING_PORT): Remove macro.
Update users.
* include/mes/m2.h: Likewise.
2020-12-29 18:10:57 +01:00
Jan (janneke) Nieuwenhuizen 39cfcb11eb
core: Remove macros from cell creation: make_bytes.
* src/gc.c (bytes_cells, make_bytes): Move from string.c.
* include/mes/macros.h (MAKE_BYTES0, NAME_SYMBOL): Remove.
* include/mes/m2.h: Likewise.
2020-12-29 18:10:57 +01:00
Jan (janneke) Nieuwenhuizen d12c55581f
core: Remove core:make-cell.
* src/gc.c (alloc, make_cell, cons): Move from mes.c
* src/mes.c: (make_cell_): Remove.
* src/lib.c (char_to_integer, integer_to_char): New function.
* src/builtins.c (mes_builtins): Add them; remove make_cell_.
* mes/module/mes/type-0.mes (char->integer, integer->char): Remove.
2020-12-29 18:10:57 +01:00
Jan (janneke) Nieuwenhuizen 5df5c1987f
core: Refactor display. 2020-12-29 18:10:57 +01:00
Jan (janneke) Nieuwenhuizen b00d100910
core: Upcase register names.
* include/mes/mes.h (R0, R1, R2, R3, M0): Rename from lower case.
Update users.
2020-12-29 18:10:56 +01:00
Jan (janneke) Nieuwenhuizen b5c0369a3b
core: Split-out symbol.c.
* src/mes.c (init_symbol, mes_symbols): Move to ..
* src/symbol.c: New file.
* build-aux/configure-lib.sh (mes_SOURCES): Add it.
* simple.make: Likewise.
* include/mes/mes.h: Declare init_symbols.
2020-12-29 18:10:56 +01:00
Jan (janneke) Nieuwenhuizen 460ff0ebf5
core: Split-out display.c.
* src/lib.c (display_helper, display_, display_error_, display_port_,
write_, write_error_, write_port_, fdisplay_): Move to ..
* src/display.c: New file.
* build-aux/configure-lib.sh (mes_SOURCES): Add it.
* simple.make: Likewise.
2020-12-29 18:10:56 +01:00
Jan (janneke) Nieuwenhuizen f29a6e4fc8
core: eval-apply: Fix formal_p.
* src/eval-apply.c (formal_p): Return boolean.
2020-12-29 18:10:56 +01:00
Jan (janneke) Nieuwenhuizen 4f39d09c25
core: Split-out eval-apply.c.
* src/mes.c (check_formals, check_apply, pairlis, set_car_x, set_cdr_x,
set_env_x, call_lambda, make_closure_, make_variable_, macro_get_handle,
get_macro, macro_set_x, push_cc, add_formals, formal_p,
expand_variable_, expand_variable, apply_builtin, eval_apply, apply):
Move to ..
* src/eval-apply.c: New file.
* build-aux/configure-lib.sh (mes_SOURCES): Add it.
* simple.make: Likewise.
* src/eval.c (assert_defined): Likewise.
2020-12-29 18:10:56 +01:00
Jan (janneke) Nieuwenhuizen 3b4f1599f0
core: Use assert_msg.
* src/mes.c: Use assert_msg instead of assert.
* src/gc.c: Likewise.
* src/hash.c: Likewise.
* src/lib.c: Likewise.
* src/math.c: Likewise.
* src/module.c: Likewise.
* src/posix.c: Likewise.
* src/reader.c: Likewise.
* src/string.c: Likewise.
* src/struct.c: Likewise.
* src/vector.c: Likewise.
* simple.make (LIB_SOURCES): Add lib/mes/assert_msg.c.
2020-12-29 18:10:53 +01:00
Jan (janneke) Nieuwenhuizen bb0d074e1e
core: Prepare for M2-Planet: vector.c.
* src/vector.c: Rewrite C constructs not supported by M2-Planet.
2020-12-29 18:10:53 +01:00
Jan (janneke) Nieuwenhuizen abc564ad49
core: Prepare for M2-Planet: struct.c.
* src/struct.c: Rewrite C constructs not supported by M2-Planet.
2020-12-29 18:10:52 +01:00
Jan (janneke) Nieuwenhuizen 3ac200f6d3
core: Prepare for M2-Planet: string.c.
* src/string.c: Rewrite C constructs not supported by M2-Planet.
2020-12-29 18:10:52 +01:00
Jan (janneke) Nieuwenhuizen 5ffb27f555
core: Prepare for M2-Planet: reader.c.
* src/reader.c: Rewrite C constructs not supported by M2-Planet.
2020-12-29 18:10:52 +01:00