r6104 jmb - /trunk/libcss/src/parse/properties.c

[netsurf]

Author: jmb
Date: Fri Jan 16 17:12:43 2009
New Revision: 6104

URL: http://source.netsurf-browser.org?rev=6104&view=rev
Log:
Fix cursor: parsing

Modified:
    trunk/libcss/src/parse/properties.c

Modified: trunk/libcss/src/parse/properties.c
URL: 
http://source.netsurf-browser.org/trunk/libcss/src/parse/properties.c?rev=6104&r1=6103&r2=6104&view=diff
==============================================================================
--- trunk/libcss/src/parse/properties.c (original)
+++ trunk/libcss/src/parse/properties.c Fri Jan 16 17:12:43 2009
@@ -2046,7 +2046,7 @@
        int temp_ctx = *ctx;
        uint8_t *ptr;
 
-       /* [ URI* IDENT(auto, crosshair, default, pointer, move, e-resize,
+       /* [ (URI ',')* IDENT(auto, crosshair, default, pointer, move, e-resize,
         *              ne-resize, nw-resize, n-resize, se-resize, sw-resize,
         *              s-resize, w-resize, text, wait, help, progress) ] 
         * | IDENT(inherit) 
@@ -2077,14 +2077,20 @@
 
                        consumeWhitespace(vector, &temp_ctx);
 
-                       token = parserutils_vector_peek(vector, temp_ctx);
-                       if (token != NULL && tokenIsChar(token, '!')) {
-                               break;
-                       }
+                       /* Expect ',' */
+                       token = parserutils_vector_iterate(vector, &temp_ctx);
+                       if (token == NULL || tokenIsChar(token, ',') == false)
+                               return CSS_INVALID;
+
+                       consumeWhitespace(vector, &temp_ctx);
+
+                       /* Expect either URI or IDENT */
+                       token = parserutils_vector_iterate(vector, &temp_ctx);
+                       if (token == NULL || (token->type != CSS_TOKEN_IDENT &&
+                                       token->type != CSS_TOKEN_URI))
+                               return CSS_INVALID;
 
                        first = false;
-
-                       token = parserutils_vector_iterate(vector, &temp_ctx);
                }
 
                /* IDENT */
@@ -2216,14 +2222,20 @@
 
                        consumeWhitespace(vector, ctx);
 
-                       token = parserutils_vector_peek(vector, *ctx);
-                       if (token != NULL && tokenIsChar(token, '!')) {
-                               break;
-                       }
+                       /* Expect ',' */
+                       token = parserutils_vector_iterate(vector, ctx);
+                       if (token == NULL || tokenIsChar(token, ',') == false)
+                               return CSS_INVALID;
+
+                       consumeWhitespace(vector, ctx);
+
+                       /* Expect either URI or IDENT */
+                       token = parserutils_vector_iterate(vector, ctx);
+                       if (token == NULL || (token->type != CSS_TOKEN_IDENT &&
+                                       token->type != CSS_TOKEN_URI))
+                               return CSS_INVALID;
 
                        first = false;
-
-                       token = parserutils_vector_iterate(vector, ctx);
                }
 
                /* IDENT */


_______________________________________________
netsurf-commits mailing list
netsurf-commits@netsurf-browser.org
http://vlists.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org