remove vestigial prolog/ directory (#444)

mthom · Jun 13, 2020 · 33325f1 · 33325f1
1 parent 5ffb459
commit 33325f1
Show file tree

Hide file tree

Showing 89 changed files with 344 additions and 315 deletions.
diff --git a/build.rs b/build.rs
@@ -1,6 +1,6 @@
 extern crate indexmap;
 
-use indexmap::IndexSet;
+use crate::indexmap::IndexSet;
 
 use std::env;
 use std::fs::{File, copy, read_dir};
@@ -15,7 +15,7 @@ fn main()
     let mut libraries = File::create(&dest_path).unwrap();
     let mut library_index = IndexSet::new();
 
-    let paths = read_dir("./src/prolog/lib").unwrap();
+    let paths = read_dir("./src/lib").unwrap();
 
     for item in paths {
         let item = item.unwrap().path();

diff --git a/src/prolog/allocator.rs → src/allocator.rs b/src/prolog/allocator.rs → src/allocator.rs
@@ -1,9 +1,9 @@
-use prolog_parser::ast::*;
+use crate::prolog_parser::ast::*;
 
-use crate::prolog::fixtures::*;
-use crate::prolog::forms::*;
-use crate::prolog::machine::machine_indices::*;
-use crate::prolog::targets::*;
+use crate::fixtures::*;
+use crate::forms::*;
+use crate::machine::machine_indices::*;
+use crate::targets::*;
 
 use std::cell::Cell;
 use std::rc::Rc;

diff --git a/src/prolog/arithmetic.rs → src/arithmetic.rs b/src/prolog/arithmetic.rs → src/arithmetic.rs
@@ -1,18 +1,18 @@
-use prolog_parser::ast::*;
+use crate::prolog_parser::ast::*;
 
-use crate::prolog::clause_types::*;
-use crate::prolog::fixtures::*;
-use crate::prolog::forms::*;
-use crate::prolog::instructions::*;
-use crate::prolog::iterators::*;
+use crate::clause_types::*;
+use crate::fixtures::*;
+use crate::forms::*;
+use crate::instructions::*;
+use crate::iterators::*;
 
-use crate::prolog::machine::heap::*;
-use crate::prolog::machine::machine_errors::*;
-use crate::prolog::machine::machine_indices::*;
+use crate::machine::heap::*;
+use crate::machine::machine_errors::*;
+use crate::machine::machine_indices::*;
 
-use crate::prolog::ordered_float::*;
-use crate::prolog::rug::ops::PowAssign;
-use crate::prolog::rug::{Assign, Integer, Rational};
+use crate::ordered_float::*;
+use crate::rug::ops::PowAssign;
+use crate::rug::{Assign, Integer, Rational};
 
 use std::cell::Cell;
 use std::cmp::{max, min, Ordering};

diff --git a/src/prolog/clause_types.rs → src/clause_types.rs b/src/prolog/clause_types.rs → src/clause_types.rs
@@ -1,10 +1,10 @@
-use prolog_parser::ast::*;
+use crate::prolog_parser::ast::*;
 
-use crate::prolog::forms::Number;
-use crate::prolog::machine::machine_indices::*;
-use crate::prolog::rug::rand::RandState;
+use crate::forms::Number;
+use crate::machine::machine_indices::*;
+use crate::rug::rand::RandState;
 
-use ref_thread_local::RefThreadLocal;
+use crate::ref_thread_local::RefThreadLocal;
 
 use std::collections::BTreeMap;
 

diff --git a/src/prolog/codegen.rs → src/codegen.rs b/src/prolog/codegen.rs → src/codegen.rs
@@ -1,17 +1,17 @@
-use prolog_parser::ast::*;
-
-use crate::prolog::allocator::*;
-use crate::prolog::arithmetic::*;
-use crate::prolog::clause_types::*;
-use crate::prolog::fixtures::*;
-use crate::prolog::forms::*;
-use crate::prolog::indexing::*;
-use crate::prolog::instructions::*;
-use crate::prolog::iterators::*;
-use crate::prolog::machine::machine_indices::*;
-use crate::prolog::targets::*;
-
-use indexmap::{IndexMap, IndexSet};
+use crate::prolog_parser::ast::*;
+
+use crate::allocator::*;
+use crate::arithmetic::*;
+use crate::clause_types::*;
+use crate::fixtures::*;
+use crate::forms::*;
+use crate::indexing::*;
+use crate::instructions::*;
+use crate::iterators::*;
+use crate::machine::machine_indices::*;
+use crate::targets::*;
+
+use crate::indexmap::{IndexMap, IndexSet};
 
 use std::cell::Cell;
 use std::rc::Rc;

diff --git a/src/prolog/debray_allocator.rs → src/debray_allocator.rs b/src/prolog/debray_allocator.rs → src/debray_allocator.rs
@@ -1,12 +1,12 @@
-use indexmap::IndexMap;
+use crate::indexmap::IndexMap;
 
-use prolog_parser::ast::*;
+use crate::prolog_parser::ast::*;
 
-use crate::prolog::allocator::*;
-use crate::prolog::fixtures::*;
-use crate::prolog::forms::*;
-use crate::prolog::machine::machine_indices::*;
-use crate::prolog::targets::*;
+use crate::allocator::*;
+use crate::fixtures::*;
+use crate::forms::*;
+use crate::machine::machine_indices::*;
+use crate::targets::*;
 
 use std::cell::Cell;
 use std::collections::BTreeSet;

diff --git a/.../bimetatrans_ruleml/bimetatrans_ruleml.pl → .../bimetatrans_ruleml/bimetatrans_ruleml.pl b/.../bimetatrans_ruleml/bimetatrans_ruleml.pl → .../bimetatrans_ruleml/bimetatrans_ruleml.pl
diff --git a/...atrans_ruleml/bimetatrans_ruleml_tests.pl → ...atrans_ruleml/bimetatrans_ruleml_tests.pl b/...atrans_ruleml/bimetatrans_ruleml_tests.pl → ...atrans_ruleml/bimetatrans_ruleml_tests.pl
diff --git a/src/prolog/examples/domain.pl → src/examples/domain.pl b/src/prolog/examples/domain.pl → src/examples/domain.pl
diff --git a/src/prolog/examples/echo_server.pl → src/examples/echo_server.pl b/src/prolog/examples/echo_server.pl → src/examples/echo_server.pl
diff --git a/src/prolog/examples/expert_system.pl → src/examples/expert_system.pl b/src/prolog/examples/expert_system.pl → src/examples/expert_system.pl
diff --git a/src/prolog/examples/least_time.pl → src/examples/least_time.pl b/src/prolog/examples/least_time.pl → src/examples/least_time.pl
diff --git a/src/prolog/examples/minatotask.pl → src/examples/minatotask.pl b/src/prolog/examples/minatotask.pl → src/examples/minatotask.pl
diff --git a/src/prolog/examples/plres.pl → src/examples/plres.pl b/src/prolog/examples/plres.pl → src/examples/plres.pl
diff --git a/src/prolog/examples/utf8.pl → src/examples/utf8.pl b/src/prolog/examples/utf8.pl → src/examples/utf8.pl
diff --git a/src/prolog/fixtures.rs → src/fixtures.rs b/src/prolog/fixtures.rs → src/fixtures.rs
@@ -1,10 +1,10 @@
-use prolog_parser::ast::*;
+use crate::prolog_parser::ast::*;
 
-use crate::prolog::forms::*;
-use crate::prolog::instructions::*;
-use crate::prolog::iterators::*;
+use crate::forms::*;
+use crate::instructions::*;
+use crate::iterators::*;
 
-use indexmap::{IndexMap, IndexSet};
+use crate::indexmap::{IndexMap, IndexSet};
 
 use std::cell::Cell;
 use std::collections::BTreeSet;

diff --git a/src/prolog/forms.rs → src/forms.rs b/src/prolog/forms.rs → src/forms.rs
@@ -1,14 +1,14 @@
-use prolog_parser::ast::*;
-use prolog_parser::parser::OpDesc;
-use prolog_parser::tabled_rc::*;
+use crate::prolog_parser::ast::*;
+use crate::prolog_parser::parser::OpDesc;
+use crate::prolog_parser::tabled_rc::*;
 
-use crate::prolog::clause_types::*;
-use crate::prolog::machine::machine_errors::*;
-use crate::prolog::machine::machine_indices::*;
-use crate::prolog::ordered_float::OrderedFloat;
-use crate::prolog::rug::{Integer, Rational};
+use crate::clause_types::*;
+use crate::machine::machine_errors::*;
+use crate::machine::machine_indices::*;
+use crate::ordered_float::OrderedFloat;
+use crate::rug::{Integer, Rational};
 
-use indexmap::IndexMap;
+use crate::indexmap::IndexMap;
 
 use std::cell::Cell;
 use std::collections::VecDeque;

diff --git a/src/prolog/heap_iter.rs → src/heap_iter.rs b/src/prolog/heap_iter.rs → src/heap_iter.rs
@@ -1,7 +1,7 @@
-use crate::prolog::machine::machine_indices::*;
-use crate::prolog::machine::machine_state::*;
+use crate::machine::machine_indices::*;
+use crate::machine::machine_state::*;
 
-use indexmap::IndexSet;
+use crate::indexmap::IndexSet;
 
 use std::cmp::Ordering;
 use std::ops::Deref;

diff --git a/src/prolog/heap_print.rs → src/heap_print.rs b/src/prolog/heap_print.rs → src/heap_print.rs
@@ -1,16 +1,16 @@
-use prolog_parser::ast::*;
-
-use crate::prolog::clause_types::*;
-use crate::prolog::forms::*;
-use crate::prolog::heap_iter::*;
-use crate::prolog::machine::heap::*;
-use crate::prolog::machine::machine_indices::*;
-use crate::prolog::machine::machine_state::*;
-use crate::prolog::machine::streams::*;
-use crate::prolog::ordered_float::OrderedFloat;
-use crate::prolog::rug::{Integer, Rational};
-
-use indexmap::{IndexMap, IndexSet};
+use crate::prolog_parser::ast::*;
+
+use crate::clause_types::*;
+use crate::forms::*;
+use crate::heap_iter::*;
+use crate::machine::heap::*;
+use crate::machine::machine_indices::*;
+use crate::machine::machine_state::*;
+use crate::machine::streams::*;
+use crate::ordered_float::OrderedFloat;
+use crate::rug::{Integer, Rational};
+
+use crate::indexmap::{IndexMap, IndexSet};
 
 use std::cell::Cell;
 use std::convert::TryFrom;

diff --git a/src/prolog/indexing.rs → src/indexing.rs b/src/prolog/indexing.rs → src/indexing.rs
@@ -1,10 +1,10 @@
-use prolog_parser::ast::*;
-use prolog_parser::tabled_rc::*;
+use crate::prolog_parser::ast::*;
+use crate::prolog_parser::tabled_rc::*;
 
-use crate::prolog::instructions::*;
-use crate::prolog::rug::Integer;
+use crate::instructions::*;
+use crate::rug::Integer;
 
-use indexmap::IndexMap;
+use crate::indexmap::IndexMap;
 
 use std::collections::VecDeque;
 use std::convert::TryFrom;

diff --git a/src/prolog/instructions.rs → src/instructions.rs b/src/prolog/instructions.rs → src/instructions.rs
@@ -1,13 +1,13 @@
-use prolog_parser::ast::*;
+use crate::prolog_parser::ast::*;
 
-use crate::prolog::clause_types::*;
-use crate::prolog::forms::*;
-use crate::prolog::machine::heap::*;
-use crate::prolog::machine::machine_errors::MachineStub;
-use crate::prolog::machine::machine_indices::*;
-use crate::prolog::rug::Integer;
+use crate::clause_types::*;
+use crate::forms::*;
+use crate::machine::heap::*;
+use crate::machine::machine_errors::MachineStub;
+use crate::machine::machine_indices::*;
+use crate::rug::Integer;
 
-use indexmap::IndexMap;
+use crate::indexmap::IndexMap;
 
 use std::collections::VecDeque;
 use std::rc::Rc;

diff --git a/src/prolog/iterators.rs → src/iterators.rs b/src/prolog/iterators.rs → src/iterators.rs
@@ -1,8 +1,8 @@
-use prolog_parser::ast::*;
+use crate::prolog_parser::ast::*;
 
-use crate::prolog::clause_types::*;
-use crate::prolog::forms::*;
-use crate::prolog::machine::machine_indices::*;
+use crate::clause_types::*;
+use crate::forms::*;
+use crate::machine::machine_indices::*;
 
 use std::cell::Cell;
 use std::collections::VecDeque;

diff --git a/src/prolog/lib/arithmetic.pl → src/lib/arithmetic.pl b/src/prolog/lib/arithmetic.pl → src/lib/arithmetic.pl
diff --git a/src/prolog/lib/assoc.pl → src/lib/assoc.pl b/src/prolog/lib/assoc.pl → src/lib/assoc.pl
diff --git a/src/prolog/lib/atts.pl → src/lib/atts.pl b/src/prolog/lib/atts.pl → src/lib/atts.pl
diff --git a/src/prolog/lib/between.pl → src/lib/between.pl b/src/prolog/lib/between.pl → src/lib/between.pl
diff --git a/src/prolog/lib/builtins.pl → src/lib/builtins.pl b/src/prolog/lib/builtins.pl → src/lib/builtins.pl
diff --git a/src/prolog/lib/charsio.pl → src/lib/charsio.pl b/src/prolog/lib/charsio.pl → src/lib/charsio.pl
diff --git a/src/prolog/lib/clpb.pl → src/lib/clpb.pl b/src/prolog/lib/clpb.pl → src/lib/clpb.pl
diff --git a/src/prolog/lib/clpz.pl → src/lib/clpz.pl b/src/prolog/lib/clpz.pl → src/lib/clpz.pl
diff --git a/src/prolog/lib/cont.pl → src/lib/cont.pl b/src/prolog/lib/cont.pl → src/lib/cont.pl
diff --git a/src/prolog/lib/crypto.pl → src/lib/crypto.pl b/src/prolog/lib/crypto.pl → src/lib/crypto.pl
diff --git a/src/prolog/lib/dcgs.pl → src/lib/dcgs.pl b/src/prolog/lib/dcgs.pl → src/lib/dcgs.pl
diff --git a/src/prolog/lib/diag.pl → src/lib/diag.pl b/src/prolog/lib/diag.pl → src/lib/diag.pl
diff --git a/src/prolog/lib/dif.pl → src/lib/dif.pl b/src/prolog/lib/dif.pl → src/lib/dif.pl
diff --git a/src/prolog/lib/error.pl → src/lib/error.pl b/src/prolog/lib/error.pl → src/lib/error.pl
diff --git a/src/prolog/lib/format.pl → src/lib/format.pl b/src/prolog/lib/format.pl → src/lib/format.pl
diff --git a/src/prolog/lib/freeze.pl → src/lib/freeze.pl b/src/prolog/lib/freeze.pl → src/lib/freeze.pl
diff --git a/src/prolog/lib/gensym.pl → src/lib/gensym.pl b/src/prolog/lib/gensym.pl → src/lib/gensym.pl
diff --git a/src/prolog/lib/iso_ext.pl → src/lib/iso_ext.pl b/src/prolog/lib/iso_ext.pl → src/lib/iso_ext.pl
diff --git a/src/prolog/lib/lists.pl → src/lib/lists.pl b/src/prolog/lib/lists.pl → src/lib/lists.pl
diff --git a/src/prolog/lib/ordsets.pl → src/lib/ordsets.pl b/src/prolog/lib/ordsets.pl → src/lib/ordsets.pl
diff --git a/src/prolog/lib/pairs.pl → src/lib/pairs.pl b/src/prolog/lib/pairs.pl → src/lib/pairs.pl
diff --git a/src/prolog/lib/pio.pl → src/lib/pio.pl b/src/prolog/lib/pio.pl → src/lib/pio.pl
diff --git a/src/prolog/lib/queues.pl → src/lib/queues.pl b/src/prolog/lib/queues.pl → src/lib/queues.pl
diff --git a/src/prolog/lib/random.pl → src/lib/random.pl b/src/prolog/lib/random.pl → src/lib/random.pl
diff --git a/src/prolog/lib/reif.pl → src/lib/reif.pl b/src/prolog/lib/reif.pl → src/lib/reif.pl
diff --git a/src/prolog/lib/si.pl → src/lib/si.pl b/src/prolog/lib/si.pl → src/lib/si.pl
diff --git a/src/prolog/lib/sockets.pl → src/lib/sockets.pl b/src/prolog/lib/sockets.pl → src/lib/sockets.pl
diff --git a/src/prolog/lib/tabling.pl → src/lib/tabling.pl b/src/prolog/lib/tabling.pl → src/lib/tabling.pl
diff --git a/src/prolog/lib/tabling/batched_worklist.pl → src/lib/tabling/batched_worklist.pl b/src/prolog/lib/tabling/batched_worklist.pl → src/lib/tabling/batched_worklist.pl
diff --git a/src/prolog/lib/tabling/double_linked_list.pl → src/lib/tabling/double_linked_list.pl b/src/prolog/lib/tabling/double_linked_list.pl → src/lib/tabling/double_linked_list.pl
diff --git a/src/prolog/lib/tabling/global_worklist.pl → src/lib/tabling/global_worklist.pl b/src/prolog/lib/tabling/global_worklist.pl → src/lib/tabling/global_worklist.pl
diff --git a/...rolog/lib/tabling/table_data_structure.pl → src/lib/tabling/table_data_structure.pl b/...rolog/lib/tabling/table_data_structure.pl → src/lib/tabling/table_data_structure.pl
diff --git a/src/prolog/lib/tabling/table_link_manager.pl → src/lib/tabling/table_link_manager.pl b/src/prolog/lib/tabling/table_link_manager.pl → src/lib/tabling/table_link_manager.pl
diff --git a/src/prolog/lib/tabling/trie.pl → src/lib/tabling/trie.pl b/src/prolog/lib/tabling/trie.pl → src/lib/tabling/trie.pl
diff --git a/src/prolog/lib/tabling/wrapper.pl → src/lib/tabling/wrapper.pl b/src/prolog/lib/tabling/wrapper.pl → src/lib/tabling/wrapper.pl
diff --git a/src/prolog/lib/terms.pl → src/lib/terms.pl b/src/prolog/lib/terms.pl → src/lib/terms.pl
diff --git a/src/prolog/lib/time.pl → src/lib/time.pl b/src/prolog/lib/time.pl → src/lib/time.pl
diff --git a/src/prolog/machine/arithmetic_ops.rs → src/machine/arithmetic_ops.rs b/src/prolog/machine/arithmetic_ops.rs → src/machine/arithmetic_ops.rs
@@ -2,14 +2,14 @@ use crate::divrem::*;
 
 use crate::prolog_parser::ast::*;
 
-use crate::prolog::arithmetic::*;
-use crate::prolog::clause_types::*;
-use crate::prolog::forms::*;
-use crate::prolog::machine::machine_errors::*;
-use crate::prolog::machine::machine_indices::*;
-use crate::prolog::machine::machine_state::*;
-use crate::prolog::ordered_float::*;
-use crate::prolog::rug::{Integer, Rational};
+use crate::arithmetic::*;
+use crate::clause_types::*;
+use crate::forms::*;
+use crate::machine::machine_errors::*;
+use crate::machine::machine_indices::*;
+use crate::machine::machine_state::*;
+use crate::ordered_float::*;
+use crate::rug::{Integer, Rational};
 
 use std::cmp;
 use std::convert::TryFrom;

diff --git a/src/prolog/machine/attributed_variables.pl → src/machine/attributed_variables.pl b/src/prolog/machine/attributed_variables.pl → src/machine/attributed_variables.pl
diff --git a/src/prolog/machine/attributed_variables.rs → src/machine/attributed_variables.rs b/src/prolog/machine/attributed_variables.rs → src/machine/attributed_variables.rs
@@ -1,5 +1,5 @@
-use crate::prolog::heap_iter::*;
-use crate::prolog::machine::*;
+use crate::heap_iter::*;
+use crate::machine::*;
 
 use crate::indexmap::IndexSet;
 

diff --git a/src/prolog/machine/code_repo.rs → src/machine/code_repo.rs b/src/prolog/machine/code_repo.rs → src/machine/code_repo.rs
@@ -1,13 +1,13 @@
-use crate::prolog::clause_types::*;
-use crate::prolog::codegen::*;
-use crate::prolog::debray_allocator::*;
-use crate::prolog::forms::*;
-use crate::prolog::instructions::*;
-use crate::prolog::machine::compile::*;
-use crate::prolog::machine::machine_errors::*;
-use crate::prolog::machine::machine_indices::*;
-
-use indexmap::IndexSet;
+use crate::clause_types::*;
+use crate::codegen::*;
+use crate::debray_allocator::*;
+use crate::forms::*;
+use crate::instructions::*;
+use crate::machine::compile::*;
+use crate::machine::machine_errors::*;
+use crate::machine::machine_indices::*;
+
+use crate::indexmap::IndexSet;
 
 use std::collections::VecDeque;
 use std::mem;

diff --git a/src/prolog/machine/code_walker.rs → src/machine/code_walker.rs b/src/prolog/machine/code_walker.rs → src/machine/code_walker.rs
@@ -1,4 +1,4 @@
-use crate::prolog::instructions::*;
+use crate::instructions::*;
 
 use std::collections::VecDeque;
 

diff --git a/src/prolog/machine/compile.rs → src/machine/compile.rs b/src/prolog/machine/compile.rs → src/machine/compile.rs
@@ -1,22 +1,22 @@
-use prolog_parser::ast::*;
-use prolog_parser::parser::get_desc;
-use prolog_parser::tabled_rc::TabledData;
-
-use crate::prolog::codegen::*;
-use crate::prolog::debray_allocator::*;
-use crate::prolog::forms::*;
-use crate::prolog::instructions::*;
-use crate::prolog::iterators::*;
-use crate::prolog::machine::code_walker::*;
-use crate::prolog::machine::machine_errors::*;
-use crate::prolog::machine::machine_indices::*;
-use crate::prolog::machine::term_expansion::ExpansionAdditionResult;
-use crate::prolog::machine::toplevel::*;
-use crate::prolog::machine::*;
-
-use indexmap::{IndexMap, IndexSet};
-
-use ref_thread_local::RefThreadLocal;
+use crate::prolog_parser::ast::*;
+use crate::prolog_parser::parser::get_desc;
+use crate::prolog_parser::tabled_rc::TabledData;
+
+use crate::codegen::*;
+use crate::debray_allocator::*;
+use crate::forms::*;
+use crate::instructions::*;
+use crate::iterators::*;
+use crate::machine::code_walker::*;
+use crate::machine::machine_errors::*;
+use crate::machine::machine_indices::*;
+use crate::machine::term_expansion::ExpansionAdditionResult;
+use crate::machine::toplevel::*;
+use crate::machine::*;
+
+use crate::indexmap::{IndexMap, IndexSet};
+
+use crate::ref_thread_local::RefThreadLocal;
 
 use std::cell::Cell;
 use std::collections::VecDeque;
@@ -469,6 +469,7 @@ impl ClauseCodeGenerator {
                             vec![Box::new(head.clone()), Box::new(tail.clone())],
                             None,
                         );
+
                         PredicateClause::Fact(clause, 0, 0)
                     })
                     .collect(),

diff --git a/src/prolog/machine/copier.rs → src/machine/copier.rs b/src/prolog/machine/copier.rs → src/machine/copier.rs
@@ -1,5 +1,5 @@
-use crate::prolog::machine::machine_indices::*;
-use crate::prolog::machine::stack::*;
+use crate::machine::machine_indices::*;
+use crate::machine::stack::*;
 
 use std::mem;
 use std::ops::IndexMut;

diff --git a/src/prolog/machine/dynamic_database.rs → src/machine/dynamic_database.rs b/src/prolog/machine/dynamic_database.rs → src/machine/dynamic_database.rs
@@ -1,10 +1,10 @@
-use prolog_parser::ast::*;
+use crate::prolog_parser::ast::*;
 
-use crate::prolog::heap_print::*;
-use crate::prolog::machine::*;
-use crate::prolog::machine::compile::*;
-use crate::prolog::machine::machine_errors::*;
-use crate::prolog::machine::streams::*;
+use crate::heap_print::*;
+use crate::machine::*;
+use crate::machine::compile::*;
+use crate::machine::machine_errors::*;
+use crate::machine::streams::*;
 
 use std::convert::TryFrom;