joepie91/pegjs
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Rename the "global" module format to "globals"

Browse source 
I think the new name is more widely used when describing the pattern.
This commit is contained in:
David Majda 2016-08-06 17:51:49 +02:00
parent 0478f8a6cf
commit 8962dcfd16
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
README.md
View file

@ -100,7 +100,7 @@ You can tweak the generated parser with several options:
`peg.generate`
* `--extra-options-file` — file with additional options (in JSON format) to
pass to `peg.generate`
* `--format` — format of the generated parser: `amd`, `global`, `node`, `umd`
* `--format` — format of the generated parser: `amd`, `globals`, `node`, `umd`
(default: `node`)
* `--optimize` — selects between optimizing the generated parser for parsing
speed (`speed`) or code size (`size`) (default: `speed`)
@ -146,8 +146,8 @@ object to `peg.generate`. The following options are supported:
`"umd"` (default: `{}`)
* `exportVar` — name of a global variable into which the parser object is
assigned to when no module loader is detected; valid only when `format` is
set to `"global"` or `"umd"` (default: `null`)
* `format` — format of the genreated parser (`"amd"`, `"bare"`, `"global"`,
set to `"globals"` or `"umd"` (default: `null`)
* `format` — format of the genreated parser (`"amd"`, `"bare"`, `"globals"`,
`"node"`, or `"umd"`); valid only when `output` is set to `"source"`
(default: `"bare"`)
* `optimize`— selects between optimizing the generated parser for parsing

10
bin/pegjs
View file

@ -31,8 +31,8 @@ function printHelp() {
console.log(" to peg.generate");
console.log(" --extra-options-file <file> file with additional options (in JSON");
console.log(" format) to pass to peg.generate");
console.log(" --format <format> format of the generated parser: amd, global,");
console.log(" node, umd (default: node)");
console.log(" --format <format> format of the generated parser: amd,");
console.log(" globals, node, umd (default: node)");
console.log(" -h, --help print help and exit");
console.log(" -O, --optimize <goal> select optimization for speed or size");
console.log(" (default: speed)");
@ -186,8 +186,8 @@ while (args.length > 0 && isOption(args[0])) {
if (args.length === 0) {
abort("Missing parameter of the --format option.");
}
if (args[0] !== "amd" && args[0] !== "global" && args[0] !== "node" && args[0] !== "umd") {
abort("Module format must be one of \"amd\", \"global\", \"node\", and \"umd\".");
if (args[0] !== "amd" && args[0] !== "globals" && args[0] !== "node" && args[0] !== "umd") {
abort("Module format must be one of \"amd\", \"globals\", \"node\", and \"umd\".");
}
options.format = args[0];
break;
@ -263,7 +263,7 @@ if (objects.keys(options.dependencies).length > 0) {
}
if (options.exportVar !== null) {
if (options.format !== "global" && options.format !== "umd") {
if (options.format !== "globals" && options.format !== "umd") {
abort("Can't use the -e/--export-var option with the \"" + options.format + "\" module format.");
}
}

2
lib/compiler/passes/generate-js.js
View file

@ -1323,7 +1323,7 @@ function generateJS(ast, options) {
].join('\n');
},
global: function() {
globals: function() {
return [
generateGeneratedByComment(),
'(function(root) {',