extern int yyparse();
void yyerror(char *err);
-extern int yylineno;
+extern int lineno;
extern FILE *yyin;
static char *path;
/* in parse.c */
void parse_token(ParseToken *token);
+void parse_assign(char *name, ParseToken *token);
void parse_set_section(char *section);
%}
%%
sections:
- | sections '[' IDENTIFIER ']' { parse_set_section($3); } '\n' lines
+ | sections '[' IDENTIFIER ']' { parse_set_section($3); } '\n'
+ { ++lineno; } lines
;
lines:
- | lines tokens '\n' { t.type = $3; t.data.character = $3; parse_token(&t); }
+ | lines tokens { t.type='\n'; t.data.character='\n'; parse_token(&t); } '\n'
+ { ++lineno; }
+ | lines IDENTIFIER '=' listtoken { parse_assign($2, &t); } '\n'
+ { ++lineno; }
;
tokens:
- tokens token
- | token
+ tokens token { parse_token(&t); }
+ | token { parse_token(&t); }
;
token:
- REAL { t.type = TOKEN_REAL; t.data.real = $1; parse_token(&t); }
- | INTEGER { t.type = TOKEN_INTEGER; t.data.integer = $1;
- parse_token(&t); }
- | STRING { t.type = TOKEN_STRING; t.data.string = $1; parse_token(&t); }
- | IDENTIFIER { t.type = TOKEN_IDENTIFIER; t.data.identifier = $1;
- parse_token(&t);}
- | BOOL { t.type = TOKEN_BOOL; t.data.bool = $1; parse_token(&t); }
- | list { t.type = TOKEN_LIST; t.data.list = $1; parse_token(&t); }
- | '{' { t.type = $1; t.data.character = $1; parse_token(&t); }
- | '}' { t.type = $1; t.data.character = $1; parse_token(&t); }
- | '=' { t.type = $1; t.data.character = $1; parse_token(&t); }
- | ',' { t.type = $1; t.data.character = $1; parse_token(&t); }
+ REAL { t.type = TOKEN_REAL; t.data.real = $1; }
+ | INTEGER { t.type = TOKEN_INTEGER; t.data.integer = $1; }
+ | STRING { t.type = TOKEN_STRING; t.data.string = $1; }
+ | IDENTIFIER { t.type = TOKEN_IDENTIFIER; t.data.identifier = $1; }
+ | BOOL { t.type = TOKEN_BOOL; t.data.bool = $1; }
+ | list { t.type = TOKEN_LIST; t.data.list = $1; }
+ | '{' { t.type = $1; t.data.character = $1; }
+ | '}' { t.type = $1; t.data.character = $1; }
+ | ',' { t.type = $1; t.data.character = $1; }
;
list:
| list { t.type = TOKEN_LIST; t.data.list = $1; }
| '{' { t.type = $1; t.data.character = $1; }
| '}' { t.type = $1; t.data.character = $1; }
- | '=' { t.type = $1; t.data.character = $1; }
| ',' { t.type = $1; t.data.character = $1; }
;
%%
+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()
}
}
- yylineno = 1;
+ lineno = 1;
yyparse();