add expand_goal, make user:term_expansion and user:goal_expansion work properly within modules

2018-12-11 22:57:11 -07:00
parent 226bb7f9ed
commit 45a68d4bc2
11 changed files with 196 additions and 98 deletions
--- a/src/prolog/machine/system_calls.rs
+++ b/src/prolog/machine/system_calls.rs
@@ -203,9 +203,13 @@ impl MachineState {
                    _ => self.fail = true
                };
            },
+            &SystemClauseType::ExpandGoal => {
+                self.p = CodePtr::Local(LocalCodePtr::UserGoalExpansion(0));
+//                return Ok(());
+            },
            &SystemClauseType::ExpandTerm => {
                self.p = CodePtr::Local(LocalCodePtr::UserTermExpansion(0));
-                return Ok(());
+//                return Ok(());
            },
            &SystemClauseType::GetDoubleQuotes => {
                let a1 = self[temp_v!(1)].clone();