summaryrefslogtreecommitdiff
path: root/src/getargs.c
diff options
context:
space:
mode:
authorAkim Demaille <akim.demaille@gmail.com>2020-05-22 20:35:13 +0200
committerAkim Demaille <akim.demaille@gmail.com>2020-05-22 20:35:13 +0200
commit339d11badff940924b21a2f733632fb3bce4062e (patch)
treee5703a6033a810481398d76d3ac45453763f87c5 /src/getargs.c
parent99260caef92a5322628c0f9ebef905d4f1139d69 (diff)
parentf80890c4bb8e02a47e115dc68797cd33fcc97bef (diff)
downloadbison-339d11badff940924b21a2f733632fb3bce4062e.tar.gz
Merge maint into master
* upstream/maint: fix generated comments traces: provide a means to get short m4 traces traces: show the full m4 invocation
Diffstat (limited to 'src/getargs.c')
-rw-r--r--src/getargs.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/getargs.c b/src/getargs.c
index 2c65e7b5..cee488c2 100644
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -257,7 +257,8 @@ static const argmatch_trace_doc argmatch_trace_docs[] =
{ "sets", "grammar sets: firsts, nullable etc." },
{ "muscles", "m4 definitions passed to the skeleton" },
{ "tools", "m4 invocation" },
- { "m4", "m4 traces" },
+ { "m4-early", "m4 traces starting from the start" },
+ { "m4", "m4 traces starting from the skeleton evaluation" },
{ "skeleton", "skeleton postprocessing" },
{ "time", "time consumption" },
{ "ielr", "IELR conversion" },
@@ -280,6 +281,7 @@ static const argmatch_trace_arg argmatch_trace_args[] =
{ "sets", trace_sets },
{ "muscles", trace_muscles },
{ "tools", trace_tools },
+ { "m4-early", trace_m4_early },
{ "m4", trace_m4 },
{ "skeleton", trace_skeleton },
{ "time", trace_time },