Merge pull request #133 from engboris/interactive

Use macros in Turing machine example and add attempts in watcher

Author: engboris

bin/sgen.ml

@@ -81,24 +81,25 @@ let watch input_file timeout =
   let _ = run_with_timeout input_file timeout in
 
   (* Polling approach - check file modification time *)
-  let rec poll_loop last_mtime =
+  let rec poll_loop last_mtime attempt =
     Unix.sleepf 0.5;
     try
       let stat = Unix.stat abs_path in
       let current_mtime = stat.Unix.st_mtime in
       if Float.(current_mtime > last_mtime) then (
-        Stdlib.Printf.printf "\n\n--- File changed, re-running ---\n%!";
+        Stdlib.Printf.printf
+          "\n\n--- File changed, re-running (attempt #%d) ---\n%!" attempt;
         let _ = run_with_timeout input_file timeout in
-        poll_loop current_mtime )
-      else poll_loop last_mtime
+        poll_loop current_mtime (attempt + 1) )
+      else poll_loop last_mtime attempt
     with Unix.Unix_error _ ->
       Stdlib.Printf.eprintf "Error accessing file, retrying...\n%!";
       Unix.sleepf 1.0;
-      poll_loop last_mtime
+      poll_loop last_mtime attempt
   in
 
   let initial_stat = Unix.stat abs_path in
-  poll_loop initial_stat.Unix.st_mtime
+  poll_loop initial_stat.Unix.st_mtime 2
 
 let preprocess_only input_file =
   let expr = parse input_file in

ERROR_RECOVERY.md renamed to docs/error_recovery_implementation.md

@@ -1,18 +1,21 @@
+(:= (init C) (+stack 0 []))
+
 <show interact (process
-  (+stack0 [])
+  #(init 0)
   'push 1 then 0
-  [(-stack0 X) (+stack1 [1|X])]
-  [(-stack1 X) (+stack2 [0|X])]
+  [(-stack 0 X) (+stack 1 [1|X])]
+  [(-stack 1 X) (+stack 2 [0|X])]
 
   'pop & save
-  [(-stack2 [C|X]) (+stack3 X) (+save C)]
+  [(-stack 2 [C|X]) (+stack 3 X) (+save C)]
 
   'conditional duplication
-  [(-stack3 [0|X]) (+stack4 [0 0|X])]
-  [(-stack3 [1|X]) (+stack4 [1 1|X])]
+  [(-stack 3 [0|X]) (+stack 4 [0 0|X])]
+  [(-stack 3 [1|X]) (+stack 4 [1 1|X])]
 
   'freeze information
   [(-save C) (save C)]
 
   'clean
-  [(-stack4 _)])>
+  [(-stack 4 _)]
+)>

INCREMENTAL_PARSER.md renamed to docs/incremental_parsing_implementation.md

@@ -1,40 +1,58 @@
+(:= (initial Q) {
+  [(-i [C|W]) (+m Q [e e] C W)]
+  [(-i [])    (+m Q e e e)]
+})
+
+(:= (accept Q) [(-m qa L e R) accept])
+(:= (reject Q) [(-m qr L C R) reject])
+
+(:= (if Q1 then Q2) [(-m Q1 L e R) (+m Q2 L e R)])
+(:= (skip right on Q , D) [(-m Q L D [C|R]) (+m Q [D|L] C R)])
+
+(:= (if C1 on Q1 then Q2 , write C2 , right)
+  [(-m Q1 L C1 [C|R]) (+m Q2 [C2|L] C R)])
+
+(:= (if C1 on Q1 then Q2 , write C2 , left)
+  [(-m Q1 [C|L] C1 R) (+m Q2 L C [C2|R])])
+
 ' Turing machine accepting words with as many 'a' as 'b'
 (:= mt {
-  'initial
-  [(-i [C|W]) (+m q0 [e e] C W)]
-  [(-i [])    (+m q0 e e e)]
-  'accept
-  [(-m q0 L e R) (+m qa L e R)]
-  [(-m qa L e R) accept]
-  'initial skip
-  [(-m q0 L sep [C|R]) (+m q0 [sep|L] C R)]
+  #(initial q0)
+  ' accept
+  #(accept qa)
+  #(if q0 then qa)
+  ' reject
+  #(reject qr)
+  #(if q2 then qr)
+  #(if q3 then qr)
+  ' initial skip
+  #(skip right on q0 , sep)
   'mark
-  [(-m q0 L a [C|R]) (+m q2 [sep|L] C R)]
-  [(-m q0 L b [C|R]) (+m q3 [sep|L] C R)]
+  #(if a on q0 then q2 , write sep , right)
+  #(if b on q0 then q3 , write sep , right)
   'skip
-  [(-m q2 L a [C|R])   (+m q2 [a|L] C R)]
-  [(-m q2 L sep [C|R]) (+m q2 [sep|L] C R)]
-  [(-m q3 L b [C|R])   (+m q3 [b|L] C R)]
-  [(-m q3 L sep [C|R]) (+m q3 [sep|L] C R)]
+  #(skip right on q2 , a)
+  #(skip right on q2 , sep)
+  #(skip right on q3 , b)
+  #(skip right on q3 , sep)
   'join
-  [(-m q2 [C|L] b R) (+m q1 L C [sep|R])]
-  [(-m q3 [C|L] a R) (+m q1 L C [sep|R])]
+  #(if b on q2 then q1 , write sep , left)
+  #(if a on q3 then q1 , write sep , left)
   'return
-  [(-m q1 [C|L] a R)   (+m q1 L C [a|R])]
-  [(-m q1 [C|L] b R)   (+m q1 L C [b|R])]
-  [(-m q1 [C|L] sep R) (+m q1 L C [sep|R])]
-  [(-m q1 L e [C|R])   (+m q0 [e|L] C R)]
-  'reject
-  [(-m q2 L e R) (+m qr L e R)]
-  [(-m q3 L e R) (+m qr L e R)]
-  [(-m qr L C R) reject]})
-
-(show (interact @(+i [a e]) #mt))
-(show (interact @(+i [b e]) #mt))
-(show (interact @(+i [a b b e]) #mt))
-
-(show (interact @(+i [e]) #mt))
-(show (interact @(+i [a b e]) #mt))
-(show (interact @(+i [a a b b e]) #mt))
-(show (interact @(+i [a b b a e]) #mt))
-(show (interact @(+i [a b a b e]) #mt))
+  #(if a on q1 then q1 , write a , left)
+  #(if b on q1 then q1 , write b , left)
+  #(if sep on q1 then q1 , write sep , left)
+  #(if e on q1 then q0 , write e , right)
+})
+
+(:= (word W) (+i W))
+
+(show (interact @#(word [a e]) #mt))
+(show (interact @#(word [b e]) #mt))
+(show (interact @#(word [a b b e]) #mt))
+
+(show (interact @#(word [e]) #mt))
+(show (interact @#(word [a b e]) #mt))
+(show (interact @#(word [a a b b e]) #mt))
+(show (interact @#(word [a b b a e]) #mt))
+(show (interact @#(word [a b a b e]) #mt))