small fixes for error handling

git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@185 b08c6af1-5177-4d33-ba66-4b1c6b8b522a

C/eval.c

@@ -107,15 +107,10 @@ Eval(Term t, E_ARGS)
     ExpEntry *p;
 
     if (EndOfPAEntr(p = RepExpProp(GetExpProp(name, 0)))) {
-      Term ti[2];
-
       /* error */
-      ti[0] = t;
-      ti[1] = MkIntTerm(0);
-      t = MkApplTerm(MkFunctor(LookupAtom("/"),2), 2, ti);
       Error(TYPE_ERROR_EVALUABLE, t,
-	    "functor %s/%d for arithmetic expression",
-	    RepAtom(name)->StrOfAE,0);
+	    "atom %s for arithmetic expression",
+	    RepAtom(name)->StrOfAE);
       P = (yamop *)FAILCODE;
       RERROR();
     }

C/exec.c

@@ -516,7 +516,10 @@ p_execute0(void)
   Prop            pe;
   SMALLUNSGN      mod = LookupModule(tmod);
 
-  if (IsAtomTerm(t)) {
+  if (IsVarTerm(t)) {
+    Error(INSTANTIATION_ERROR,ARG3,"call/1");    
+    return(FALSE);
+  } else if (IsAtomTerm(t)) {
     Atom a = AtomOfTerm(t);
     pe = PredPropByAtom(a, mod);
   } else if (IsApplTerm(t)) {
@@ -543,8 +546,10 @@ p_execute0(void)
 #endif
     }
     pe = PredPropByFunc(f, mod);
-  } else
-    return (FALSE);	/* for the moment */
+  } else {
+    Error(TYPE_ERROR_CALLABLE,ARG3,"call/1");    
+    return(FALSE);
+  }
   /*	N = arity; */
   /* call may not define new system predicates!! */
   return (CallPredicate(RepPredProp(pe), B));

pl/consult.yap

@@ -225,7 +225,7 @@ reconsult(Fs) :-
 	;
 		throw(error(permission_error(input,stream,Y),include(X)))
 	),
-	'$put_value'('$included_file',OY).
+	'$set_value'('$included_file',OY).
 '$include'(V, _) :- 
 	throw(error(type_error(atom,V),include(V))).