From 5cf61ee02354c1c9f80c11f3796afc4b948055d6 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Sun, 13 Apr 2003 07:18:28 +0000 Subject: move the openbox engine into librender and the kernel. the theme is loaded and stored inside librender. the frame is decorated and managed inside the kernel. --- openbox/parse.y | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'openbox/parse.y') diff --git a/openbox/parse.y b/openbox/parse.y index 125f1803..de221f9f 100644 --- a/openbox/parse.y +++ b/openbox/parse.y @@ -23,7 +23,7 @@ extern int yylex(); extern int yyparse(); void yyerror(char *err); -extern int yylineno; +extern int lineno; extern FILE *yyin; static char *path; @@ -56,14 +56,14 @@ void parse_set_section(char *section); sections: | sections '[' IDENTIFIER ']' { parse_set_section($3); } '\n' - { ++yylineno; } lines + { ++lineno; } lines ; lines: | lines tokens { t.type='\n'; t.data.character='\n'; parse_token(&t); } '\n' - { ++yylineno; } + { ++lineno; } | lines IDENTIFIER '=' listtoken { parse_assign($2, &t); } '\n' - { ++yylineno; } + { ++lineno; } ; tokens: @@ -115,8 +115,10 @@ listtoken: %% +int lineno; + void yyerror(char *err) { - g_message("%s:%d: %s", path, yylineno, err); + g_message("%s:%d: %s", path, lineno, err); } void parse_rc() @@ -134,7 +136,7 @@ void parse_rc() } } - yylineno = 1; + lineno = 1; yyparse(); -- cgit v1.2.3