nokogiri 1.8.2 → 1.8.3

data/ext/nokogiri/xml_cdata.c

@@ -17,15 +17,17 @@ static VALUE new(int argc, VALUE *argv, VALUE klass)
   VALUE content;
   VALUE rest;
   VALUE rb_node;
-  const xmlChar *content_str;
-  int content_str_len;
+  xmlChar *content_str = NULL;
+  int content_str_len = 0;
 
   rb_scan_args(argc, argv, "2*", &doc, &content, &rest);
 
   Data_Get_Struct(doc, xmlDoc, xml_doc);
 
-  content_str = NIL_P(content) ? NULL : (const xmlChar *)StringValueCStr(content);
-  content_str_len = (content_str == NULL) ? 0 : strlen(content_str);
+  if (!NIL_P(content)) {
+    content_str = (xmlChar *)StringValuePtr(content);
+    content_str_len = RSTRING_LEN(content);
+  }
 
   node = xmlNewCDataBlock(xml_doc->doc, content_str, content_str_len);
 

data/ext/nokogiri/xml_document.c

@@ -179,7 +179,7 @@ static VALUE set_encoding(VALUE self, VALUE encoding)
   Data_Get_Struct(self, xmlDoc, doc);
 
   if (doc->encoding)
-      free((char *) doc->encoding); /* this may produce a gcc cast warning */
+      free((char *)(uintptr_t) doc->encoding); /* avoid gcc cast warning */
 
   doc->encoding = xmlStrdup((xmlChar *)StringValueCStr(encoding));
 
@@ -531,8 +531,7 @@ static VALUE canonicalize(int argc, VALUE* argv, VALUE self)
     ns = calloc((size_t)ns_len+1, sizeof(xmlChar *));
     for (i = 0 ; i < ns_len ; i++) {
       VALUE entry = rb_ary_entry(incl_ns, i);
-      const char * ptr = StringValueCStr(entry);
-      ns[i] = (xmlChar*) ptr;
+      ns[i] = (xmlChar*)StringValueCStr(entry);
     }
   }
 

data/ext/nokogiri/xml_dtd.c

@@ -1,6 +1,6 @@
 #include <xml_dtd.h>
 
-static void notation_copier(void *payload, void *data, xmlChar *name)
+static void notation_copier(void *payload, void *data, const xmlChar *name)
 {
   VALUE hash = (VALUE)data;
   VALUE klass = rb_const_get(mNokogiriXml, rb_intern("Notation"));
@@ -17,7 +17,7 @@ static void notation_copier(void *payload, void *data, xmlChar *name)
   rb_hash_aset(hash, NOKOGIRI_STR_NEW2(name),notation);
 }
 
-static void element_copier(void *_payload, void *data, xmlChar *name)
+static void element_copier(void *_payload, void *data, const xmlChar *name)
 {
   VALUE hash = (VALUE)data;
   xmlNodePtr payload = (xmlNodePtr)_payload;

data/ext/nokogiri/xml_io.c

@@ -21,6 +21,7 @@ int io_read_callback(void * ctx, char * buffer, int len) {
 
   if (NIL_P(string)) return 0;
   if (string == Qundef) return -1;
+  if (TYPE(string) != T_STRING) return -1;
 
   str_len = (size_t)RSTRING_LEN(string);
   safe_len = str_len > (size_t)len ? (size_t)len : str_len;

data/ext/nokogiri/xml_namespace.c

@@ -14,22 +14,16 @@ static void dealloc_namespace(xmlNsPtr ns)
    */
   NOKOGIRI_DEBUG_START(ns) ;
   if (ns->href) {
-    xmlFree((xmlChar *)ns->href);
+    xmlFree((xmlChar *)(uintptr_t)ns->href);
   }
   if (ns->prefix) {
-    xmlFree((xmlChar *)ns->prefix);
+    xmlFree((xmlChar *)(uintptr_t)ns->prefix);
   }
   xmlFree(ns);
   NOKOGIRI_DEBUG_END(ns) ;
 }
 
 
-int Nokogiri_namespace_eh(xmlNodePtr node)
-{
-  return (node->type == XML_NAMESPACE_DECL);
-}
-
-
 /*
  * call-seq:
  *  prefix
@@ -64,7 +58,7 @@ static VALUE href(VALUE self)
 
 static int part_of_an_xpath_node_set_eh(xmlNsPtr node)
 {
-  return (node->next && ! Nokogiri_namespace_eh(node->next));
+  return (node->next && ! NOKOGIRI_NAMESPACE_EH(node->next));
 }
 
 VALUE Nokogiri_wrap_xml_namespace(xmlDocPtr doc, xmlNsPtr node)

data/ext/nokogiri/xml_namespace.h

@@ -10,4 +10,6 @@ extern VALUE cNokogiriXmlNamespace ;
 VALUE Nokogiri_wrap_xml_namespace(xmlDocPtr doc, xmlNsPtr node) ;
 VALUE Nokogiri_wrap_xml_namespace2(VALUE document, xmlNsPtr node) ;
 
+#define NOKOGIRI_NAMESPACE_EH(node) ((node)->type == XML_NAMESPACE_DECL)
+
 #endif

data/ext/nokogiri/xml_node.c

@@ -168,18 +168,20 @@ static VALUE reparent_node_with(VALUE pivot_obj, VALUE reparentee_obj, pivot_rep
     case XML_DOCUMENT_NODE:
     case XML_HTML_DOCUMENT_NODE:
       switch (reparentee->type) {
-        case XML_ELEMENT_NODE:
-        case XML_PI_NODE:
-        case XML_COMMENT_NODE:
-        case XML_DOCUMENT_TYPE_NODE:
-      /*
-       * The DOM specification says no to adding text-like nodes
-       * directly to a document, but we allow it for compatibility.
-       */
-        case XML_TEXT_NODE:
-        case XML_CDATA_SECTION_NODE:
-        case XML_ENTITY_REF_NODE:
-          goto ok;
+      case XML_ELEMENT_NODE:
+      case XML_PI_NODE:
+      case XML_COMMENT_NODE:
+      case XML_DOCUMENT_TYPE_NODE:
+        /*
+         * The DOM specification says no to adding text-like nodes
+         * directly to a document, but we allow it for compatibility.
+         */
+      case XML_TEXT_NODE:
+      case XML_CDATA_SECTION_NODE:
+      case XML_ENTITY_REF_NODE:
+        goto ok;
+      default:
+        break;
       }
       break;
     case XML_DOCUMENT_FRAG_NODE:
@@ -193,6 +195,8 @@ static VALUE reparent_node_with(VALUE pivot_obj, VALUE reparentee_obj, pivot_rep
       case XML_CDATA_SECTION_NODE:
       case XML_ENTITY_REF_NODE:
         goto ok;
+      default:
+        break;
       }
       break;
     case XML_ATTRIBUTE_NODE:
@@ -200,6 +204,8 @@ static VALUE reparent_node_with(VALUE pivot_obj, VALUE reparentee_obj, pivot_rep
       case XML_TEXT_NODE:
       case XML_ENTITY_REF_NODE:
         goto ok;
+      default:
+        break;
       }
       break;
     case XML_TEXT_NODE:
@@ -210,6 +216,8 @@ static VALUE reparent_node_with(VALUE pivot_obj, VALUE reparentee_obj, pivot_rep
        * operation, we should inhibit it.
        */
       break;
+    default:
+      break;
     }
 
     rb_raise(rb_eArgError, "cannot reparent %s there", rb_obj_classname(reparentee_obj));
@@ -833,10 +841,10 @@ static VALUE set(VALUE self, VALUE property, VALUE value)
 static VALUE get(VALUE self, VALUE rattribute)
 {
   xmlNodePtr node;
-  const xmlChar *value = 0;
+  xmlChar *value = 0;
   VALUE rvalue;
   xmlChar *colon;
-  const xmlChar *attribute, *attr_name, *prefix;
+  xmlChar *attribute, *attr_name, *prefix;
   xmlNsPtr ns;
 
   if (NIL_P(rattribute)) return Qnil;
@@ -844,7 +852,7 @@ static VALUE get(VALUE self, VALUE rattribute)
   Data_Get_Struct(self, xmlNode, node);
   attribute = xmlCharStrdup(StringValueCStr(rattribute));
 
-  colon = (xmlChar *)xmlStrchr(attribute, (const xmlChar)':');
+  colon = (xmlChar *)(uintptr_t)xmlStrchr(attribute, (const xmlChar)':');
   if (colon) {
     /* split the attribute string into separate prefix and name by
      * null-terminating the prefix at the colon */

data/ext/nokogiri/xml_node_set.c

@@ -50,7 +50,8 @@ static VALUE allocate(VALUE klass)
  * call-seq:
  *  dup
  *
- * Duplicate this node set
+ * Duplicate this NodeSet. Note that the Nodes contained in the NodeSet are not
+ * duplicated (similar to how Array and other Enumerable classes work).
  */
 static VALUE duplicate(VALUE self)
 {
@@ -350,7 +351,7 @@ static VALUE unlink_nodeset(VALUE self)
 
   nodeNr = node_set->nodeNr ;
   for (j = 0 ; j < nodeNr ; j++) {
-    if (! Nokogiri_namespace_eh(node_set->nodeTab[j])) {
+    if (! NOKOGIRI_NAMESPACE_EH(node_set->nodeTab[j])) {
       VALUE node ;
       xmlNodePtr node_ptr;
       node = Nokogiri_wrap_xml_node(Qnil, node_set->nodeTab[j]);
@@ -388,7 +389,7 @@ static void reify_node_set_namespaces(VALUE self)
   namespace_cache = rb_iv_get(self, "@namespace_cache");
 
   for (j = 0 ; j < node_set->nodeNr ; j++) {
-    if (Nokogiri_namespace_eh(node_set->nodeTab[j])) {
+    if (NOKOGIRI_NAMESPACE_EH(node_set->nodeTab[j])) {
       rb_ary_push(namespace_cache, Nokogiri_wrap_xml_node_set_node(node_set->nodeTab[j], self));
     }
   }
@@ -420,7 +421,7 @@ VALUE Nokogiri_wrap_xml_node_set_node(xmlNodePtr node, VALUE node_set)
 {
   xmlDocPtr document ;
 
-  if (Nokogiri_namespace_eh(node)) {
+  if (NOKOGIRI_NAMESPACE_EH(node)) {
     Data_Get_Struct(rb_iv_get(node_set, "@document"), xmlDoc, document);
     return Nokogiri_wrap_xml_namespace(document, (xmlNsPtr)node);
   } else {

data/ext/nokogiri/xml_node_set.h

@@ -8,6 +8,5 @@ extern VALUE cNokogiriXmlNodeSet ;
 VALUE Nokogiri_wrap_xml_node_set(xmlNodeSetPtr node_set, VALUE document) ;
 VALUE Nokogiri_wrap_xml_node_set_node(xmlNodePtr node, VALUE node_set) ;
 VALUE Nokogiri_wrap_xml_node_set_namespace(xmlNsPtr node, VALUE node_set) ;
-int Nokogiri_namespace_eh(xmlNodePtr node) ;
 
 #endif

data/ext/nokogiri/xslt_stylesheet.c

@@ -214,7 +214,7 @@ static void * initFunc(xsltTransformContextPtr ctxt, const xmlChar *uri)
           (unsigned char *)StringValueCStr(method_name), uri, method_caller);
     }
 
-    Data_Get_Struct(ctxt->style->_private, nokogiriXsltStylesheetTuple,
+    Data_Get_Struct((VALUE)ctxt->style->_private, nokogiriXsltStylesheetTuple,
                     wrapper);
     inst = rb_class_new_instance(0, NULL, obj);
     rb_ary_push(wrapper->func_instances, inst);
@@ -227,7 +227,7 @@ static void shutdownFunc(xsltTransformContextPtr ctxt,
 {
     nokogiriXsltStylesheetTuple *wrapper;
 
-    Data_Get_Struct(ctxt->style->_private, nokogiriXsltStylesheetTuple,
+    Data_Get_Struct((VALUE)ctxt->style->_private, nokogiriXsltStylesheetTuple,
                     wrapper);
 
     rb_ary_clear(wrapper->func_instances);

data/lib/nokogiri/css/parser.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.12
+# This file is automatically generated by Racc 1.4.14
 # from Racc grammer file "".
 #
 
@@ -17,103 +17,115 @@ module Nokogiri
 def unescape_css_identifier(identifier)
   identifier.gsub(/\\(?:([^0-9a-fA-F])|([0-9a-fA-F]{1,6})\s?)/){ |m| $1 || [$2.hex].pack('U') }
 end
+
+def unescape_css_string(str)
+  str.gsub(/\\(?:([^0-9a-fA-F])|([0-9a-fA-F]{1,6})\s?)/) do |m|
+    if $1=="\n"
+      ''
+    else
+      $1 || [$2.hex].pack('U')
+    end
+  end
+end
 ##### State transition tables begin ###
 
 racc_action_table = [
     24,    93,    56,    57,    33,    55,    94,    23,    24,    22,
-    12,    93,    33,    27,    35,    52,    88,    22,   -23,    25,
-    92,    98,    23,    33,    26,    18,    20,    25,    27,    86,
+    12,    93,    33,    27,    89,    52,    92,    22,   -23,    25,
+   109,    98,    23,    33,    26,    18,    20,    25,    27,   -23,
     23,    24,    26,    18,    20,    33,    27,    11,    39,    24,
-    22,    23,    89,    33,    18,   101,   100,    27,    22,    12,
-    25,    24,    95,    23,    90,    26,    18,    20,    25,    27,
-    66,    23,    24,    26,    18,    20,    33,    27,    91,    90,
-    51,    22,    96,    85,    33,    26,    33,   -23,    33,    56,
-    87,    25,    60,    99,    23,    74,    26,    18,    20,    39,
-    27,    39,    23,    39,    23,    18,    23,    18,    27,    18,
-    27,    33,    27,    33,    56,    87,    22,    60,    56,    87,
-   102,    60,    56,    87,    33,    60,    39,    24,    39,    23,
-   103,    23,    18,    20,    18,    27,    46,    27,    49,    39,
-    93,    44,    23,   105,    33,    18,    51,    45,    27,    33,
-   -23,    26,   108,    56,    58,   109,    60,   nil,   nil,    39,
-   nil,   nil,    23,   nil,    39,    18,   nil,    23,    27,   nil,
-    18,    20,   nil,    27,    82,    83,   nil,   nil,   nil,    82,
-    83,   nil,   nil,   nil,   nil,    78,    79,    80,   nil,    81,
-    78,    79,    80,    77,    81,     4,     5,    10,    77,     4,
-     5,    43,   nil,   nil,   nil,     6,   nil,     8,     7,     6,
-   nil,     8,     7,     4,     5,    10,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,     6,   nil,     8,     7 ]
+    22,    23,    95,    33,    18,    91,    90,    27,    22,    12,
+    25,    90,    96,    23,    33,    26,    18,    20,    25,    27,
+   -23,    23,    24,    26,    18,    20,    33,    27,    74,    39,
+    99,    22,    23,    45,    24,    18,    33,   103,    27,    56,
+    87,    25,    60,    46,    23,    49,    26,    18,    20,   104,
+    27,    39,    24,    51,    23,    93,    44,    18,    26,    33,
+    27,    66,   106,    56,    58,   110,    60,    33,    85,    33,
+    86,    51,    56,    87,    39,    60,    26,    23,    88,    33,
+    18,    20,    39,    27,    39,    23,    35,    23,    18,    33,
+    18,    27,   nil,    27,    39,   nil,    33,    23,   nil,   nil,
+    18,    22,   nil,    27,    39,   101,   100,    23,   102,   nil,
+    18,    39,   nil,    27,    23,    82,    83,    18,    20,   nil,
+    27,   nil,   nil,   nil,    82,    83,    78,    79,    80,   nil,
+    81,   nil,   nil,   nil,    77,    78,    79,    80,   nil,    81,
+     4,     5,    43,    77,     4,     5,    10,   nil,    56,    87,
+     6,    60,     8,     7,     6,   nil,     8,     7,     4,     5,
+    10,    56,    87,   nil,    60,   nil,   nil,   nil,     6,   nil,
+     8,     7 ]
 
 racc_action_check = [
-    42,    58,    24,    24,    42,    24,    57,    15,    43,    42,
-    64,    57,    43,    15,    11,    24,    53,    43,    58,    42,
-    56,    64,    42,    14,    42,    42,    42,    43,    42,    50,
-    43,     3,    43,    43,    43,     3,    43,     1,    14,     9,
-     3,    14,    54,     9,    14,    76,    76,    14,     9,     1,
-     3,    27,    59,     3,    60,     3,     3,     3,     9,     3,
-    27,     9,    12,     9,     9,     9,    12,     9,    55,    55,
-    27,    12,    61,    49,    28,    27,    62,    46,    30,    92,
-    92,    12,    92,    75,    12,    45,    12,    12,    12,    28,
-    12,    62,    28,    30,    62,    28,    30,    62,    28,    30,
-    62,    39,    30,    32,    90,    90,    39,    90,    51,    51,
-    84,    51,    93,    93,    31,    93,    39,    23,    32,    39,
-    86,    32,    39,    39,    32,    39,    23,    32,    23,    31,
-    87,    18,    31,    91,    29,    31,    23,    21,    31,    25,
-    22,    23,    94,    25,    25,   105,    25,   nil,   nil,    29,
-   nil,   nil,    29,   nil,    25,    29,   nil,    25,    29,   nil,
-    25,    25,   nil,    25,    48,    48,   nil,   nil,   nil,    47,
-    47,   nil,   nil,   nil,   nil,    48,    48,    48,   nil,    48,
-    47,    47,    47,    48,    47,     0,     0,     0,    47,    17,
-    17,    17,   nil,   nil,   nil,     0,   nil,     0,     0,    17,
-   nil,    17,    17,    26,    26,    26,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    26,   nil,    26,    26 ]
+     3,    58,    24,    24,     3,    24,    57,    15,    42,     3,
+    64,    57,    42,    15,    54,    24,    56,    42,    58,     3,
+    94,    64,     3,    31,     3,     3,     3,    42,     3,    22,
+    42,     9,    42,    42,    42,     9,    42,     1,    31,    43,
+     9,    31,    59,    43,    31,    55,    55,    31,    43,     1,
+     9,    60,    61,     9,    30,     9,     9,     9,    43,     9,
+    46,    43,    12,    43,    43,    43,    12,    43,    45,    30,
+    75,    12,    30,    21,    23,    30,    29,    84,    30,    93,
+    93,    12,    93,    23,    12,    23,    12,    12,    12,    86,
+    12,    29,    27,    23,    29,    87,    18,    29,    23,    25,
+    29,    27,    91,    25,    25,   106,    25,    28,    49,    62,
+    50,    27,    51,    51,    25,    51,    27,    25,    53,    14,
+    25,    25,    28,    25,    62,    28,    11,    62,    28,    32,
+    62,    28,   nil,    62,    14,   nil,    39,    14,   nil,   nil,
+    14,    39,   nil,    14,    32,    76,    76,    32,    76,   nil,
+    32,    39,   nil,    32,    39,    47,    47,    39,    39,   nil,
+    39,   nil,   nil,   nil,    48,    48,    47,    47,    47,   nil,
+    47,   nil,   nil,   nil,    47,    48,    48,    48,   nil,    48,
+    17,    17,    17,    48,     0,     0,     0,   nil,    90,    90,
+    17,    90,    17,    17,     0,   nil,     0,     0,    26,    26,
+    26,    92,    92,   nil,    92,   nil,   nil,   nil,    26,   nil,
+    26,    26 ]
 
 racc_action_pointer = [
-   178,    37,   nil,    29,   nil,   nil,   nil,   nil,   nil,    37,
-   nil,    14,    60,   nil,    17,   -17,   nil,   182,   120,   nil,
-   nil,   108,   111,   115,    -8,   133,   196,    49,    68,   128,
-    72,   108,    97,   nil,   nil,   nil,   nil,   nil,   nil,    95,
-   nil,   nil,    -2,     6,   nil,    74,    48,   166,   161,    48,
-     0,    98,   nil,    -7,    19,    57,     8,    -1,   -11,    29,
-    42,    49,    70,   nil,    -2,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,    58,    35,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    85,   nil,   109,   118,   nil,   nil,
-    94,   126,    69,   102,   129,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   132,   nil,   nil,   nil,   nil ]
+   177,    37,   nil,    -2,   nil,   nil,   nil,   nil,   nil,    29,
+   nil,   126,    60,   nil,   113,   -17,   nil,   173,    85,   nil,
+   nil,    44,     0,    72,    -8,    93,   191,    90,   101,    70,
+    48,    17,   123,   nil,   nil,   nil,   nil,   nil,   nil,   130,
+   nil,   nil,     6,    37,   nil,    57,    31,   152,   161,    83,
+    81,   102,   nil,    95,    -9,    34,     4,    -1,   -11,    19,
+    39,    29,   103,   nil,    -2,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,    45,   135,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,    52,   nil,    78,    83,   nil,   nil,
+   178,    95,   191,    69,     7,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    92,   nil,   nil,   nil,
+   nil ]
 
 racc_action_default = [
-   -74,   -75,    -2,   -24,    -4,    -5,    -6,    -7,    -8,   -24,
-   -73,   -75,   -24,    -3,   -47,   -10,   -13,   -17,   -75,   -19,
-   -20,   -75,   -22,   -24,   -75,   -24,   -74,   -75,   -53,   -54,
-   -55,   -56,   -57,   -58,   -14,   110,    -1,    -9,   -46,   -24,
-   -11,   -12,   -24,   -24,   -18,   -75,   -29,   -61,   -61,   -75,
-   -75,   -75,   -30,   -75,   -75,   -38,   -39,   -40,   -22,   -75,
-   -38,   -75,   -70,   -72,   -75,   -44,   -45,   -48,   -49,   -50,
-   -51,   -52,   -15,   -16,   -21,   -75,   -75,   -62,   -63,   -64,
-   -65,   -66,   -67,   -68,   -75,   -27,   -75,   -40,   -31,   -32,
-   -75,   -43,   -75,   -75,   -75,   -33,   -69,   -71,   -34,   -25,
-   -59,   -60,   -26,   -28,   -35,   -75,   -36,   -37,   -42,   -41 ]
+   -75,   -76,    -2,   -24,    -4,    -5,    -6,    -7,    -8,   -24,
+   -74,   -76,   -24,    -3,   -47,   -10,   -13,   -17,   -76,   -19,
+   -20,   -76,   -22,   -24,   -76,   -24,   -75,   -76,   -53,   -54,
+   -55,   -56,   -57,   -58,   -14,   111,    -1,    -9,   -46,   -24,
+   -11,   -12,   -24,   -24,   -18,   -76,   -29,   -62,   -62,   -76,
+   -76,   -76,   -30,   -76,   -76,   -38,   -39,   -40,   -22,   -76,
+   -38,   -76,   -71,   -73,   -76,   -44,   -45,   -48,   -49,   -50,
+   -51,   -52,   -15,   -16,   -21,   -76,   -76,   -63,   -64,   -65,
+   -66,   -67,   -68,   -69,   -76,   -27,   -76,   -40,   -31,   -32,
+   -76,   -43,   -76,   -76,   -76,   -33,   -70,   -72,   -34,   -25,
+   -59,   -60,   -61,   -26,   -28,   -35,   -76,   -36,   -37,   -42,
+   -41 ]
 
 racc_goto_table = [
-    53,    38,    13,     1,    41,    48,    62,    40,    34,    65,
-    50,    36,    63,    75,    84,    67,    68,    69,    70,    71,
-    62,    47,    37,    42,    54,   nil,    63,   nil,   nil,    64,
+    53,    38,    13,     1,    54,    48,    62,    42,    34,    65,
+    37,    36,    63,    75,    84,    67,    68,    69,    70,    71,
+    62,    40,    41,    50,    47,   nil,    63,   nil,   nil,    64,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,    72,    73,   nil,   nil,   nil,   nil,   nil,   nil,    97,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   104,   nil,   106,   107 ]
+   nil,   nil,   nil,   nil,   nil,   nil,   105,   nil,   107,   108 ]
 
 racc_goto_check = [
-    18,    12,     2,     1,    11,     9,     7,    10,     2,     9,
-    15,     2,    12,    17,    17,    12,    12,    12,    12,    12,
-     7,    16,     8,     5,    19,   nil,    12,   nil,   nil,     1,
+    18,    12,     2,     1,    19,     9,     7,     5,     2,     9,
+     8,     2,    12,    17,    17,    12,    12,    12,    12,    12,
+     7,    10,    11,    15,    16,   nil,    12,   nil,   nil,     1,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,     2,     2,   nil,   nil,   nil,   nil,   nil,   nil,    12,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,    18,   nil,    18,    18 ]
 
 racc_goto_pointer = [
-   nil,     3,    -1,   nil,   nil,     6,   nil,   -19,     8,   -18,
-    -8,   -11,   -13,   nil,   nil,   -13,    -2,   -34,   -24,     0,
+   nil,     3,    -1,   nil,   nil,   -10,   nil,   -19,    -4,   -18,
+     6,     7,   -13,   nil,   nil,     0,     1,   -34,   -24,   -20,
    nil,   nil,   nil,   nil ]
 
 racc_goto_default = [
@@ -183,24 +195,25 @@ racc_reduce_table = [
   1, 51, :_reduce_58,
   2, 48, :_reduce_59,
   2, 48, :_reduce_60,
+  2, 48, :_reduce_61,
   0, 48, :_reduce_none,
-  1, 53, :_reduce_62,
   1, 53, :_reduce_63,
   1, 53, :_reduce_64,
   1, 53, :_reduce_65,
   1, 53, :_reduce_66,
   1, 53, :_reduce_67,
   1, 53, :_reduce_68,
-  3, 52, :_reduce_69,
+  1, 53, :_reduce_69,
+  3, 52, :_reduce_70,
   1, 54, :_reduce_none,
   2, 54, :_reduce_none,
   1, 54, :_reduce_none,
   1, 35, :_reduce_none,
   0, 35, :_reduce_none ]
 
-racc_reduce_n = 75
+racc_reduce_n = 76
 
-racc_shift_n = 110
+racc_shift_n = 111
 
 racc_token_table = {
   false => 0,
@@ -661,60 +674,63 @@ def _reduce_58(val, _values, result)
 end
 
 def _reduce_59(val, _values, result)
- result = [val.first, val[1]] 
+ result = [val.first, unescape_css_identifier(val[1])] 
     result
 end
 
 def _reduce_60(val, _values, result)
+ result = [val.first, unescape_css_string(val[1])] 
+    result
+end
+
+def _reduce_61(val, _values, result)
  result = [val.first, val[1]] 
     result
 end
 
-# reduce 61 omitted
+# reduce 62 omitted
 
-def _reduce_62(val, _values, result)
+def _reduce_63(val, _values, result)
  result = :equal 
     result
 end
 
-def _reduce_63(val, _values, result)
+def _reduce_64(val, _values, result)
  result = :prefix_match 
     result
 end
 
-def _reduce_64(val, _values, result)
+def _reduce_65(val, _values, result)
  result = :suffix_match 
     result
 end
 
-def _reduce_65(val, _values, result)
+def _reduce_66(val, _values, result)
  result = :substring_match 
     result
 end
 
-def _reduce_66(val, _values, result)
+def _reduce_67(val, _values, result)
  result = :not_equal 
     result
 end
 
-def _reduce_67(val, _values, result)
+def _reduce_68(val, _values, result)
  result = :includes 
     result
 end
 
-def _reduce_68(val, _values, result)
+def _reduce_69(val, _values, result)
  result = :dash_match 
     result
 end
 
-def _reduce_69(val, _values, result)
+def _reduce_70(val, _values, result)
         result = Node.new(:NOT, [val[1]])
       
     result
 end
 
-# reduce 70 omitted
-
 # reduce 71 omitted
 
 # reduce 72 omitted
@@ -723,6 +739,8 @@ end
 
 # reduce 74 omitted
 
+# reduce 75 omitted
+
 def _reduce_none(val, _values, result)
   val[0]
 end