]> Repositorios git - scryer-prolog.git/commit
projects / scryer-prolog.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ef56193 4077040)
Merge branch 'master' into library-use-case
authorNicolas Luck <[email protected]>
Wed, 13 Sep 2023 16:13:14 +0000 (18:13 +0200)
committerNicolas Luck <[email protected]>
Wed, 13 Sep 2023 16:13:14 +0000 (18:13 +0200)
commit136463c92edb89944e5611e3acd56c0c165181a9
treeeeedfe13ba2ebba923d6892fd400f77d65823c6ctree | snapshot
parentef56193c4479d4b414c1b0c2788f41d85289373ccommit | diff
parent4077040d03cf95499058069b86c56885bc428dc6commit | diff
Merge branch 'master' into library-use-case

# Conflicts:
# Cargo.toml
# src/atom_table.rs
# src/bin/scryer-prolog.rs
# src/http.rs
# src/machine/mock_wam.rs
# src/machine/mod.rs
# src/machine/system_calls.rs
12 files changed:
Cargo.lock diff1 | diff2 | blob | history
Cargo.toml diff1 | diff2 | blob | history
src/bin/scryer-prolog.rs diff1 | diff2 | blob | history
src/http.rs diff1 | diff2 | blob | history
src/lib.rs diff1 | diff2 | blob | history
src/loader.pl diff1 | diff2 | blob | history
src/machine/lib_machine.rs diff1 | | blob | history
src/machine/machine_state.rs diff1 | diff2 | blob | history
src/machine/mock_wam.rs diff1 | diff2 | blob | history
src/machine/mod.rs diff1 | diff2 | blob | history
src/machine/system_calls.rs diff1 | diff2 | blob | history
src/toplevel.pl diff1 | diff2 | blob | history
FORK: A modern Prolog implementation written mostly in Rust