#include <glib.h>
#include "config.h"
-static char *yyfilename;
-static int yylineno = 1;
+static char *filename;
+static int lineno = 1;
static gboolean haserror = FALSE;
static gboolean comment = FALSE;
static ConfigEntry entry = { NULL, -1 };
static void boolvalue();
static void identifier();
static void newline();
-static int yywrap();
+static int cparsewrap();
%}
number [0-9]+
%%
-^# comment = TRUE;
+^{white}# comment = TRUE;
{bool}/{white}\n boolvalue();
{string}/{white}\n stringvalue();
{number}/{white}\n numbervalue();
if (!comment) {
if (!haserror && entry.name != NULL && (signed)entry.type < 0) {
entry.type = Config_String;
- entry.value.string = g_strdup(yytext+1); /* drop the left quote */
- if (entry.value.string[yyleng-2] != '"')
- printf("warning: improperly terminated string on line %d\n",
- yylineno);
+ entry.value.string = g_strdup(cparsetext+1); /* drop the left quote */
+ if (entry.value.string[cparseleng-2] != '"')
+ g_warning("improperly terminated string on line %d",
+ lineno);
else
- entry.value.string[yyleng-2] = '\0';
+ entry.value.string[cparseleng-2] = '\0';
} else
haserror = TRUE;
}
if (!comment) {
if (!haserror && entry.name != NULL && (signed)entry.type < 0) {
entry.type = Config_Integer;
- entry.value.integer = atoi(yytext);
+ entry.value.integer = atoi(cparsetext);
} else
haserror = TRUE;
}
if (!comment) {
if (!haserror && entry.name != NULL && (signed)entry.type < 0) {
entry.type = Config_Bool;
- entry.value.bool = (!g_ascii_strcasecmp("true", yytext) ||
- !g_ascii_strcasecmp("yes", yytext) ||
- !g_ascii_strcasecmp("on", yytext));
+ entry.value.bool = (!g_ascii_strcasecmp("true", cparsetext) ||
+ !g_ascii_strcasecmp("yes", cparsetext) ||
+ !g_ascii_strcasecmp("on", cparsetext));
} else
haserror = TRUE;
}
static void identifier()
{
if (!comment) {
- entry.name = g_strdup(yytext);
+ entry.name = g_strdup(cparsetext);
entry.type = -1;
}
}
if (!comment) {
if (!haserror && entry.name != NULL && (signed)entry.type >= 0) {
if (!config_set(entry.name, entry.type, entry.value))
- g_warning("Invalid option in '%s': '%s'\n",
- yyfilename, entry.name);
- } else {
- printf("Parser error in '%s' on line %d\n", yyfilename, yylineno);
+ g_warning("Parser error in '%s' on line %d\n", filename,
+ lineno);
+ } else if (haserror || entry.name != NULL || (signed)entry.type >= 0) {
+ g_warning("Parser error in '%s' on line %d", filename, lineno);
}
g_free(entry.name);
entry.name = NULL;
haserror = FALSE;
}
comment = FALSE;
- ++yylineno;
+ ++lineno;
}
-static int yywrap()
+static int cparsewrap()
{
g_free(entry.name);
entry.name = NULL;
return 1;
}
-void cparse_go(char *filename, FILE *file)
+void cparse_go(char *fname, FILE *file)
{
- yyfilename = filename;
- yyin = file;
- yylex();
+ filename = fname;
+ cparsein = file;
+ cparselex();
}