diff options
| author | okan <okan> | 2021-12-24 16:00:47 +0000 |
|---|---|---|
| committer | okan <okan> | 2021-12-24 16:00:47 +0000 |
| commit | 81a08ddb896dacfe2c7b2e9cad43a8f623fadd24 (patch) | |
| tree | d6ced2d44639e8e6eb9353e2e57dd2ba92beade4 | |
| parent | a9eeb04606b8002d41b2ad5bc715ec7253f2e77a (diff) | |
| download | cwm-81a08ddb896dacfe2c7b2e9cad43a8f623fadd24.tar.gz cwm-81a08ddb896dacfe2c7b2e9cad43a8f623fadd24.tar.xz cwm-81a08ddb896dacfe2c7b2e9cad43a8f623fadd24.zip | |
Allow bare numbers for key and mouse bindings; taken from similar
support in other parse.y's; from Leon Fischer <lfischer@airmail.cc>.
| -rw-r--r-- | parse.y | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/parse.y b/parse.y index a406f39..a451da5 100644 --- a/parse.y +++ b/parse.y @@ -81,7 +81,7 @@ typedef struct { %token <v.string> STRING %token <v.number> NUMBER %type <v.number> yesno -%type <v.string> string +%type <v.string> string numberstring %% grammar : /* empty */ @@ -104,6 +104,17 @@ string : string STRING { | STRING ; +numberstring : NUMBER { + char *s; + if (asprintf(&s, "%lld", $1) == -1) { + yyerror("string: asprintf"); + YYERROR; + } + $$ = s; + } + | STRING + ; + yesno : YES { $$ = 1; } | NO { $$ = 0; } ; @@ -209,7 +220,7 @@ main : FONTNAME STRING { conf->gap.left = $4; conf->gap.right = $5; } - | BINDKEY STRING string { + | BINDKEY numberstring string { if (!conf_bind_key(conf, $2, $3)) { yyerror("invalid bind-key: %s %s", $2, $3); free($2); @@ -219,7 +230,7 @@ main : FONTNAME STRING { free($2); free($3); } - | UNBINDKEY STRING { + | UNBINDKEY numberstring { if (!conf_bind_key(conf, $2, NULL)) { yyerror("invalid unbind-key: %s", $2); free($2); @@ -227,7 +238,7 @@ main : FONTNAME STRING { } free($2); } - | BINDMOUSE STRING string { + | BINDMOUSE numberstring string { if (!conf_bind_mouse(conf, $2, $3)) { yyerror("invalid bind-mouse: %s %s", $2, $3); free($2); @@ -237,7 +248,7 @@ main : FONTNAME STRING { free($2); free($3); } - | UNBINDMOUSE STRING { + | UNBINDMOUSE numberstring { if (!conf_bind_mouse(conf, $2, NULL)) { yyerror("invalid unbind-mouse: %s", $2); free($2); |