From: Richard W.M. Jones <rjones@redhat.com>
Date: Sat, 21 Dec 2019 20:46:46 +0000 (+0000)
Subject: Continue command line parsing.
X-Git-Tag: v'0.2'~147
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=ad88d061677bc17e820eac0f949723c6f3d4f6e4;p=goals.git

Continue command line parsing.
---

diff --git a/src/Makefile.in b/src/Makefile.in
index 15e8006..1b838b1 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -17,6 +17,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 OBJECTS = \
+	utils.cmx \
 	ast.cmx \
 	parser.cmx \
 	lexer.cmx \
diff --git a/src/main.ml b/src/main.ml
index 30ba31f..643e1b5 100644
--- a/src/main.ml
+++ b/src/main.ml
@@ -19,11 +19,13 @@
 
 open Printf
 
+open Utils
+
 let usage =
   "\
 goals: Build software.
 
- goals [-f Goalfile] ['var = value' ...] [target ...]
+ goals [-f Goalfile] ['var = value' ...] ['target' ...]
 
 For detailed help see goals(1).
 
@@ -50,6 +52,31 @@ let main () =
   (* Parse the input file. *)
   let file = Parse.parse_from_file filename in
 
-  Ast.print_file stdout file
+  Ast.print_file stdout file;
+
+  (* Find the target(s) to execute first. *)
+  let initial_targets = ref [] in
+  (* XXX Parse command line anon args here. XXX *)
+
+  (* If no initial target set on the command line, find
+   * the first goal in the file.
+   *)
+  List.iter (
+    function
+    | Ast.Goal (name, [], _, _, _) ->
+       if !initial_targets = [] then
+         initial_targets := name :: !initial_targets
+    | Ast.Goal (name, _, _, _, _) ->
+       if !initial_targets = [] then
+         failwithf "%s: first target ‘%s’ has parameters and so cannot be used as the default target"
+           filename name
+    | _ -> ()
+  ) file;
+
+  let initial_targets = List.rev !initial_targets in
+
+  eprintf "initial targets:";
+  List.iter (eprintf " %s") initial_targets;
+  eprintf "\n"
 
 let () = main ()
diff --git a/src/utils.ml b/src/utils.ml
new file mode 100644
index 0000000..c24d4ee
--- /dev/null
+++ b/src/utils.ml
@@ -0,0 +1,22 @@
+(* Goalfile utilities
+ * Copyright (C) 2019 Richard W.M. Jones
+ * Copyright (C) 2019 Red Hat Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *)
+
+open Printf
+
+let failwithf fs = ksprintf failwith fs
diff --git a/src/utils.mli b/src/utils.mli
new file mode 100644
index 0000000..423847a
--- /dev/null
+++ b/src/utils.mli
@@ -0,0 +1,21 @@
+(* Goalfile utilities
+ * Copyright (C) 2019 Richard W.M. Jones
+ * Copyright (C) 2019 Red Hat Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *)
+
+val failwithf : ('a, unit, string, 'b) format4 -> 'a
+(** Like [failwith] but supports printf-like arguments. *)