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
5e4c085c63
remove debugging
2020-12-30 12:01:35 +01:00
9de6c42b21
debugging: C
2020-12-30 12:01:35 +01:00
472624f799
boot modules WIP
2020-12-30 12:01:32 +01:00
f7ffa7cfeb
flat->deep variable ref: it boots!
2020-12-30 11:59:55 +01:00
8edfdf255b
core: hashq_get_handle: FIX!
2020-12-30 11:59:55 +01:00
447a258b48
WIP: module integration
2020-12-30 11:59:50 +01:00
86744b24db
boot-module: primitive-load hack
2020-12-30 11:59:35 +01:00
543ff30bce
debugging
2020-12-30 11:59:35 +01:00
ddf51ecba8
Revert "core: primitive-load: Force top level."
...
This reverts commit 5912cbefbb
2020-12-30 11:59:34 +01:00
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
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
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
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
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
ff97c556c0
WIP: variable
2020-12-30 11:58:45 +01:00
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
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
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
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
4e1de0de94
core: eval-apply: Prepare for M2-Planet.
...
* src/eval-apply.c (apply_builtin): Split M2-Planet specific and CC
specifi part off to ..
* src/cc.c: New file, and
* build-aux/configure-lib.sh (mes_SOURCES): Add it.
* src/m2.c: New file.
* simple.make (MES_SOURCES, M2_SOURCES): Likewise.
2020-12-29 18:11:10 +01:00
b7bb734d89
core: Remove cell_call_with_current_continuation special.
...
* include/mes/symbols.h (cell_call_with_current_continuation): Remove.
* src/eval-apply.c (eval_apply): Update to use
cell_symbol_call_with_current_continuation.
* src/symbol.c (init_symbols_): Remove inititialization.
2020-12-29 18:11:09 +01:00
4affaafd17
core: Remove cell_begin special.
...
* include/mes/symbols.h (cell_begin): Remove.
* src/eval-apply.c (eval_apply): Update to use cell_symbol_begin.
* src/symbol.c (init_symbols_): Remove initialization.
2020-12-29 18:11:09 +01:00
d89836e9aa
core: make-vector: Move to core.
...
* src/vector.c (make_vector_): Rename from make_vector__. Add
parameter. Fix double allocation.
(make_vector): Rename from make_vector_. Use arity n. Update users.
2020-12-29 18:11:08 +01:00
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
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
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
4fbdb05004
core: Use unique assert_msg.
...
* src/mes.c (error): Use unique assert_msg.
2020-12-29 18:11:02 +01:00
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
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
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
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
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
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
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
f29a6e4fc8
core: eval-apply: Fix formal_p.
...
* src/eval-apply.c (formal_p): Return boolean.
2020-12-29 18:10:56 +01:00
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