Merge remote-tracking branch 'upstream/main'

AdrickTench · Nov 20, 2024 · 41edad3 · 41edad3
2 parents b74fece + f07c12a
commit 41edad3
Show file tree

Hide file tree

Showing 4 changed files with 702 additions and 344 deletions.
diff --git a/src/canary/metta_eval.pl b/src/canary/metta_eval.pl
@@ -2142,8 +2142,6 @@
     suggest_type(RetType,'Bool'),
     eq_unify(Eq,_SharedType, X, Y, Res).
 
-eq_unify(_Eq,_SharedType, X, Y, TF):- as_tf(X=:=Y,TF),!.
-eq_unify(_Eq,_SharedType, X, Y, TF):- as_tf( '#='(X,Y),TF),!.
 eq_unify( Eq,  SharedType, X, Y, TF):- as_tf(eval_until_unify(Eq,SharedType, X, Y), TF).
 
 

diff --git a/src/canary/metta_parser.pl b/src/canary/metta_parser.pl
@@ -1090,7 +1090,10 @@
   flag('$file_src_ordinal',Ordinal,Ordinal+1),
   succ(LvL,LvLNext),
   nb_setval('$file_src_depth', LvLNext),
-  read_list_cont(EndChar,  Stream, List),
+  read_position(Stream, Line, Col, CharPos, _),
+  catch(read_list_cont(EndChar,  Stream, List),
+        stream_error(_Where,Why),
+        throw(stream_error(Line:Col:CharPos,Why))),
   nb_setval('$file_src_depth', LvL).
 
 read_list_cont(EndChar,  Stream, List) :-