summaryrefslogtreecommitdiffstats
path: root/lexer
diff options
context:
space:
mode:
authorDave Davenport <qball@gmpclient.org>2017-01-09 18:32:26 +0100
committerDave Davenport <qball@gmpclient.org>2017-01-09 18:32:26 +0100
commit854aa554533fcb5f93559220b474043f28ce45d4 (patch)
tree1bb409371616df3162cc4dae62ed3ddf90b80a1e /lexer
parenta199fa3275c2bf2dfe6320de1410266ac626c6db (diff)
Better error reporting (1)
Diffstat (limited to 'lexer')
-rw-r--r--lexer/theme-lexer.l1
-rw-r--r--lexer/theme-parser.y19
2 files changed, 10 insertions, 10 deletions
diff --git a/lexer/theme-lexer.l b/lexer/theme-lexer.l
index c9a8c152..117cf6f1 100644
--- a/lexer/theme-lexer.l
+++ b/lexer/theme-lexer.l
@@ -342,7 +342,6 @@ if ( queue == NULL ){
return T_ERROR;
}
<*>. {
- fprintf(stderr, "Invalid character: '%c'\n", *yytext);
return T_ERROR;
}
diff --git a/lexer/theme-parser.y b/lexer/theme-parser.y
index 074a90c8..fa1d8e94 100644
--- a/lexer/theme-parser.y
+++ b/lexer/theme-parser.y
@@ -33,7 +33,8 @@ int yylex (YYSTYPE *, YYLTYPE *);
Distance distance;
}
-%token <ival> T_ERROR "error from file parser"
+%token <ival> T_END 0 "end of file"
+%token <ival> T_ERROR 1 "error from file parser"
%token <ival> T_INT
%token <fval> T_DOUBLE
%token <sval> T_STRING
@@ -47,14 +48,14 @@ int yylex (YYSTYPE *, YYLTYPE *);
%token <sval> T_LINK
%token <sval> FIRST_NAME
-%token BOPEN "bracket open";
-%token BCLOSE "bracket close";
-%token PSEP "property separator";
-%token PCLOSE "property close";
-%token NSEP "Name separator";
-%token NAME_PREFIX "Name element prefix ('#')";
-%token WHITESPACE "White space";
-%token PDEFAULTS "Default settings section ( '* { ... }')";
+%token BOPEN "bracket open"
+%token BCLOSE "bracket close"
+%token PSEP "property separator"
+%token PCLOSE "property close"
+%token NSEP "Name separator"
+%token NAME_PREFIX "Name element prefix ('#')"
+%token WHITESPACE "White space"
+%token PDEFAULTS "Default settings section ( '* { ... }')"
%type <ival> highlight_styles
%type <sval> entry