Sync Lexbor

Author: nielsdos

ext/dom/lexbor/lexbor/css/base.h

@@ -18,7 +18,7 @@ extern "C" {
 
 
 #define LXB_CSS_VERSION_MAJOR 1
-#define LXB_CSS_VERSION_MINOR 1
+#define LXB_CSS_VERSION_MINOR 2
 #define LXB_CSS_VERSION_PATCH 0
 
 #define LXB_CSS_VERSION_STRING                                                 \

ext/dom/lexbor/lexbor/css/selectors/base.h

@@ -16,7 +16,7 @@ extern "C" {
 
 
 #define LXB_CSS_SELECTORS_VERSION_MAJOR 1
-#define LXB_CSS_SELECTORS_VERSION_MINOR 0
+#define LXB_CSS_SELECTORS_VERSION_MINOR 1
 #define LXB_CSS_SELECTORS_VERSION_PATCH 0
 
 #define LXB_CSS_SELECTORS_VERSION_STRING                                       \

ext/dom/lexbor/lexbor/css/selectors/state.c

@@ -742,12 +742,14 @@ lxb_css_selectors_state_compound_handler(lxb_css_parser_t *parser,
             goto unexpected;
     }
 
+    if (status == LXB_STATUS_OK) {
+        return true;
+    }
+
     if (status == LXB_STATUS_ERROR_MEMORY_ALLOCATION) {
         return lxb_css_parser_memory_fail(parser);
     }
 
-    return true;
-
 unexpected:
 
     (void) lxb_css_parser_states_to_root(parser);
@@ -827,11 +829,15 @@ lxb_css_selectors_state_compound_sub(lxb_css_parser_t *parser,
             return lxb_css_parser_states_set_back(parser);
     }
 
+    if (status == LXB_STATUS_OK) {
+        return true;
+    }
+
     if (status == LXB_STATUS_ERROR_MEMORY_ALLOCATION) {
         return lxb_css_parser_memory_fail(parser);
     }
 
-    return true;
+    return lxb_css_parser_unexpected(parser);
 }
 
 static bool
@@ -874,11 +880,15 @@ lxb_css_selectors_state_compound_pseudo(lxb_css_parser_t *parser,
                                        lxb_css_selectors_state_compound_pseudo);
     }
 
+    if (status == LXB_STATUS_OK) {
+        return true;
+    }
+
     if (status == LXB_STATUS_ERROR_MEMORY_ALLOCATION) {
         return lxb_css_parser_memory_fail(parser);
     }
 
-    return true;
+    return lxb_css_parser_unexpected(parser);
 }
 
 /*
@@ -1015,12 +1025,14 @@ lxb_css_selectors_state_simple_handler(lxb_css_parser_t *parser,
             goto unexpected;
     }
 
+    if (status == LXB_STATUS_OK) {
+        return true;
+    }
+
     if (status == LXB_STATUS_ERROR_MEMORY_ALLOCATION) {
         return lxb_css_parser_memory_fail(parser);
     }
 
-    return true;
-
 unexpected:
 
     (void) lxb_css_parser_states_set_back(parser);
@@ -1224,7 +1236,10 @@ lxb_css_selectors_state_attribute(lxb_css_parser_t *parser)
             lxb_css_parser_token_status_m(parser, token);
 
             if (token->type != LXB_CSS_SYNTAX_TOKEN_IDENT) {
-                goto failed;
+                attribute = &selector->u.attribute;
+                attribute->match = LXB_CSS_SELECTOR_MATCH_DASH;
+
+                goto assignment;
             }
 
             selector->ns = selector->name;
@@ -1282,20 +1297,23 @@ lxb_css_selectors_state_attribute(lxb_css_parser_t *parser)
             lxb_css_syntax_parser_consume(parser);
             lxb_css_parser_token_status_m(parser, token);
 
-            if (token->type != LXB_CSS_SYNTAX_TOKEN_DELIM
-                || lxb_css_syntax_token_delim_char(token) != '=')
-            {
-                goto failed;
-            }
-
-            lxb_css_syntax_parser_consume(parser);
-            lxb_css_parser_token_status_wo_ws_m(parser, token);
             break;
 
         default:
             goto failed;
     }
 
+assignment:
+
+    if (token->type != LXB_CSS_SYNTAX_TOKEN_DELIM
+        || lxb_css_syntax_token_delim_char(token) != '=')
+    {
+        goto failed;
+    }
+
+    lxb_css_syntax_parser_consume(parser);
+    lxb_css_parser_token_status_wo_ws_m(parser, token);
+
 string_or_ident:
 
     if (token->type != LXB_CSS_SYNTAX_TOKEN_STRING
@@ -1861,18 +1879,17 @@ lxb_css_selectors_state_list_end(lxb_css_parser_t *parser,
     lxb_css_parser_state_t *states;
     lxb_css_selectors_t *selectors = parser->selectors;
 
-    if (token->type == LXB_CSS_SYNTAX_TOKEN_WHITESPACE) {
-        lxb_css_syntax_parser_consume(parser);
-        lxb_css_parser_token_status_m(parser, token);
-    }
-
     if (lxb_css_parser_is_failed(parser)) {
         token = lxb_css_selectors_state_function_error(parser, token);
         if (token == NULL) {
             return lxb_css_parser_fail(parser,
                                        LXB_STATUS_ERROR_MEMORY_ALLOCATION);
         }
     }
+    else if (token->type == LXB_CSS_SYNTAX_TOKEN_WHITESPACE) {
+        lxb_css_syntax_parser_consume(parser);
+        lxb_css_parser_token_status_m(parser, token);
+    }
 
     if (selectors->parent != NULL && selectors->list_last &&
         selectors->list_last->prev != NULL)

ext/dom/lexbor/lexbor/selectors-adapted/selectors.c

@@ -3,7 +3,7 @@
  *
  * Author: Alexander Borisov <[email protected]>
  * Adapted for PHP + libxml2 by: Niels Dossche <[email protected]>
- * Based on https://github.com/lexbor/lexbor/blob/795126188f8df25ed1f5fc8ed368bdd5110a8045/source/lexbor/selectors/selectors.c Lexbor 2.4.0
+ * Based on https://github.com/lexbor/lexbor/blob/80e0bd7a6e08b856e436e1f4fbc986945e73c8be/source/lexbor/selectors/selectors.c Lexbor 2.4.0
  */
 
 #include "lexbor/selectors-adapted/selectors.h"