koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some parsing problems, retab!

Browse Source
This commit is contained in:
Michael Stapelberg
2009-09-13 18:40:35 +02:00
parent 268bf71222
commit 2986636e03
3 changed files with 174 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

215
src/cfgparse.y
View File

@ -4,6 +4,7 @@
#include <xcb/xcb.h>
#include "data.h"
#include "config.h"
extern int yylex(void);
extern FILE *yyin;
@ -19,31 +20,32 @@ int yywrap() {
}
void parse_file(const char *f) {
printf("opening %s\n", f);
printf("opening %s\n", f);
if ((yyin = fopen(f, "r")) == NULL) {
perror("fopen");
exit(1);
}
if (yyparse() != 0) {
fprintf(stderr, "Could not parse configfile\n");
exit(1);
}
fclose(yyin);
perror("fopen");
exit(1);
}
if (yyparse() != 0) {
fprintf(stderr, "Could not parse configfile\n");
exit(1);
}
fclose(yyin);
}
#if 0
main()
{
yyparse();
printf("parsing done\n");
printf("parsing done\n");
}
#endif
%}
%union {
int number;
char *string;
int number;
char *string;
struct Colortriple *color;
}
%token <number>NUMBER
@ -76,146 +78,151 @@ main()
lines: /* empty */
| lines WHITESPACE line
| lines line
| lines line
;
line:
bind
| bindsym
| floating_modifier
| workspace
| assign
| set
| ipcsocket
| exec
| color
| terminal
| font
| comment
| bindsym
| floating_modifier
| workspace
| assign
| set
| ipcsocket
| exec
| color
| terminal
| font
| comment
;
comment:
TOKCOMMENT
;
TOKCOMMENT
;
command:
STR
;
STR
;
bind:
TOKBIND WHITESPACE binding_modifiers '+' NUMBER WHITESPACE command
TOKBIND WHITESPACE binding_modifiers NUMBER WHITESPACE command
{
printf("\tFound binding mod%d with key %d and command %s\n", $<number>3, $5, $<string>7);
printf("\tFound binding mod%d with key %d and command %s\n", $<number>3, $4, $<string>6);
}
;
bindsym:
TOKBINDSYM WHITESPACE binding_modifiers '+' WORD WHITESPACE command
TOKBINDSYM WHITESPACE binding_modifiers WORD WHITESPACE command
{
printf("\tFound symbolic mod%d with key %s and command %s\n", $<number>3, $5, $<string>7);
printf("\tFound symbolic mod%d with key %s and command %s\n", $<number>3, $4, $<string>6);
}
;
floating_modifier:
TOKFLOATING_MODIFIER WHITESPACE binding_modifiers
{
printf("\tfloating modifier %d\n", $<number>3);
}
;
TOKFLOATING_MODIFIER WHITESPACE binding_modifiers
{
printf("\tfloating modifier %d\n", $<number>3);
}
;
workspace:
TOKWORKSPACE WHITESPACE NUMBER WHITESPACE TOKSCREEN WHITESPACE screen
{
printf("\t workspace %d to screen %d\n", $<number>3, $<number>7);
}
| TOKWORKSPACE WHITESPACE NUMBER WHITESPACE TOKSCREEN WHITESPACE screen WHITESPACE QUOTEDSTRING
{
printf("\t quoted: %s\n", $<string>9);
}
;
TOKWORKSPACE WHITESPACE NUMBER WHITESPACE TOKSCREEN WHITESPACE screen
{
printf("\t workspace %d to screen %s\n", $<number>3, $<string>7);
}
| TOKWORKSPACE WHITESPACE NUMBER WHITESPACE TOKSCREEN WHITESPACE screen WHITESPACE workspace_name
{
printf("\t quoted: %s\n", $<string>9);
}
;
workspace_name:
QUOTEDSTRING
| STR
;
screen:
NUMBER
;
NUMBER { asprintf(&$<string>$, "%d", $<number>1); }
| NUMBER 'x' { asprintf(&$<string>$, "%d", $<number>1); }
| NUMBER 'x' NUMBER { asprintf(&$<string>$, "%dx%d", $<number>1, $<number>3); }
| 'x' NUMBER { asprintf(&$<string>$, "x%d", $<number>2); }
;
assign:
TOKASSIGN WHITESPACE window_class WHITESPACE optional_arrow NUMBER
{
printf("assignment of %s to %d\n", $<string>3, $<number>6);
}
;
TOKASSIGN WHITESPACE window_class WHITESPACE optional_arrow NUMBER
{
printf("assignment of %s to %d\n", $<string>3, $<number>6);
}
;
window_class:
QUOTEDSTRING
| STR_NG
;
QUOTEDSTRING
| STR_NG
;
optional_arrow:
/* NULL */
| TOKARROW WHITESPACE
;
/* NULL */
| TOKARROW WHITESPACE
;
set:
TOKSET WHITESPACE variable WHITESPACE STR
{
printf("set %s to %s\n", $<string>3, $<string>5);
}
;
TOKSET WHITESPACE variable WHITESPACE STR
{
printf("set %s to %s\n", $<string>3, $<string>5);
}
;
variable:
'$' WORD { asprintf(&$<string>$, "$%s", $<string>2); }
| '$' VARNAME { asprintf(&$<string>$, "$%s", $<string>2); }
;
'$' WORD { asprintf(&$<string>$, "$%s", $<string>2); }
| '$' VARNAME { asprintf(&$<string>$, "$%s", $<string>2); }
;
ipcsocket:
TOKIPCSOCKET WHITESPACE STR
{
printf("ipc %s\n", $<string>3);
}
;
TOKIPCSOCKET WHITESPACE STR
{
printf("ipc %s\n", $<string>3);
}
;
exec:
TOKEXEC WHITESPACE STR
{
printf("exec %s\n", $<string>3);
}
;
TOKEXEC WHITESPACE STR
{
printf("exec %s\n", $<string>3);
}
;
terminal:
TOKTERMINAL WHITESPACE STR
{
printf("terminal %s\n", $<string>3);
}
;
TOKTERMINAL WHITESPACE STR
{
printf("terminal %s\n", $<string>3);
}
;
font:
TOKFONT WHITESPACE STR
{
printf("font %s\n", $<string>3);
}
;
TOKFONT WHITESPACE STR
{
printf("font %s\n", $<string>3);
}
;
color:
TOKCOLOR WHITESPACE '#' HEX
{
printf("color %s\n", $<string>4);
}
;
TOKCOLOR WHITESPACE '#' HEX WHITESPACE '#' HEX WHITESPACE '#' HEX
{
printf("color %p, %s and %s and %s\n", $<color>1, $<string>4, $<string>7, $<string>10);
}
;
binding_modifiers:
binding_modifier
|
binding_modifiers '+' binding_modifier
{
$<number>$ = $<number>1 | $<number>3;
}
;
/* NULL */ { $<number>$ = 0; }
| binding_modifier
| binding_modifiers '+' binding_modifier { $<number>$ = $<number>1 | $<number>3; }
| binding_modifiers '+' { $<number>$ = $<number>1; }
;
binding_modifier:
MODIFIER { $<number>$ = $<number>1; }
| TOKCONTROL { $<number>$ = BIND_CONTROL; }
| TOKSHIFT { $<number>$ = BIND_SHIFT; }
;
MODIFIER { $<number>$ = $<number>1; }
| TOKCONTROL { $<number>$ = BIND_CONTROL; }
| TOKSHIFT { $<number>$ = BIND_SHIFT; }
;