(* See also "let id" in [lexer.mll]. *)
let var_regexp =
- Str.regexp "\\([a-zA-Z_][a-zA-Z0-9_]*\\)[ \t]*=[ \t]*\\(.*\\)"
+ Str.regexp "\\([a-zA-Z_][-a-zA-Z0-9_]*\\)[ \t]*=[ \t]*\\(.*\\)"
let usage =
"\
let datadir =
try Sys.getenv "GOALS_DATADIR" with Not_found -> Config.datadir
let stdlibdir = datadir // "stdlib"
-let prelude_file = stdlibdir // "prelude.gl"
+let prelude_gl_file = stdlibdir // "prelude.gl"
+let prelude_sh_file = stdlibdir // "prelude.sh"
let () =
- if not (is_directory stdlibdir) || not (Sys.file_exists prelude_file) then
+ if not (is_directory stdlibdir) || not (Sys.file_exists prelude_gl_file) then
failwithf "%s: cannot find the standard library directory, expected %s. If the standard library directory is in a non-standard location then set GOALS_DATADIR. If you can trying to run goals from the build directory then use ‘./run goals ...’"
Sys.executable_name stdlibdir
-let input_file, directory, includes, use_prelude, anon_vars, targets =
+let input_file,
+ debug_flag, directory, includes, nr_jobs, use_prelude, anon_vars, targets =
let args = ref [] in
+ let debug_flag = ref false in
let directory = ref "." in
let input_file = ref "Goalfile" in
let includes = ref [stdlibdir] in
let add_include dir = includes := dir :: !includes in
+ let nr_jobs = ref 4 (* XXX use nproc *) in
let use_prelude = ref true in
let argspec = [
"-C", Arg.Set_string directory,
"directory Change to directory before running";
+ "-d", Arg.Set debug_flag,
+ " Print debug information.";
"--directory", Arg.Set_string directory,
"directory Change to directory before running";
"-f", Arg.Set_string input_file,
"dir Add include directory";
"--include", Arg.String add_include,
"dir Add include directory";
+ "-j", Arg.Set_int nr_jobs,
+ "jobs Set number of parallel jobs";
+ "--jobs", Arg.Set_int nr_jobs,
+ "jobs Set number of parallel jobs";
"--no-prelude",Arg.Clear use_prelude,
" Do not automatically use prelude.gl from stdlib";
"-v", Arg.Unit print_version,
Arg.parse argspec anon_fun usage;
let args = List.rev !args in
+ let debug_flag = !debug_flag in
let directory = !directory in
- let input_file = absolute_path !input_file in
+ let input_file = !input_file in
(* Don't reverse includes - we want newer -I options to take precedence. *)
- let includes = List.map absolute_path !includes in
+ let includes = !includes in
+ let nr_jobs = !nr_jobs in
+ if nr_jobs < 1 then
+ failwithf "%s: -j must be >= 1" Sys.executable_name;
let use_prelude = !use_prelude in
(* Get the anon var assignments and targets. *)
(name, expr)
) anon_vars in
- input_file, directory, includes, use_prelude, anon_vars, targets
+ input_file,
+ debug_flag, directory, includes, nr_jobs, use_prelude, anon_vars, targets
+
+(* Create the debug function. *)
+let debug fs =
+ let display str = if debug_flag then prerr_endline str in
+ ksprintf display fs