]> Dogcows Code - chaz/openbox/commitdiff
parse lines that start with '#' as comments
authorDana Jansens <danakj@orodu.net>
Sat, 22 Mar 2003 22:26:25 +0000 (22:26 +0000)
committerDana Jansens <danakj@orodu.net>
Sat, 22 Mar 2003 22:26:25 +0000 (22:26 +0000)
openbox/cparse.l

index c2bd008ca1b849e758c426905ee73635fd7cce7b..5a077493f8de04c080c763cfef1d2330450caf3d 100644 (file)
@@ -5,6 +5,7 @@
 static char *yyfilename;
 static int yylineno = 1;
 static gboolean haserror = FALSE;
+static gboolean comment = FALSE;
 static ConfigEntry entry = { NULL, -1 };
 
 static void stringvalue();
@@ -26,6 +27,7 @@ assign {white}={white}
 {number}/{white}\n numbervalue();
 ^{identifier}/{assign} identifier();
 \n newline();
+^# comment = TRUE;
 =
 [ \t]
 . haserror = TRUE;
@@ -34,49 +36,57 @@ assign {white}={white}
 
 static void stringvalue()
 {
-    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);
-        else
-            entry.value.string[yyleng-2] = '\0';
-    } else
-        haserror = TRUE;
+    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);
+            else
+                entry.value.string[yyleng-2] = '\0';
+        } else
+            haserror = TRUE;
+    }
 }
 
 static void numbervalue()
 {
-    if (!haserror && entry.name != NULL && (signed)entry.type < 0) {
-        entry.type = Config_Integer;
-        entry.value.integer = atoi(yytext);
-    } else
-        haserror = TRUE;
+    if (!comment) {
+        if (!haserror && entry.name != NULL && (signed)entry.type < 0) {
+            entry.type = Config_Integer;
+            entry.value.integer = atoi(yytext);
+        } else
+            haserror = TRUE;
+    }
 }
 
 static void identifier()
 {
-    entry.name = g_strdup(yytext);
-    entry.type = -1;
+    if (!comment) {
+        entry.name = g_strdup(yytext);
+        entry.type = -1;
+    }
 }
 
 static void newline()
 {
-    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_free(entry.name);
-    entry.name = NULL;
-    if (entry.type == Config_String)
-        g_free(entry.value.string);
-    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_free(entry.name);
+        entry.name = NULL;
+        if (entry.type == Config_String)
+            g_free(entry.value.string);
+        entry.type = -1;
 
-    haserror = FALSE;
+        haserror = FALSE;
+    }
     ++yylineno;
 }
 
This page took 0.02373 seconds and 4 git commands to generate.