Fix handling of % and ! in the REPL

Shen-Language · May 12, 2024 · 4273240 · 4273240
1 parent a5d86c7
commit 4273240
Showing 1 changed file with 14 additions and 18 deletions.
diff --git a/sources/toplevel.shen b/sources/toplevel.shen
@@ -61,24 +61,20 @@
   Ss -> Ss)
 
 (define evaluate-lineread
-  [_] ["!!" S | History] TC -> (let Y (read-from-string S)
-                                    NewHistory (set *history* [S S | History])
-                                    Print (output "~A~%" S)
-                                 (evaluate-lineread Y NewHistory TC))
-  [_] [(@s "%" S) | History] TC -> (let Read (hd (read-from-string S))
-                                        Peek (peek-history Read S History)
-                                        NewHistory (set *history* History)
-                                     (abort))
-  [_] [(@s "!" S) | History] TC -> (let Read (hd (read-from-string S))
-                                        Match (use-history Read S History)
-                                        Print (output "~A~%" Match)
-                                        Y (read-from-string Match)
-                                        NewHistory (set *history* [Match | History])
-                                     (evaluate-lineread Y NewHistory TC))
-  [_] [(@s "%" S) | History] TC -> (let Read (hd (read-from-string S))
-                                        Peek (peek-history Read S History)
-                                        NewHistory (set *history* History)
-                                     (abort))
+  [_] [(@s "!!" _) S | History] TC -> (let Y (read-from-string S)
+                                           NewHistory (set *history* [S S | History])
+                                           Print (output "~A~%" S)
+                                        (evaluate-lineread Y NewHistory TC))
+  [_] [(@s "!" S) | History] TC    -> (let Read (if (= S "") [] (hd (read-from-string S)))
+                                           Match (use-history Read S History)
+                                           Print (output "~A~%" Match)
+                                           Y (read-from-string Match)
+                                           NewHistory (set *history* [Match | History])
+                                        (evaluate-lineread Y NewHistory TC))
+  [_] [(@s "%" S) | History] TC    -> (let Read (if (= S "") [] (hd (read-from-string S)))
+                                           Peek (peek-history Read S History)
+                                           NewHistory (set *history* History)
+                                        (abort))
   X _ true  -> (check-eval-and-print X)
   X _ false -> (eval-and-print X)
   _ _ _ -> (simple-error "implementation error in shen.evaluate-lineread"))