From 327c1216e4076a8793cfc314b01827b86dc80978 Mon Sep 17 00:00:00 2001
From: Vitor Santos Costa <vsc@dcc.fc.up.pt>
Date: Tue, 28 Jan 2014 13:01:27 +0000
Subject: [PATCH] fixes to SWI interface

---
 include/SWI-Prolog.h          |  1 +
 library/dialect/swi/fli/swi.c | 21 +++++++++++++++------
 packages/real                 |  2 +-
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/include/SWI-Prolog.h b/include/SWI-Prolog.h
index b79e4844d..24ec42c2f 100755
--- a/include/SWI-Prolog.h
+++ b/include/SWI-Prolog.h
@@ -539,6 +539,7 @@ extern X_API  int PL_is_functor(term_t, functor_t);
 extern X_API  int PL_is_ground(term_t);
 extern X_API  int PL_is_callable(term_t);
 extern X_API  int PL_is_integer(term_t);
+extern X_API  int PL_is_pair(term_t);
 extern X_API  int PL_is_list(term_t);
 extern X_API  int PL_is_number(term_t);
 extern X_API  int PL_is_string(term_t);
diff --git a/library/dialect/swi/fli/swi.c b/library/dialect/swi/fli/swi.c
index ea24bbfca..a8dddd6c1 100755
--- a/library/dialect/swi/fli/swi.c
+++ b/library/dialect/swi/fli/swi.c
@@ -1627,9 +1627,11 @@ X_API int PL_term_type(term_t t)
     return PL_VARIABLE;
   } else if (IsAtomTerm(v)) {
     return PL_ATOM;
-  } else if (YAP_IsIntTerm(v)) {
+  } else if (IsStringTerm(v)) {
+    return PL_STRING;
+  } else if (IsIntegerTerm(v)) {
     return PL_INTEGER;
-  } else if (YAP_IsFloatTerm(v)) {
+  } else if (IsFloatTerm(v)) {
     return PL_FLOAT;
   } else {
     return PL_TERM;
@@ -1671,14 +1673,14 @@ X_API int PL_is_atomic(term_t ts)
 {
   CACHE_REGS
   YAP_Term t = Yap_GetFromSlot(ts PASS_REGS);
-  return !YAP_IsVarTerm(t) || !YAP_IsApplTerm(t) || !YAP_IsPairTerm(t);
+  return !IsVarTerm(t) || !IsApplTerm(t) || !IsPairTerm(t);
 }
 
 X_API int PL_is_compound(term_t ts)
 {
   CACHE_REGS
   YAP_Term t = Yap_GetFromSlot(ts PASS_REGS);
-  return (YAP_IsApplTerm(t) || YAP_IsPairTerm(t));
+  return (IsApplTerm(t) || IsPairTerm(t));
 }
 
 X_API int PL_is_functor(term_t ts, functor_t f)
@@ -1698,7 +1700,7 @@ X_API int PL_is_float(term_t ts)
 {
   CACHE_REGS
   YAP_Term t = Yap_GetFromSlot(ts PASS_REGS);
-  return YAP_IsFloatTerm(t);
+  return !IsVarTerm(t) && IsFloatTerm(t);
 }
 
 X_API int PL_is_integer(term_t ts)
@@ -1726,6 +1728,13 @@ X_API int PL_is_list(term_t ts)
   return !IsVarTerm(t) && (t == TermNil || IsPairTerm(t));
 }
 
+X_API int PL_is_pair(term_t ts)
+{
+  CACHE_REGS
+  YAP_Term t = Yap_GetFromSlot(ts PASS_REGS);
+  return !IsVarTerm(t) && IsPairTerm(t);
+}
+
 X_API int
 PL_skip_list(term_t list, term_t tail, size_t *len)
 { 
@@ -1758,7 +1767,7 @@ X_API int PL_is_number(term_t ts)
 {
   CACHE_REGS
   YAP_Term t = Yap_GetFromSlot(ts PASS_REGS);
-  return YAP_IsIntTerm(t) || YAP_IsBigNumTerm(t) || YAP_IsFloatTerm(t);
+  return IsIntegerTerm(t) || IsBigIntTerm(t) || IsFloatTerm(t);
 }
 
 X_API int PL_is_string(term_t ts)
diff --git a/packages/real b/packages/real
index 626133d5b..9c65bc419 160000
--- a/packages/real
+++ b/packages/real
@@ -1 +1 @@
-Subproject commit 626133d5b507de73398f2285be7fe8f3d817a16c
+Subproject commit 9c65bc41956b387fb41a7a91f67c65611c5c9466