Merge branch 'master' of ../yap-6.2

C/cdmgr.c

@@ -918,6 +918,7 @@ split_megaclause(PredEntry *ap)
 	}
 	return;
       }
+      break;
     }
     Yap_ClauseSpace += sizeof(StaticClause)+mcl->ClItemSize+(UInt)NEXTOP((yamop *)NULL,p);
     new->ClFlags = StaticMask|FactMask;

C/scanner.c

@@ -636,10 +636,6 @@ get_num(int *chp, int *chbuffp, int inp_stream, int (*Nxtch) (int), int (*Quoted
       char *sp0 = sp;
       char cbuff = ch;
 
-      if (yap_flags[STRICT_ISO_FLAG] && ch == 'E') {
-	Yap_ErrorMessage = "Float format not allowed in ISO mode";
-	return TermNil;
-      }
       if (--max_size == 0) {
 	Yap_ErrorMessage = "Number Too Long";
 	return TermNil;

Makefile.in

@@ -28,7 +28,7 @@ INCLUDEDIR=$(ROOTDIR)/include/Yap
 #
 INFODIR=$(SHAREDIR)/info
 #
-# where to store documentaion files
+# where to store documentation files
 #
 DOCSDIR=$(SHAREDIR)/doc/Yap
 

pl/boot.yap

@@ -515,7 +515,7 @@ true :- true.
 	X == '$', !,
 	( recorded('$reconsulting',_,R) -> erase(R) ).
 
-'$prompt_alternatives_on'(groundness).
+'$prompt_alternatives_on'(determinism).
 
 /* Executing a query */
 

pl/init.yap

@@ -206,5 +206,5 @@ file_search_path(system, Dir) :-
 	prolog_flag(host_type, Dir).
 file_search_path(foreign, yap('lib/Yap')).
 
-%:- yap_flag(unknown,error). 
+:- yap_flag(unknown,error). 
 

pl/utils.yap

@@ -668,10 +668,14 @@ sub_atom(At, Bef, Size, After, SubAt) :-
 atom_to_term(Atom, Term, Bindings) :-
 	atom_codes(Atom, Chars),
 	charsio:open_mem_read_stream(Chars, Stream),
-	read_term(Stream, T, [variable_names(Bindings)]),
+	catch(read_term(Stream, T, [variable_names(Bindings)]),Error,'$handle_atom_to_term_error'(Stream, Error)),
 	close(Stream),
 	T = Term.
 
+'$handle_atom_to_term_error'(Stream, Error) :-
+	close(Stream),
+	throw(Error).
+
 term_to_atom(Term,Atom) :-
 	nonvar(Atom), !,
 	atom_codes(Atom,S),