Skip to content

Commit

Permalink
Merge pull request #9634 from nojb/ocamlrunparam_comma_fix
Browse files Browse the repository at this point in the history
Allow ',' at the start of OCAMLRUNPARAM
  • Loading branch information
gasche committed Jun 5, 2020
2 parents e32c1b2 + c4eea2e commit a8a2a7b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 0 deletions.
3 changes: 3 additions & 0 deletions Changes
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ Working version
(Nicolás Ojeda Bär, review by Stephen Dolan, Gabriel Scherer, Mark Shinwell,
and Xavier Leroy)

- #9634: Allow initial and repeated commas in `OCAMLRUNPARAM`.
(Nicolás Ojeda Bär, review by Gabriel Scherer)

### Code generation and optimizations:

- #9441: Add RISC-V RV64G native-code backend.
Expand Down
2 changes: 2 additions & 0 deletions manual/manual/cmds/runtime.etex
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,8 @@ The following environment variables are also consulted:
(If "OCAMLRUNPARAM" is not set, "CAMLRUNPARAM" will be used instead.)
This variable must be a sequence of parameter specifications separated
by commas.
For convenience, commas at the beginning of the variable are ignored,
and multiple runs of commas are interpreted as a single one.
A parameter specification is an option letter followed by an "="
sign, a decimal number (or an hexadecimal number prefixed by "0x"),
and an optional multiplier. The options are documented below;
Expand Down
1 change: 1 addition & 0 deletions runtime/startup_aux.c
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ void caml_parse_ocamlrunparam(void)
case 'v': scanmult (opt, &caml_verb_gc); break;
case 'w': scanmult (opt, &caml_init_major_window); break;
case 'W': scanmult (opt, &caml_runtime_warnings); break;
case ',': continue;
}
while (*opt != '\0'){
if (*opt++ == ',') break;
Expand Down

0 comments on commit a8a2a7b

Please sign in to comment.