X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fwhenfile.ml;h=d011dfce377b41ebb175ad5b7d9190beec665be8;hb=cfc76a6b38e225b96e5e53afbd511038c3e5bf05;hp=8fdca1e438db30bc9548fe97532d4707a117fb3d;hpb=61cad7bbaf63389b520b695eefdd735bc11a8aa6;p=whenjobs.git

diff --git a/lib/whenfile.ml b/lib/whenfile.ml
index 8fdca1e..d011dfc 100644
--- a/lib/whenfile.ml
+++ b/lib/whenfile.ml
@@ -16,27 +16,29 @@
  * 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 pre post e sh =
   let e = expr_of_ast _loc e in
   let job = { job_loc = _loc; job_name = name;
-              job_cond = When_job e; job_script = sh;
-              job_private = no_job_private } in
-  jobs := job :: !jobs
+              job_pre = pre; job_post = post;
+              job_cond = When_job e; job_script = sh } in
+  state := Whenstate.add_job !state job
 
-let add_every_job _loc name e sh =
+let add_every_job _loc name pre post e sh =
   let job = { job_loc = _loc; job_name = name;
-              job_cond = Every_job e; job_script = sh;
-              job_private = no_job_private } in
-  jobs := job :: !jobs
+              job_pre = pre; job_post = post;
+              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