bug was in debug code *grrr*

bug was in debug code grrr
Salvador Abreu
1 parent 0b83a7f1
Showing 1 changed file with 12 additions and 4 deletions Show diff stats
fzn-parser/fznslurp.pl
@@ -38,10 +38,18 @@ load_ast((IN &gt; INT), IN, OUT) :-
     load_ast(OP, INT, OUT).
  
 load_ast_deb(end_of_file, AST, AST).
-load_ast_deb(IN > INT,    IN,  OUT) :- read(OP), !,
-				       writeq(IN), write('.'), nl,
-				       writeq(OP), nl,
-				       load_ast_deb(OP, INT, OUT).
+load_ast_deb((IN > INT :- MOD), IN, OUT) :-
+    ( call(MOD) -> format("EXT OK ~q\n", [MOD]) ;
+      format("EXT FAIL ~q\n", [MOD]), fail ),
+    read(OP), !,
+    writeq(IN), write('.'), nl,
+    writeq(OP), nl,
+    load_ast_deb(OP, INT, OUT).
+load_ast_deb(IN > INT,    IN,  OUT) :- 
+    read(OP), !,
+    writeq(IN), write('.'), nl,
+    writeq(OP), nl,
+    load_ast_deb(OP, INT, OUT).
  
 % -----------------------------------------------------------------------------
...	...	@@ -38,10 +38,18 @@ load_ast((IN > INT), IN, OUT) :-
38	38	load_ast(OP, INT, OUT).
39	39
40	40	load_ast_deb(end_of_file, AST, AST).
41		-load_ast_deb(IN > INT, IN, OUT) :- read(OP), !,
42		- writeq(IN), write('.'), nl,
43		- writeq(OP), nl,
44		- load_ast_deb(OP, INT, OUT).
	41	+load_ast_deb((IN > INT :- MOD), IN, OUT) :-
	42	+ ( call(MOD) -> format("EXT OK ~q\n", [MOD]) ;
	43	+ format("EXT FAIL ~q\n", [MOD]), fail ),
	44	+ read(OP), !,
	45	+ writeq(IN), write('.'), nl,
	46	+ writeq(OP), nl,
	47	+ load_ast_deb(OP, INT, OUT).
	48	+load_ast_deb(IN > INT, IN, OUT) :-
	49	+ read(OP), !,
	50	+ writeq(IN), write('.'), nl,
	51	+ writeq(OP), nl,
	52	+ load_ast_deb(OP, INT, OUT).
45	53
46	54	% -----------------------------------------------------------------------------
47	55
...	...