Split large 'Whenutils' module into two (creating new module 'Whenexpr').

[whenjobs.git] / lib / pa_when.ml

diff --git a/lib/pa_when.ml b/lib/pa_when.ml
index 0d16469..da51e20 100644 (file)
--- a/lib/pa_when.ml
+++ b/lib/pa_when.ml
@@ -120,7 +120,7 @@ let () =
     (* Convert ">\>" to ">>" in code. *)
     let sh = replace_str sh ">\\>" ">>" in
 
-    <:expr< { Whenutils.sh_loc = $loc$;
+    <:expr< { Whenexpr.sh_loc = $loc$;
               sh_script = $str:sh$ } >>
   in
   Quotation.add "sh" Quotation.DynAst.expr_tag sh_quotation_expander;
@@ -144,31 +144,31 @@ let period_parser =
         Stream.junk stream;
         (match Stream.next stream with
         | KEYWORD ("sec"|"secs"|"second"|"seconds"), _ ->
-          <:expr< Whenutils.Every_seconds $`int:i$ >>
+          <:expr< Whenexpr.Every_seconds $`int:i$ >>
         | KEYWORD ("min"|"mins"|"minute"|"minutes"), _ ->
           let i = 60 * i in
-          <:expr< Whenutils.Every_seconds $`int:i$ >>
+          <:expr< Whenexpr.Every_seconds $`int:i$ >>
         | KEYWORD ("hour"|"hours"), _ ->
           let i = 3600 * i in
-          <:expr< Whenutils.Every_seconds $`int:i$ >>
+          <:expr< Whenexpr.Every_seconds $`int:i$ >>
         | KEYWORD ("day"|"days"), _ ->
-          <:expr< Whenutils.Every_days $`int:i$ >>
+          <:expr< Whenexpr.Every_days $`int:i$ >>
         | KEYWORD ("week"|"weeks"), _ ->
           let i = 7 * i in
-          <:expr< Whenutils.Every_days $`int:i$ >>
+          <:expr< Whenexpr.Every_days $`int:i$ >>
         | KEYWORD ("month"|"months"), _ ->
-          <:expr< Whenutils.Every_months $`int:i$ >>
+          <:expr< Whenexpr.Every_months $`int:i$ >>
         | KEYWORD ("year"|"years"), _ ->
-          <:expr< Whenutils.Every_years $`int:i$ >>
+          <:expr< Whenexpr.Every_years $`int:i$ >>
         | KEYWORD ("decade"|"decades"), _ ->
           let i = 10 * i in
-          <:expr< Whenutils.Every_years $`int:i$ >>
+          <:expr< Whenexpr.Every_years $`int:i$ >>
         | KEYWORD ("century"|"centuries"|"centurys"), _ ->
           let i = 100 * i in
-          <:expr< Whenutils.Every_years $`int:i$ >>
+          <:expr< Whenexpr.Every_years $`int:i$ >>
         | KEYWORD ("millenium"|"millenia"|"milleniums"), _ ->
           let i = 1000 * i in
-          <:expr< Whenutils.Every_years $`int:i$ >>
+          <:expr< Whenexpr.Every_years $`int:i$ >>
         | (KEYWORD s | LIDENT s), _ ->
           eprintf "period: failed to parse %d %s\n%!" i s;
           raise Stream.Failure
@@ -205,19 +205,19 @@ EXTEND Gram
   (* A period expression (used in "every"). *)
   periodexpr: [
     [ ["sec"|"secs"|"second"|"seconds"] ->
-      <:expr< Whenutils.Every_seconds 1 >> ]
+      <:expr< Whenexpr.Every_seconds 1 >> ]
   | [ ["min"|"mins"|"minute"|"minutes"] ->
-      <:expr< Whenutils.Every_seconds 60 >> ]
-  | [ ["hour"|"hours"] -> <:expr< Whenutils.Every_seconds 3600 >> ]
-  | [ ["day"|"days"] -> <:expr< Whenutils.Every_days 1 >> ]
-  | [ ["week"|"weeks"] -> <:expr< Whenutils.Every_days 7 >> ]
-  | [ ["month"|"months"] -> <:expr< Whenutils.Every_months 1 >> ]
-  | [ ["year"|"years"] -> <:expr< Whenutils.Every_years 1 >> ]
-  | [ ["decade"|"decades"] -> <:expr< Whenutils.Every_years 10 >> ]
+      <:expr< Whenexpr.Every_seconds 60 >> ]
+  | [ ["hour"|"hours"] -> <:expr< Whenexpr.Every_seconds 3600 >> ]
+  | [ ["day"|"days"] -> <:expr< Whenexpr.Every_days 1 >> ]
+  | [ ["week"|"weeks"] -> <:expr< Whenexpr.Every_days 7 >> ]
+  | [ ["month"|"months"] -> <:expr< Whenexpr.Every_months 1 >> ]
+  | [ ["year"|"years"] -> <:expr< Whenexpr.Every_years 1 >> ]
+  | [ ["decade"|"decades"] -> <:expr< Whenexpr.Every_years 10 >> ]
   | [ ["century"|"centuries"|"centurys"] ->
-      <:expr< Whenutils.Every_years 100 >> ]
+      <:expr< Whenexpr.Every_years 100 >> ]
   | [ ["millenium"|"millenia"|"milleniums"] ->
-      <:expr< Whenutils.Every_years 1000 >> ]
+      <:expr< Whenexpr.Every_years 1000 >> ]
   | [ e = period_parser -> e ]
   ];