Merge remote-tracking branch 'origin/master' into osa1/rts_rust_port

Author: osa1

Changelog.md

@@ -1,5 +1,7 @@
 = Motoko compiler changelog
 
+* new `moc` command-line arguments `--args <file>` and `--args0 <file>` for reading newline/NUL terminated arguments from `<file>`.
+
 == 0.5.4 (2021-01-07)
 
 * _Option blocks_ `do ? <block>` and _option checks_ `<exp> !`.

doc/modules/language-guide/pages/compiler-ref.adoc

@@ -32,6 +32,10 @@ You can use the following options with the `+moc+` command.
 
 |`+--actor-alias+` |Specifies an actor import alias.
 
+|`+--args <file>+` |Read additional newline separated command line arguments from <file>
+
+|`+--args0 <file>+` |Read additional NUL separated command line arguments from <file>
+
 |`+-c+` |Compiles programs to WebAssembly.
 
 |`+--check+` |Performs type checking only.

nix/sources.json

@@ -47,7 +47,7 @@
     "motoko-base": {
         "branch": "next-moc",
         "repo": "ssh://git@github.com/dfinity-lab/motoko-base",
-        "rev": "5e010560a3f12c85980f61f6fe766eff8c997d57",
+        "rev": "65855b989792abb8c5e68adb47edfd566a8dd73a",
         "type": "git"
     },
     "motoko-matchers": {
@@ -83,10 +83,10 @@
         "homepage": "https://github.com/nmattia/niv",
         "owner": "nmattia",
         "repo": "niv",
-        "rev": "94dadba1a3a6a2f0b8ca2963e49daeec5d4e3098",
-        "sha256": "1y2h9wl7w60maa2m4xw9231xdr325xynzpph8xr4j5vsznygv986",
+        "rev": "18b7314c13a6d0e82113a15c14e7a5f54286327d",
+        "sha256": "0b2xb99nn7ddysvgzncwa4vglv0j6c0l4bgxz9hl4i3gmrlq3r59",
         "type": "tarball",
-        "url": "https://github.com/nmattia/niv/archive/94dadba1a3a6a2f0b8ca2963e49daeec5d4e3098.tar.gz",
+        "url": "https://github.com/nmattia/niv/archive/18b7314c13a6d0e82113a15c14e7a5f54286327d.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs": {

src/codegen/compile.ml

@@ -3018,7 +3018,7 @@ module Tuple = struct
 
   (* We represent the boxed empty tuple as the unboxed scalar 0, i.e. simply as
      number (but really anything is fine, we never look at this) *)
-  let unit_vanilla_lit = 1l
+  let unit_vanilla_lit = 0l
   let compile_unit = compile_unboxed_const unit_vanilla_lit
 
   (* Expects on the stack the pointer to the array. *)

src/exes/moc.ml

@@ -95,8 +95,10 @@ let argspec = Arg.align [
   "--sanity-checks",
   Arg.Unit
     (fun () -> Flags.sanity := true),
-    " enable sanity checking in the RTS and generated code";
-]
+  " enable sanity checking in the RTS and generated code";
+    ]
+  @  Args.inclusion_args
+
 
 
 let set_out_file files ext =
@@ -176,7 +178,7 @@ let () =
   (useful for debugging infinite loops)
   *)
   Printexc.record_backtrace true;
-  Arg.parse argspec add_arg usage;
+  Arg.parse_expand argspec add_arg usage;
   if !mode = Default then mode := (if !args = [] then Interact else Compile);
   Flags.compiled := (!mode = Compile || !mode = Idl);
   process_profiler_flags ();

src/mo_config/args.ml

@@ -26,3 +26,13 @@ let error_args = [
   "--error-detail", Arg.Set_int Flags.error_detail, " set error message detail for syntax errors"
   (* TODO move --hide-warnings here? *)
   ]
+
+let inclusion_args = [
+    (* generic arg inclusion from file *)
+  "--args", Arg.Expand Arg.read_arg,
+    "<file> Read additional newline separated command line arguments \n\
+    \      from <file>";
+  "--args0", Arg.Expand Arg.read_arg0,
+    "<file> Read additional NUL separated command line arguments from \n\
+    \      <file>"
+  ]

src/mo_config/args.mli

@@ -1,2 +1,3 @@
 val error_args : (Arg.key * Arg.spec * Arg.doc) list
 val package_args : (Arg.key * Arg.spec * Arg.doc) list
+val inclusion_args : (Arg.key * Arg.spec * Arg.doc) list