X-Git-Url: http://git.annexia.org/?p=whenjobs.git;a=blobdiff_plain;f=lib%2Fwhenfile.ml;h=83e0a074f3fa7045b41d5f7ee5344eb8fca447ac;hp=89a09b0460478bf79fe9c7be52c6df87f9623714;hb=f35f462b83f860958da38347d30b45986b8f4774;hpb=df2cdcfdc29af0080b9b3eace17325d2a1d83e72

diff --git a/lib/whenfile.ml b/lib/whenfile.ml
index 89a09b0..83e0a07 100644
--- a/lib/whenfile.ml
+++ b/lib/whenfile.ml
@@ -16,23 +16,27 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *)
 
-open Whenutils
+open Whenexpr
 
 open Printf
 
-(* The list of jobs in this file. *)
-let jobs = ref []
+(* The state updated during parsing of the file. *)
+let state = ref Whenstate.empty
 
-let init () = jobs := []
+let init s = state := s
 
-let add_when_job _loc name e sh =
+let add_when_job _loc name cleanup e sh =
   let e = expr_of_ast _loc e in
-  let job = make_when_job _loc name e sh in
-  jobs := job :: !jobs
+  let job = { job_loc = _loc; job_name = name; job_cleanup = cleanup;
+              job_cond = When_job e; job_script = sh } in
+  state := Whenstate.add_job !state job
 
-let add_every_job _loc name e sh =
-  let job = make_every_job _loc name e sh in
-  jobs := job :: !jobs
+let add_every_job _loc name cleanup e sh =
+  let job = { job_loc = _loc; job_name = name; job_cleanup = cleanup;
+              job_cond = Every_job e; job_script = sh } in
+  state := Whenstate.add_job !state job
 
-let get_jobs () =
-  List.rev !jobs
+let set_variable name value =
+  state := Whenstate.set_variable !state name value
+
+let get_state () = !state