X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fcparse.l;h=70524007b91f1628ec461e3bcb07f3d08b5e9be4;hb=5c472be0b312243b7ef705c84ef42f6560537e04;hp=3f362668d48520f0e25a9cb7321499030856b4e1;hpb=ddb5d43edc8bb35dadaa83fc3b516a43c1674cc9;p=chaz%2Fopenbox

diff --git a/openbox/cparse.l b/openbox/cparse.l
index 3f362668..70524007 100644
--- a/openbox/cparse.l
+++ b/openbox/cparse.l
@@ -2,8 +2,8 @@
 #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 };
@@ -13,7 +13,7 @@ static void numbervalue();
 static void boolvalue();
 static void identifier();
 static void newline();
-static int yywrap();
+static int cparsewrap();
 %}
 
 number [0-9]+
@@ -25,7 +25,7 @@ bool ([tT][rR][uU][eE]|[fF][aA][lL][sS][eE]|[yY][eE][sS]|[nN][oO]|[oO][nN]|[oO][
 
 %%
 
-^# comment = TRUE;
+^{white}# comment = TRUE;
 {bool}/{white}\n boolvalue();
 {string}/{white}\n stringvalue();
 {number}/{white}\n numbervalue();
@@ -42,12 +42,12 @@ static void stringvalue()
     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;
     }
@@ -58,7 +58,7 @@ static void numbervalue()
     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;
     }
@@ -69,9 +69,9 @@ static void boolvalue()
     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;
     }
@@ -80,7 +80,7 @@ static void boolvalue()
 static void identifier()
 {
     if (!comment) {
-        entry.name = g_strdup(yytext);
+        entry.name = g_strdup(cparsetext);
         entry.type = -1;
     }
 }
@@ -90,10 +90,10 @@ static void newline()
     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;
@@ -104,10 +104,10 @@ static void newline()
         haserror = FALSE;
     }
     comment = FALSE;
-    ++yylineno;
+    ++lineno;
 }
 
-static int yywrap()
+static int cparsewrap()
 {
     g_free(entry.name);
     entry.name = NULL;
@@ -116,9 +116,9 @@ static int yywrap()
     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();
 }