toplevel: add more Stop=continue, remove nesting

Signed-off-by: Stephan Renatus <[email protected]>

diff --git a/src/toplevel.pl b/src/toplevel.pl
index 9d0b497f47dab45bb10b709165079d5f2c8c64ef..9ec36fb15787a29a0e8c2a99a4d3ae7206cd4c00 100644 (file)
--- a/src/toplevel.pl
+++ b/src/toplevel.pl
@@ -352,32 +352,33 @@ read_input(LeafAnswer, Stop) :-
     (  member(C, ['\n', .]) ->
        nl, write(';  ... .'), nl,
        Stop = stop
-    ;  (  C = w ->
-          nl,
-          write('   '),
-          write_leaf_answer(LeafAnswer, [depth(deep)]),
-          read_input(LeafAnswer, Stop)
-       ;  C = p ->
-          nl,
-          write('   '),
-          write_leaf_answer(LeafAnswer, [depth(shallow)]),
-          read_input(LeafAnswer, Stop)
-       ;  member(C, [';', ' ', n]) ->
-          Stop = continue,
-          nl, write(';  ')
-       ;  C = h ->
-          help_message,
-          read_input(LeafAnswer, Stop)
-       ;  C = a ->
-          bb_put('$report_all', true),
-          nl, write(';  ')
-       ;  C = f ->
-          bb_get('$answer_count', Count),
-          More is 5 - Count mod 5,
-          bb_put('$report_n_more', More),
-          nl, write(';  ')
-       ;  read_input(LeafAnswer, Stop)
-       )
+    ;  C = w ->
+       nl,
+       write('   '),
+       write_leaf_answer(LeafAnswer, [depth(deep)]),
+       read_input(LeafAnswer, Stop)
+    ;  C = p ->
+       nl,
+       write('   '),
+       write_leaf_answer(LeafAnswer, [depth(shallow)]),
+       read_input(LeafAnswer, Stop)
+    ;  member(C, [';', ' ', n]) ->
+       nl, write(';  '),
+       Stop = continue
+    ;  C = h ->
+       help_message,
+       read_input(LeafAnswer, Stop)
+    ;  C = a ->
+       bb_put('$report_all', true),
+       nl, write(';  '),
+       Stop = continue
+    ;  C = f ->
+       bb_get('$answer_count', Count),
+       More is 5 - Count mod 5,
+       bb_put('$report_n_more', More),
+       nl, write(';  '),
+       Stop = continue
+    ;  read_input(LeafAnswer, Stop)
     ).
 
 needs_bracketing(Value, Op) :-