Merge pull request #124 from engboris/syntax-macros

Fix printing and remove dead code

Author: engboris

examples/syntax.sg

@@ -52,9 +52,6 @@
 (show #ineq)
 <show exec #ineq>
 
-'interactive debugging of execution
-'(trace #ineq)
-
 'process
 (:= c (process
   (+n0 0)                 'base constellation
@@ -69,7 +66,7 @@
 (show #g)
 
 'field access and evaluation
-(:= (get G X) <eval exec { #G @[(-field X)] }>)
+(:= (get G X) <<eval exec { #G @[(-field X)] }>>)
 (show #(get g test1))
 (show #(get g test2))
 
@@ -80,20 +77,6 @@
 (:= g2 <eval exec { #g1 @[(-field test1)] }>)
 <show eval exec { #g2 @[(-field test2)] }>
 
-'extend rays with a head function symbol
-'<show exec [[(+f X)] [(f X)]][=>+a]>
-'<show exec [[(+f X)] [(f X)]][=>a]>
-
-'remove head function symbol from a ray
-'<show-exec [[(+f X)] [(f X)]][+f=>]>
-
-'substitutions
-'<show exec (+f X)[X=>(+a X)]>
-'<show exec (+f X)[+f=>+g]>
-'<show exec (union #1 #2)
-'  [#1=>[(+f X) X)]]
-'  [#2=>(-f a)]>
-
 'define type
 (spec nat {
   [(-nat 0) ok]

src/lsc_ast.ml

@@ -1,6 +1,4 @@
 open Base
-open Out_channel
-open In_channel
 
 let ( let* ) x f = Result.bind x ~f
 
@@ -160,7 +158,6 @@ let string_of_ban = function
 let string_of_star s =
   match s.content with
   | [] -> "[]"
-  | [ r ] -> string_of_ray r
   | _ ->
     Printf.sprintf "[%s%s]"
       (List.map ~f:string_of_ray s.content |> String.concat ~sep:" ")
@@ -293,11 +290,6 @@ let fusion repl1 repl2 s1 s2 bans1 bans2 theta : star =
   ; bans = List.map (nbans1 @ nbans2) ~f:(fmap_ban ~f:(subst theta))
   }
 
-let pause () =
-  flush stdout;
-  let _ = input_line stdin in
-  ()
-
 let group_bans =
   List.fold_left ~init:([], []) ~f:(function ineq, incomp ->
     (function
@@ -414,11 +406,6 @@ let rec select_star ~linear ~queue actions :
     | Some new_stars, new_actions ->
       (Some (List.rev queue @ other_states @ new_stars), new_actions) )
 
-let string_of_cfg (actions, states) : string =
-  Printf.sprintf ">> actions: %s\n>> states: %s\n"
-    (string_of_constellation actions)
-    (string_of_constellation states)
-
 let exec ?(linear = false) mcs : constellation =
   (* do a sequence of rounds with a single interaction on state per round *)
   let rec loop (actions, states) =