From: Richard W.M. Jones <rjones@redhat.com>
Date: Tue, 28 Feb 2012 11:55:04 +0000 (+0000)
Subject: Use labelled arguments in call_stmt.
X-Git-Tag: 0.0.4~5
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=48f6e672cb92a965fa3c3e0e9e0ea3c3e2a65853;p=whenjobs.git

Use labelled arguments in call_stmt.
---

diff --git a/lib/pa_when.ml b/lib/pa_when.ml
index 00bfd14..2f415ea 100644
--- a/lib/pa_when.ml
+++ b/lib/pa_when.ml
@@ -88,7 +88,7 @@ module M = Ast.Meta.Make (Ast.Meta.MetaGhostLoc)
 let lift_expr = M.Expr.meta_expr
 
 (* Handle a top level statement. *)
-let rec call_stmt name pre post (_loc, stmt, sh) =
+let rec call_stmt ?name ?pre ?post (_loc, stmt, sh) =
   let name =
     match name with
     | None -> let name = unique_job_name () in <:expr< $str:name$ >>
@@ -224,12 +224,12 @@ EXTEND Gram
 
   (* "str_item" is a top level statement in an OCaml program. *)
   str_item: LEVEL "top" [
-    [ s = statement -> call_stmt None None None s ]
+    [ s = statement -> call_stmt s ]
   | [ "job"; name = expr;
       pre = OPT pre;
       post = OPT post;
       s = statement ->
-        call_stmt (Some name) pre post s ]
+        call_stmt ~name ?pre ?post s ]
   ];
 
 END