move term expansion logic entirely into loader.pl

src/machine/loader.rs

@@ -1045,7 +1045,7 @@ impl Machine {
             let term = loader.read_term_from_heap(temp_v!(1))?;
 
             loader.incremental_compile_clause(
-                (clause_name!("$term_expansion"), 2),
+                (clause_name!("term_expansion"), 2),
                 term,
                 CompilationTarget::User,
                 false,

src/machine/mod.rs

@@ -345,15 +345,6 @@ impl Machine {
 
         lib_path.pop(); // remove the "lib" at the end
 
-        bootstrapping_compile(
-            Stream::from(include_str!("../term_and_goal_expansion.pl")),
-            &mut wam,
-            ListingSource::from_file_and_path(
-                clause_name!("term_and_goal_expansion.pl"),
-                lib_path.clone(),
-            ),
-        ).unwrap();
-
         bootstrapping_compile(
             Stream::from(include_str!("../loader.pl")),
             &mut wam,