From 9f62d3c7a9f14f07b75a558ee4835ff3bfe0e90b Mon Sep 17 00:00:00 2001 From: Bruce Hill Date: Wed, 16 Sep 2020 22:39:33 -0700 Subject: Changed arg parsing to '-d foo:baz' for consistency (was: '-d foo=baz') --- README.md | 4 ++-- bpeg.1 | 8 ++++---- bpeg.c | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 75458d6..952be7b 100644 --- a/README.md +++ b/README.md @@ -10,8 +10,8 @@ It's written in pure C with no dependencies. * `-h` `--help` print the usage and quit * `-v` `--verbose` print verbose debugging info * `-i` `--ignore-case` perform a case-insensitive match -* `-d` `--define =` define a grammar rule -* `-D` `--define-string =` define a grammar rule (string-pattern) +* `-d` `--define :` define a grammar rule +* `-D` `--define-string :` define a grammar rule (string-pattern) * `-p` `--pattern ` provide a pattern (equivalent to bpeg ' * `-P` `--pattern-string ` provide a string pattern (equivalent to bpeg '', but may be useful if '' begins with a '-') * `-r` `--replace ` replace the input pattern with the given replacement diff --git a/bpeg.1 b/bpeg.1 index 1b5fe59..a55849c 100644 --- a/bpeg.1 +++ b/bpeg.1 @@ -10,8 +10,8 @@ bpeg \- Bruce's Parsing Expression Grammar tool [\fI-i\fR|\fI--ignore-case\fR \fI\fR] [\fI-p\fR|\fI--pattern\fR \fI\fR] [\fI-P\fR|\fI--pattern-string\fR \fI\fR] -[\fI-d\fR|\fI--define\fR \fI\fR=\fI\fR] -[\fI-D\fR|\fI--define-string\fR \fI\fR=\fI\fR] +[\fI-d\fR|\fI--define\fR \fI\fR:\fI\fR] +[\fI-D\fR|\fI--define-string\fR \fI\fR:\fI\fR] [\fI-r\fR|\fI--replace\fR \fI\fR] [\fI-g\fR|\fI--grammar\fR \fI\fR] [\fI-m\fR|\fI--mode\fR \fI\fR] @@ -26,10 +26,10 @@ Print debugging information. .B \-i\fR, \fB--ignore-case Perform pattern matching case-insensitively. -.B \-d\fR, \fB--define \fI\fR=\fI\fR +.B \-d\fR, \fB--define \fI\fR:\fI\fR Define a grammar rule using a bpeg pattern. -.B \-D\fR, \fB--define-string \fI\fR=\fI\fR +.B \-D\fR, \fB--define-string \fI\fR:\fI\fR Define a grammar rule using a bpeg string pattern. .B \-r\fR, \fB--replace \fI\fR diff --git a/bpeg.c b/bpeg.c index 9c5a23e..55c2e98 100644 --- a/bpeg.c +++ b/bpeg.c @@ -25,8 +25,8 @@ static const char *usage = ( " -h --help print the usage and quit\n" " -v --verbose print verbose debugging info\n" " -i --ignore-case preform matching case-insensitively\n" - " -d --define = define a grammar rule\n" - " -D --define-string = define a grammar rule (string-pattern)\n" + " -d --define : define a grammar rule\n" + " -D --define-string : define a grammar rule (string-pattern)\n" " -p --pattern provide a pattern (equivalent to bpeg '\\()')\n" " -P --pattern-string provide a string pattern (may be useful if '' begins with a '-')\n" " -r --replace replace the input pattern with the given replacement\n" @@ -114,8 +114,8 @@ int main(int argc, char *argv[]) load_grammar(g, f); // Keep in memory for debug output } else if (FLAG("--define") || FLAG("-d")) { char *def = flag; - char *eq = strchr(def, '='); - check(eq, "Rule definitions must include an '='\n\n%s", usage); + char *eq = strchr(def, ':'); + check(eq, "Rule definitions must include an ':'\n\n%s", usage); *eq = '\0'; char *src = ++eq; vm_op_t *pat = bpeg_pattern(NULL, src); @@ -123,8 +123,8 @@ int main(int argc, char *argv[]) add_def(g, NULL, src, def, pat); } else if (FLAG("--define-string") || FLAG("-D")) { char *def = flag; - char *eq = strchr(def, '='); - check(eq, "Rule definitions must include an '='\n\n%s", usage); + char *eq = strchr(def, ':'); + check(eq, "Rule definitions must include an ':'\n\n%s", usage); *eq = '\0'; char *src = ++eq; vm_op_t *pat = bpeg_stringpattern(NULL, src); -- cgit v1.2.3