From 5a95c6bbc7bfe8d68f6e9b8c0d438344c401e6b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADtor=20Santos=20Costa?= <vsc@dcc.fc.up.pt>
Date: Sat, 5 Mar 2016 00:08:04 +0000
Subject: [PATCH] fix stream_property

---
 os/alias.c   |  2 +-
 os/streams.c | 35 ++++++++++++++++++-----------------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/os/alias.c b/os/alias.c
index 41329cc85..26170379d 100644
--- a/os/alias.c
+++ b/os/alias.c
@@ -336,7 +336,7 @@ FetchAlias (int sno)
     }
     aliasp++;
   }
-  return(AtomFoundVar);
+  return NULL;
 }
 
 /* check if arg is an alias */
diff --git a/os/streams.c b/os/streams.c
index 5a9ef6d59..ad082900f 100644
--- a/os/streams.c
+++ b/os/streams.c
@@ -345,7 +345,7 @@ found_eof(int sno,
     return Yap_unify(t2, MkAtomTerm(AtomPast));
   if (flags & Eof_Stream_f)
     return Yap_unify(t2, MkAtomTerm(AtomAt));
-  return Yap_unify(t2, MkAtomTerm(AtomNot));
+  return Yap_unify(t2, MkAtomTerm(AtomAltNot));
 }
 
 static bool
@@ -503,8 +503,11 @@ static bool do_stream_property(int sno,
     if (args[i].used) {
       switch (i) {
       case STREAM_PROPERTY_ALIAS:
-        rc = rc & Yap_FetchStreamAlias(
-                      sno, args[STREAM_PROPERTY_ALIAS].tvalue PASS_REGS);
+      {
+          Term ta = args[STREAM_PROPERTY_ALIAS].tvalue;
+        rc = rc & Yap_FetchStreamAlias( 
+                      sno, ta PASS_REGS);
+       }
         break;
       case STREAM_PROPERTY_BOM:
         rc = rc && has_bom(sno, args[STREAM_PROPERTY_BOM].tvalue PASS_REGS);
@@ -588,9 +591,8 @@ static xarg *generate_property(int sno, Term t2,
     if (p == STREAM_PROPERTY_INPUT) Yap_unify(t2, MkAtomTerm(AtomInput));
     else    if (p == STREAM_PROPERTY_OUTPUT) Yap_unify(t2, MkAtomTerm(AtomOutput)); 
     else {
-        Term t0 = MkVarTerm();
         Functor f = Yap_MkFunctor(Yap_LookupAtom(stream_property_defs[p].name), 1);
-        Yap_unify( t2, Yap_MkApplTerm(f, 1, &t0));
+        Yap_unify( t2, Yap_MkNewApplTerm(f, 1));
     }
     return Yap_ArgListToVector(t2, stream_property_defs,
                              STREAM_PROPERTY_END);
@@ -624,20 +626,17 @@ static Int cont_stream_property(USES_REGS1) { /* current_stream */
       return false;
     }
     cut_fail();
-  }
+  } 
     LOCK(GLOBAL_Stream[i].streamlock);
-   if (args[STREAM_PROPERTY_ALIAS].tvalue &&
-      IsAtomTerm(args[STREAM_PROPERTY_ALIAS].tvalue)) {
-     // one solution only
-    LOCK(GLOBAL_Stream[i].streamlock);
-       UNLOCK(GLOBAL_Stream[i].streamlock);
-   i = Yap_CheckAlias(AtomOfTerm(args[STREAM_PROPERTY_ALIAS].tvalue));
-    UNLOCK(GLOBAL_Stream[i].streamlock);
-    if (i < 0 ||!Yap_unify(ARG1, Yap_MkStream(i) ) ) {
+   if (IsAtomTerm(args[STREAM_PROPERTY_ALIAS].tvalue)) {
+        // one solution only
+      i = Yap_CheckAlias(AtomOfTerm(args[STREAM_PROPERTY_ALIAS].tvalue));
+      UNLOCK(GLOBAL_Stream[i].streamlock);
+        if (i < 0 ||!Yap_unify(ARG1, Yap_MkStream(i) ) ) {
       cut_fail();
     }
     cut_succeed();
-  } 
+      }
        LOCK(GLOBAL_Stream[i].streamlock);
    rc = do_stream_property(i, args PASS_REGS);   
        UNLOCK(GLOBAL_Stream[i].streamlock);
@@ -691,12 +690,14 @@ static Int stream_property(USES_REGS1) { /* Init current_stream */
 
     i = Yap_CheckStream(t1, Input_Stream_f | Output_Stream_f | Append_Stream_f,
                         "current_stream/3");
-    if (i < 0) {
+   if (i < 0) {
       UNLOCK(GLOBAL_Stream[i].streamlock);
       return false; // error...
     }
-    if (IsVarTerm(t2))
+   EXTRA_CBACK_ARG(2, 1) = MkIntTerm(i);
+    if (IsVarTerm(t2)) {
       return cont_stream_property(PASS_REGS1);
+  }
     args = Yap_ArgListToVector(Deref(ARG2), stream_property_defs,
 			       STREAM_PROPERTY_END);
     if (args == NULL) {