Changeset 313

Timestamp:

04/28/2005 01:30:31 PM (3 years ago)

Author:

moo

Message:

change "|" to "else"

Location:

trunk

Files:

• doc/configuration.txt (modified) (1 diff)
• src/configfile.c (modified) (3 diffs)
• src/configparser.y (modified) (1 diff)
• tests/condition.conf (modified) (3 diffs)

trunk/doc/configuration.txt

@@ -75 +75 @@
     }
   }
-  | <field> <operator> <value> {
-    ... else if
+  else <field> <operator> <value> {
+    ... the "else if" block
   }
 

trunk/src/configfile.c

@@ -596 +596 @@
                         break;
 
-                case '|':
-                        t->offset++;
-                        tid = TK_OR;
-                        buffer_copy_string(token, "|");
-                        break;
-
                 case '{':
                         t->offset++;
@@ -696 +690 @@
                                                 tid = TK_INCLUDE;
                                         }
+                                        else if (strcmp(token->ptr, "else") == 0) {
+                                                tid = TK_ELSE;
+                                        }
                                         else {
                                                 tid = TK_LKEY;
@@ -718 +715 @@
                 *token_id = tid;
 #if 0
-                log_error_write(srv, __FILE__, __LINE__, "sbsdsdb", 
+                log_error_write(srv, __FILE__, __LINE__, "sbsdsdbdd", 
                                 "file:", t->file,
-                                "line:", t->line, "pos:", t->line_pos, token);
+                                "line:", t->line, "pos:", t->line_pos,
+                                token, token->used - 1, tid);
 #endif
                 

trunk/src/configparser.y

@@ -263 +263 @@
 eols ::= .
 
-condlines(A) ::= condlines(B) eols OR condline(C). {
+condlines(A) ::= condlines(B) eols ELSE condline(C). {
   assert(B->context_ndx < C->context_ndx);
   C->prev = B;

trunk/tests/condition.conf

@@ -35 +35 @@
   url.redirect = ("^" => "/match_1")
 }
-| $HTTP["host"] == "test1.example.org" {
+else $HTTP["host"] == "test1.example.org" {
   server.document-root = "/tmp/lighttpd/servers/www.example.org/pages/"
   server.name = "test1.example.org"
@@ -41 +41 @@
 }
 # comments
-| $HTTP["host"] == "test2.example.org" {
+else $HTTP["host"] == "test2.example.org" {
   server.document-root = "/tmp/lighttpd/servers/www.example.org/pages/"
   server.name = "test2.example.org"
@@ -49 +49 @@
          # comments
 
-| $HTTP["host"] == "test3.example.org" {
+else $HTTP["host"] == "test3.example.org" {
   server.document-root = "/tmp/lighttpd/servers/www.example.org/pages/"
   server.name = "test3.example.org"