From 324833f84a206d42846b2e3836dd8d26656fab13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADtor=20Manuel=20de=20Morais=20Santos=20Costa?=
 <vsc@xato.(none)>
Date: Mon, 11 Jan 2010 15:44:43 +0000
Subject: [PATCH] =?UTF-8?q?fix=20excessive=20trimming=20in=20C-interface?=
 =?UTF-8?q?=20for=20backtrackable=20predicates=20(obs=20from=20Jos=C3=A9?=
 =?UTF-8?q?=20Vieira).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 C/c_interface.c       | 5 +++--
 library/tries/tries.c | 1 -
 packages/chr          | 2 +-
 packages/jpl          | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/C/c_interface.c b/C/c_interface.c
index dda827e18..5e68e7640 100644
--- a/C/c_interface.c
+++ b/C/c_interface.c
@@ -1027,13 +1027,14 @@ YAP_cut_up(void)
 
     cut_pt = B->cp_b;
     CUT_prune_to(cut_pt);
+    Yap_TrimTrail();
     B = cut_pt;
   }
-#else	/* YAPOR */
+#else
+  Yap_TrimTrail();
   B = B->cp_b;  /* cut_fail */
 #endif
   HB = B->cp_h; /* cut_fail */
-  Yap_TrimTrail();
 
   RECOVER_B();
 }
diff --git a/library/tries/tries.c b/library/tries/tries.c
index 87d8966b1..111cd89c1 100644
--- a/library/tries/tries.c
+++ b/library/tries/tries.c
@@ -387,7 +387,6 @@ static int p_trie_traverse_init(void) {
 
   /* traverse trie */
   if (!(data = trie_traverse_init((TrEntry) YAP_IntOfTerm(arg_trie), (TrData) YAP_IntOfTerm(arg_init_ref)))) {
-    printf("cut fail no init!!!\n");
     YAP_cut_fail();
     return FALSE;
   }
diff --git a/packages/chr b/packages/chr
index f6a790076..c325e4564 160000
--- a/packages/chr
+++ b/packages/chr
@@ -1 +1 @@
-Subproject commit f6a79007615bf46dc79712c41d61289834f28ba3
+Subproject commit c325e4564bb8d4e32c27f2061df85f13d315974e
diff --git a/packages/jpl b/packages/jpl
index eb6d27251..a2d2f0310 160000
--- a/packages/jpl
+++ b/packages/jpl
@@ -1 +1 @@
-Subproject commit eb6d27251c2548c25e6d37fff2a27a014caaa7aa
+Subproject commit a2d2f03107eecd45462cd61a678035132cf06326