-/* $OpenBSD: parse.y,v 1.8 2015/07/21 16:12:04 tedu Exp $ */
+/* $OpenBSD: parse.y,v 1.9 2015/07/22 20:15:24 zhuk Exp $ */
/*
* Copyright (c) 2015 Ted Unangst <tedu@openbsd.org>
*
};
const char *str;
};
+ int lineno;
+ int colno;
} yystype;
#define YYSTYPE yystype
struct rule **rules;
int nrules, maxrules;
+int parse_errors = 0;
void yyerror(const char *, ...);
int yylex(void);
grammar: /* empty */
| grammar '\n'
| grammar rule '\n'
+ | error '\n'
;
rule: action ident target cmd {
$$.options = $1.options | $2.options;
$$.envlist = $1.envlist;
if ($2.envlist) {
- if ($$.envlist)
- errx(1, "can't have two keepenv sections");
- else
+ if ($$.envlist) {
+ yyerror("can't have two keepenv sections");
+ YYERROR;
+ } else
$$.envlist = $2.envlist;
}
} ;
va_list va;
va_start(va, fmt);
- verrx(1, fmt, va);
+ vfprintf(stderr, fmt, va);
+ va_end(va);
+ fprintf(stderr, " at line %d\n", yylval.lineno + 1);
+ parse_errors++;
}
struct keyword {
int
yylex(void)
{
- static int colno = 1, lineno = 1;
-
char buf[1024], *ebuf, *p, *str;
- int i, c, quotes = 0, escape = 0, qpos = 0, nonkw = 0;
+ int i, c, quotes = 0, escape = 0, qpos = -1, nonkw = 0;
p = buf;
ebuf = buf + sizeof(buf);
repeat:
/* skip whitespace first */
for (c = getc(yyfp); c == ' ' || c == '\t'; c = getc(yyfp))
- colno++;
+ yylval.colno++;
/* check for special one-character constructions */
switch (c) {
case '\n':
- colno = 1;
- lineno++;
+ yylval.colno = 0;
+ yylval.lineno++;
/* FALLTHROUGH */
case '{':
case '}':
while ((c = getc(yyfp)) != '\n')
if (c == EOF)
return 0;
- colno = 1;
- lineno++;
+ yylval.colno = 0;
+ yylval.lineno++;
return c;
case EOF:
return 0;
}
/* parsing next word */
- for (;; c = getc(yyfp), colno++) {
+ for (;; c = getc(yyfp), yylval.colno++) {
switch (c) {
case '\0':
- yyerror("unallowed character NUL at "
- "line %d, column %d", lineno, colno);
+ yyerror("unallowed character NUL in column %d", yylval.colno + 1);
escape = 0;
continue;
case '\\':
break;
case '\n':
if (quotes)
- yyerror("unterminated quotes at line %d, column %d",
- lineno, qpos);
+ yyerror("unterminated quotes in column %d",
+ qpos + 1);
if (escape) {
nonkw = 1;
escape = 0;
goto eow;
case EOF:
if (escape)
- yyerror("unterminated escape at line %d, column %d",
- lineno, colno - 1);
+ yyerror("unterminated escape in column %d",
+ yylval.colno);
if (quotes)
- yyerror("unterminated quotes at line %d, column %d",
- lineno, qpos);
+ yyerror("unterminated quotes in column %d",
+ qpos + 1);
+ goto eow;
/* FALLTHROUGH */
case '{':
case '}':
quotes = !quotes;
if (quotes) {
nonkw = 1;
- qpos = colno;
+ qpos = yylval.colno;
}
continue;
}
}
*p++ = c;
if (p == ebuf)
- yyerror("too long line %d", lineno);
+ yyerror("too long line");
escape = 0;
}
*/
if (c == EOF)
return 0;
- else if (!qpos) /* accept, e.g., empty args: cmd foo args "" */
+ else if (qpos == -1) /* accept, e.g., empty args: cmd foo args "" */
goto repeat;
}
if (!nonkw) {