oga 1.2.3 → 1.3.0

data/lib/oga/css/parser.rb

@@ -5,7 +5,6 @@ require 'll/setup'
 
 module Oga
 module CSS
-##
 # AST parser for CSS expressions.
 #
 # This parser does _not_ build a CSS specific AST, instead it directly produces
@@ -53,31 +52,31 @@ class Parser < LL::Driver
   CONFIG.rules = [
     [3, 0, 0, 1], # 0
     [3, 1, 2, 0], # 1
-    [3, 2, 4, 31, 6, 0, 0, 3], # 2
+    [3, 2, 4, 30, 6, 0, 0, 3], # 2
     [3, 3, 0, 3, 1, 26], # 3
-    [3, 4, 4, 32, 6, 0, 0, 5], # 4
-    [3, 5, 0, 5, 1, 6], # 5
-    [3, 6, 8, 33, 0, 6], # 6
-    [3, 7, 8, 34, 0, 7], # 7
-    [3, 8, 0, 12], # 8
-    [3, 9, 0, 9], # 9
-    [3, 10, 0, 8, 1, 16], # 10
-    [3, 11, 0, 8, 1, 17], # 11
-    [3, 12, 0, 8, 1, 18], # 12
-    [3, 13, 0, 9], # 13
-    [3, 14, 0, 7], # 14
-    [3, 15, 0, 10], # 15
-    [3, 16, 8, 35, 1, 1], # 16
-    [3, 17, 1, 1, 1, 2], # 17
-    [3, 18, 4, 36, 6, 0, 0, 13], # 18
-    [3, 19, 0, 19], # 19
-    [3, 20, 0, 20], # 20
-    [3, 21, 0, 21], # 21
-    [3, 22, 0, 14], # 22
-    [3, 23, 1, 4, 0, 15, 1, 3], # 23
-    [3, 24, 0, 17], # 24
-    [3, 25, 0, 10], # 25
-    [3, 26, 8, 37, 0, 16], # 26
+    [3, 4, 8, 32, 8, 31, 0, 8], # 4
+    [3, 5, 0, 5], # 5
+    [3, 6, 8, 33, 0, 11], # 6
+    [3, 7, 0, 3, 1, 6], # 7
+    [3, 8, 0, 5], # 8
+    [3, 9, 8, 34, 0, 6, 1, 16], # 9
+    [3, 10, 8, 35, 0, 6, 1, 18], # 10
+    [3, 11, 8, 36, 0, 6, 1, 17], # 11
+    [3, 12, 8, 37, 0, 8], # 12
+    [3, 13, 0, 11], # 13
+    [3, 14, 0, 19], # 14
+    [3, 15, 0, 18], # 15
+    [3, 16, 0, 20], # 16
+    [3, 17, 0, 9], # 17
+    [3, 18, 8, 38, 1, 1], # 18
+    [3, 19, 1, 1, 1, 2], # 19
+    [3, 20, 4, 39, 6, 0, 0, 12], # 20
+    [3, 21, 0, 7], # 21
+    [3, 22, 0, 13], # 22
+    [3, 23, 1, 4, 0, 14, 1, 3], # 23
+    [3, 24, 0, 16], # 24
+    [3, 25, 0, 9], # 25
+    [3, 26, 8, 40, 0, 15], # 26
     [3, 27, 1, 10], # 27
     [3, 28, 1, 11], # 28
     [3, 29, 1, 12], # 29
@@ -86,79 +85,86 @@ class Parser < LL::Driver
     [3, 32, 1, 15], # 32
     [3, 33, 1, 1, 1, 24], # 33
     [3, 34, 1, 1, 1, 25], # 34
-    [3, 35, 8, 38, 0, 22], # 35
+    [3, 35, 8, 41, 0, 21], # 35
     [3, 36, 1, 1, 1, 5], # 36
-    [3, 37, 1, 8, 0, 24, 1, 7], # 37
-    [3, 38, 0, 29], # 38
-    [3, 39, 0, 30], # 39
-    [3, 40, 0, 27], # 40
-    [3, 41, 0, 5], # 41
+    [3, 37, 1, 8, 0, 23, 1, 7], # 37
+    [3, 38, 0, 28], # 38
+    [3, 39, 0, 29], # 39
+    [3, 40, 0, 26], # 40
+    [3, 41, 0, 3], # 41
     [3, 42, 1, 21], # 42
     [3, 43, 1, 20], # 43
-    [3, 44, 8, 39, 0, 28], # 44
-    [3, 45, 8, 40, 0, 28, 1, 9], # 45
-    [3, 46, 8, 42, 8, 41, 0, 26], # 46
+    [3, 44, 8, 42, 0, 27], # 44
+    [3, 45, 8, 43, 0, 27, 1, 9], # 45
+    [3, 46, 8, 45, 8, 44, 0, 25], # 46
     [3, 47, 1, 19], # 47
     [3, 48, 1, 22], # 48
     [3, 49, 1, 23], # 49
     [3, 50, 0, 2], # 50
-    [3, 51, 0, 4], # 51
-    [3, 52, 0, 12], # 52
-    [3, 53, 0, 12], # 53
-    [3, 54, 0, 11], # 54
-    [3, 55, 0, 13], # 55
-    [3, 56, 0, 25, 0, 18], # 56
-    [3, 57, 0, 23], # 57
-    [3, 58, 0, 26], # 58
-    [3, 59, 0, 26], # 59
-    [3, 60, 0, 28], # 60
-    [3, 61, 0, 26], # 61
+    [3, 51, 0, 11], # 51
+    [3, 52, 0, 4], # 52
+    [3, 53, 0, 4], # 53
+    [3, 54, 0, 4], # 54
+    [3, 55, 0, 4], # 55
+    [3, 56, 0, 4], # 56
+    [3, 57, 0, 11], # 57
+    [3, 58, 0, 10], # 58
+    [3, 59, 0, 12], # 59
+    [3, 60, 0, 24, 0, 17], # 60
+    [3, 61, 0, 22], # 61
+    [3, 62, 0, 25], # 62
+    [3, 63, 0, 25], # 63
+    [3, 64, 0, 27], # 64
+    [3, 65, 0, 25], # 65
   ].freeze
 
   CONFIG.table = [
     [1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 1], # 0
     [-1, 2, -1, 2, -1, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 2, 2, 2, -1, -1, -1, -1, -1, 2, 2, -1], # 1
     [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 3], # 2
-    [-1, 4, -1, 4, -1, 4, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 4, 4, 4, -1, -1, -1, -1, -1, 4, 4, -1], # 3
-    [-1, -1, -1, -1, -1, -1, 5, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 4
-    [-1, 6, -1, 8, -1, 8, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 7, 7, 7, -1, -1, -1, -1, -1, 8, 8, -1], # 5
-    [-1, 9, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 6
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 10, 11, 12, -1, -1, -1, -1, -1, -1, -1, -1], # 7
-    [-1, 13, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 14, 14, 14, -1, -1, -1, -1, -1, -1, -1, -1], # 8
-    [-1, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 9
-    [-1, 16, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 10
-    [-1, -1, 17, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 11
-    [-1, -1, -1, 18, -1, 18, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 18, 18, -1], # 12
-    [-1, -1, -1, 22, -1, 21, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 19, 20, -1], # 13
-    [-1, -1, -1, 23, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 14
-    [-1, 24, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 15
-    [-1, 25, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 16
-    [-1, 26, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 17
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 27, 28, 29, 30, 31, 32, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 18
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 33, -1, -1], # 19
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 34, -1], # 20
-    [-1, -1, -1, -1, -1, 35, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 21
-    [-1, -1, -1, -1, -1, 36, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 22
-    [-1, -1, -1, -1, -1, -1, -1, 37, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 23
-    [-1, 41, -1, 41, -1, 41, -1, -1, -1, 40, -1, -1, -1, -1, -1, -1, 41, 41, 41, 40, 40, -1, 38, 39, 41, 41, -1], # 24
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 42, -1, -1, -1, -1, -1], # 25
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 43, -1, -1, -1, -1, -1, -1], # 26
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, 45, -1, -1, -1, -1, -1, -1, -1, -1, -1, 44, 46, -1, -1, -1, -1, -1, -1], # 27
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 47, -1, -1, -1, -1, -1, -1, -1], # 28
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 48, -1, -1, -1, -1], # 29
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 49, -1, -1, -1], # 30
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 50], # 31
-    [-1, -1, -1, -1, -1, -1, 51, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 32
-    [-1, -1, -1, 52, -1, 52, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 52, 52, -1], # 33
-    [-1, -1, -1, 53, -1, 53, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 53, 53, -1], # 34
-    [-1, -1, 54, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 35
-    [-1, -1, -1, 55, -1, 55, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 55, 55, -1], # 36
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 56, 56, 56, 56, 56, 56, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 37
-    [-1, -1, -1, -1, -1, -1, -1, 57, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 38
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 58, -1, -1, -1, -1, -1, -1], # 39
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 59, -1, -1, -1, -1, -1, -1], # 40
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 60, -1, -1, -1, -1, -1, -1, -1], # 41
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 61, -1, -1, -1, -1, -1, -1], # 42
+    [-1, 4, -1, 6, -1, 6, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 5, 5, 5, -1, -1, -1, -1, -1, 6, 6, -1], # 3
+    [-1, -1, -1, -1, -1, -1, 7, -1, -1, -1, -1, -1, -1, -1, -1, -1, 8, 8, 8, -1, -1, -1, -1, -1, -1, -1, -1], # 4
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 9, 11, 10, -1, -1, -1, -1, -1, -1, -1, -1], # 5
+    [-1, 12, -1, 13, -1, 13, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 13, 13, -1], # 6
+    [-1, -1, -1, -1, -1, 16, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 15, 14, -1], # 7
+    [-1, 17, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 8
+    [-1, 18, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 9
+    [-1, -1, 19, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 10
+    [-1, -1, -1, 20, -1, 20, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 20, 20, -1], # 11
+    [-1, -1, -1, 22, -1, 21, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 21, 21, -1], # 12
+    [-1, -1, -1, 23, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 13
+    [-1, 24, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 14
+    [-1, 25, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 15
+    [-1, 26, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 16
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 27, 28, 29, 30, 31, 32, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 17
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 33, -1, -1], # 18
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 34, -1], # 19
+    [-1, -1, -1, -1, -1, 35, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 20
+    [-1, -1, -1, -1, -1, 36, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 21
+    [-1, -1, -1, -1, -1, -1, -1, 37, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 22
+    [-1, 41, -1, 41, -1, 41, -1, -1, -1, 40, -1, -1, -1, -1, -1, -1, 41, 41, 41, 40, 40, -1, 38, 39, 41, 41, -1], # 23
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 42, -1, -1, -1, -1, -1], # 24
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 43, -1, -1, -1, -1, -1, -1], # 25
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, 45, -1, -1, -1, -1, -1, -1, -1, -1, -1, 44, 46, -1, -1, -1, -1, -1, -1], # 26
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 47, -1, -1, -1, -1, -1, -1, -1], # 27
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 48, -1, -1, -1, -1], # 28
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 49, -1, -1, -1], # 29
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 50], # 30
+    [-1, -1, -1, 51, -1, 51, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 51, 51, -1], # 31
+    [-1, -1, -1, -1, -1, -1, 52, -1, -1, -1, -1, -1, -1, -1, -1, -1, 52, 52, 52, -1, -1, -1, -1, -1, -1, -1, -1], # 32
+    [-1, -1, -1, -1, -1, -1, 53, -1, -1, -1, -1, -1, -1, -1, -1, -1, 53, 53, 53, -1, -1, -1, -1, -1, -1, -1, -1], # 33
+    [-1, -1, -1, -1, -1, -1, 54, -1, -1, -1, -1, -1, -1, -1, -1, -1, 54, 54, 54, -1, -1, -1, -1, -1, -1, -1, -1], # 34
+    [-1, -1, -1, -1, -1, -1, 55, -1, -1, -1, -1, -1, -1, -1, -1, -1, 55, 55, 55, -1, -1, -1, -1, -1, -1, -1, -1], # 35
+    [-1, -1, -1, -1, -1, -1, 56, -1, -1, -1, -1, -1, -1, -1, -1, -1, 56, 56, 56, -1, -1, -1, -1, -1, -1, -1, -1], # 36
+    [-1, -1, -1, 57, -1, 57, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 57, 57, -1], # 37
+    [-1, -1, 58, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 38
+    [-1, -1, -1, 59, -1, 59, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 59, 59, -1], # 39
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 60, 60, 60, 60, 60, 60, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 40
+    [-1, -1, -1, -1, -1, -1, -1, 61, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 41
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, -1, -1, -1], # 42
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 63, -1, -1, -1, -1, -1, -1], # 43
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 64, -1, -1, -1, -1, -1, -1, -1], # 44
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 65, -1, -1, -1, -1, -1, -1], # 45
   ].freeze
 
   CONFIG.actions = [
@@ -166,23 +172,23 @@ class Parser < LL::Driver
     [:_rule_1, 0], # 1
     [:_rule_2, 2], # 2
     [:_rule_3, 2], # 3
-    [:_rule_4, 2], # 4
-    [:_rule_5, 2], # 5
+    [:_rule_4, 3], # 4
+    [:_rule_5, 1], # 5
     [:_rule_6, 2], # 6
     [:_rule_7, 2], # 7
     [:_rule_8, 1], # 8
-    [:_rule_9, 1], # 9
-    [:_rule_10, 2], # 10
-    [:_rule_11, 2], # 11
+    [:_rule_9, 3], # 9
+    [:_rule_10, 3], # 10
+    [:_rule_11, 3], # 11
     [:_rule_12, 2], # 12
     [:_rule_13, 1], # 13
     [:_rule_14, 1], # 14
     [:_rule_15, 1], # 15
-    [:_rule_16, 2], # 16
-    [:_rule_17, 2], # 17
+    [:_rule_16, 1], # 16
+    [:_rule_17, 1], # 17
     [:_rule_18, 2], # 18
-    [:_rule_19, 1], # 19
-    [:_rule_20, 1], # 20
+    [:_rule_19, 2], # 19
+    [:_rule_20, 2], # 20
     [:_rule_21, 1], # 21
     [:_rule_22, 1], # 22
     [:_rule_23, 3], # 23
@@ -218,55 +224,47 @@ class Parser < LL::Driver
     [:_rule_53, 1], # 53
     [:_rule_54, 1], # 54
     [:_rule_55, 1], # 55
-    [:_rule_56, 2], # 56
+    [:_rule_56, 1], # 56
     [:_rule_57, 1], # 57
     [:_rule_58, 1], # 58
     [:_rule_59, 1], # 59
-    [:_rule_60, 1], # 60
+    [:_rule_60, 2], # 60
     [:_rule_61, 1], # 61
+    [:_rule_62, 1], # 62
+    [:_rule_63, 1], # 63
+    [:_rule_64, 1], # 64
+    [:_rule_65, 1], # 65
   ].freeze
 
-  ##
   # @return [Oga::LRU]
-  #
   CACHE = LRU.new
 
-  ##
   # @param [String] data
   # @return [AST::Node]
-  #
   def self.parse_with_cache(data)
-    return CACHE.get_or_set(data) { new(data).parse }
+    CACHE.get_or_set(data) { new(data).parse }
   end
 
-  ##
   # @param [String] data The input to parse.
-  #
   def initialize(data)
     @lexer = Lexer.new(data)
   end
 
-  ##
   # Resets the internal state of the parser.
-  #
   def reset
     @current_element = nil
   end
 
-  ##
   # @param [Symbol] type
   # @param [Array] children
   # @return [AST::Node]
-  #
   def s(type, *children)
-    return AST::Node.new(type, children)
+    AST::Node.new(type, children)
   end
 
-  ##
   # Yields the next token from the lexer.
   #
   # @yieldparam [Array]
-  #
   def each_token
     @lexer.advance do |*args|
       yield args
@@ -275,16 +273,13 @@ class Parser < LL::Driver
     yield [-1, -1]
   end
 
-  ##
   # Returns the node test for the current element.
   #
   # @return [AST::Node]
-  #
   def current_element
     @current_element ||= s(:test, nil, '*')
   end
 
-  ##
   # Parses the input and returns the corresponding AST.
   #
   # @example
@@ -292,175 +287,158 @@ class Parser < LL::Driver
   #  ast    = parser.parse
   #
   # @return [AST::Node]
-  #
   def parse
     reset
 
     super
   end
 
-  ##
   # Generates the AST for a node test.
   #
   # @param [String] namespace
   # @param [String] name
   # @return [AST::Node]
-  #
   def on_test(namespace, name)
     @current_element = s(:test, namespace, name)
   end
 
-  ##
   # @param [String] name
   # @param [AST::Node] arg
   # @return [AST::Node]
-  #
   def on_pseudo_class(name, arg = nil)
     handler = "on_pseudo_class_#{name.gsub('-', '_')}"
 
     arg ? send(handler, arg) : send(handler)
   end
 
-  ##
   # Generates the AST for the `root` pseudo class.
   #
   # @return [AST::Node]
-  #
   def on_pseudo_class_root
     s(:call, 'not', s(:axis, 'parent', s(:test, nil, '*')))
   end
 
-  ##
   # Generates the AST for the `nth-child` pseudo class.
   #
   # @param [AST::Node] arg
   # @return [AST::Node]
-  #
   def on_pseudo_class_nth_child(arg)
     generate_nth_child('preceding-sibling', arg)
   end
 
-  ##
   # Generates the AST for the `nth-last-child` pseudo class.
   #
   # @param [AST::Node] arg
   # @return [AST::Node]
-  #
   def on_pseudo_class_nth_last_child(arg)
     generate_nth_child('following-sibling', arg)
   end
 
-  ##
   # Generates the AST for the `nth-of-type` pseudo class.
   #
   # @param [AST::Node] arg
   # @return [AST::Node]
-  #
   def on_pseudo_class_nth_of_type(arg)
     generate_nth_child('preceding-sibling', arg, current_element)
   end
 
-  ##
   # Generates the AST for the `nth-last-of-type` pseudo class.
   #
   # @param [AST::Node] arg
   # @return [AST::Node]
-  #
   def on_pseudo_class_nth_last_of_type(arg)
     generate_nth_child('following-sibling', arg, current_element)
   end
 
-  ##
   # Generates the AST for the `nth` pseudo class.
   #
   # @param [AST::Node] arg
   # @return [AST::Node]
-  #
   def on_pseudo_class_nth(arg)
     s(:eq, s(:call, 'position'), arg)
   end
 
-  ##
   # Generates the AST for the `:first-child` selector.
   #
   # @return [AST::Node]
-  #
   def on_pseudo_class_first_child
     generate_no_siblings('preceding-sibling')
   end
 
-  ##
   # Generates the AST for the `:last-child` selector.
   #
   # @return [AST::Node]
-  #
   def on_pseudo_class_last_child
     generate_no_siblings('following-sibling')
   end
 
-  ##
   # Generates the AST for the `:first-of-type` selector.
   #
   # @return [AST::Node]
-  #
   def on_pseudo_class_first_of_type
     generate_no_siblings('preceding-sibling', current_element)
   end
 
-  ##
   # Generates the AST for the `:last-of-type` selector.
   #
   # @return [AST::Node]
-  #
   def on_pseudo_class_last_of_type
     generate_no_siblings('following-sibling', current_element)
   end
 
-  ##
   # Generates the AST for the `:only-child` selector.
   #
   # @return [AST::Node]
-  #
   def on_pseudo_class_only_child
     s(:and, on_pseudo_class_first_child, on_pseudo_class_last_child)
   end
 
-  ##
   # Generates the AST for the `:only-of-type` selector.
   #
   # @return [AST::Node]
-  #
   def on_pseudo_class_only_of_type
     s(:and, on_pseudo_class_first_of_type, on_pseudo_class_last_of_type)
   end
 
-  ##
   # Generates the AST for the `:empty` selector.
   #
   # @return [AST::Node]
-  #
   def on_pseudo_class_empty
     s(:call, 'not', s(:axis, 'child', s(:type_test, 'node')))
   end
 
-  ##
+  # Generates the AST for the `:not` selector.
+  #
+  # @param [AST::Node] arg
+  # @return [AST::Node]
+  def on_pseudo_class_not(arg)
+    # Unpacks (axis "descendant" (test nil "x")) into just (test nil "x") as
+    # in this case we want to wrap the (test) node in a (axis "self") node.
+    if arg.type == :axis
+      arg = s(:axis, 'self', arg.children[1])
+
+    # Unpack (predicate (eq ...)) into just (eq)
+    elsif arg.type == :predicate
+      arg = arg.children[1]
+    end
+
+    s(:call, 'not', arg)
+  end
+
   # Generates the AST for the `=` operator.
   #
   # @param [AST::Node] attr
   # @param [AST::Node] value
   # @return [AST::Node]
-  #
   def on_op_eq(attr, value)
     s(:eq, attr, value)
   end
 
-  ##
   # Generates the AST for the `~=` operator.
   #
   # @param [AST::Node] attr
   # @param [AST::Node] value
   # @return [AST::Node]
-  #
   def on_op_space_in(attr, value)
     s(
       :call,
@@ -470,24 +448,20 @@ class Parser < LL::Driver
     )
   end
 
-  ##
   # Generates the AST for the `^=` operator.
   #
   # @param [AST::Node] attr
   # @param [AST::Node] value
   # @return [AST::Node]
-  #
   def on_op_starts_with(attr, value)
     s(:call, 'starts-with', attr, value)
   end
 
-  ##
   # Generates the AST for the `$=` operator.
   #
   # @param [AST::Node] attr
   # @param [AST::Node] value
   # @return [AST::Node]
-  #
   def on_op_ends_with(attr, value)
     s(
       :eq,
@@ -510,24 +484,20 @@ class Parser < LL::Driver
     )
   end
 
-  ##
   # Generates the AST for the `*=` operator.
   #
   # @param [AST::Node] attr
   # @param [AST::Node] value
   # @return [AST::Node]
-  #
   def on_op_in(attr, value)
     s(:call, 'contains', attr, value)
   end
 
-  ##
   # Generates the AST for the `|=` operator.
   #
   # @param [AST::Node] attr
   # @param [AST::Node] value
   # @return [AST::Node]
-  #
   def on_op_hyphen_in(attr, value)
     s(
       :or,
@@ -543,12 +513,10 @@ class Parser < LL::Driver
 
   private
 
-  ##
   # @param [String] count_axis
   # @param [AST::Node] arg
   # @param [AST::Node] count_test
   # @return [AST::Node]
-  #
   def generate_nth_child(count_axis, arg, count_test = s(:test, nil, '*'))
     count_call = s(:call, 'count', s(:axis, count_axis, count_test))
 
@@ -575,46 +543,36 @@ class Parser < LL::Driver
       end
     end
 
-    return node
+    node
   end
 
-  ##
   # @param [String] axis
   # @param [AST::Node] test
   # @return [AST::Node]
-  #
   def generate_no_siblings(axis, test = s(:test, nil, '*'))
     s(:eq, s(:call, 'count', s(:axis, axis, test)), s(:int, 0))
   end
 
-  ##
   # @param [AST::Node] node
   # @return [TrueClass|FalseClass]
-  #
   def int_node?(node)
     node.type.equal?(:int)
   end
 
-  ##
   # @param [AST::Node] node
   # @return [TrueClass|FalseClass]
-  #
   def non_positive_number?(node)
     node.children[0] <= 0
   end
 
-  ##
   # @param [AST::Node] node
   # @return [Symbol]
-  #
   def step_comparison(node)
     node.children[0] >= 0 ? :gte : :lte
   end
 
-  ##
   # @param [AST::Node] step
   # @return [AST::Node]
-  #
   def step_modulo_value(step)
     # -2n
     if step and non_positive_number?(step)
@@ -631,6 +589,34 @@ class Parser < LL::Driver
     mod_val
   end
 
+  # @param [String] name
+  # @param [AST::Node] test
+  # @param [AST::Node] predicates
+  # @param [AST::Node] more
+  # @return [AST::Node]
+  def generate_axis(name, test = nil, predicates = nil, more = nil)
+    if test
+      node = s(:axis, name, test)
+    else
+      node = s(:axis, name, on_test(nil, '*'))
+    end
+
+    if predicates
+      node = s(:predicate, node, predicates)
+    end
+
+    node = add_child(node, more) if more
+
+    node
+  end
+
+  # @param [AST::Node] node
+  # @param [AST::Node] child
+  # @return [AST::Node]
+  def add_child(node, child)
+    node.updated(nil, node.children + [child])
+  end
+
   def _rule_0(val)
     val[0]
   end
@@ -641,13 +627,13 @@ class Parser < LL::Driver
 
   def _rule_2(val)
     
-      path = val[0]
+      query = val[0]
 
       val[1].each do |chunk|
-        path = s(:pipe, path, chunk)
+        query = s(:pipe, query, chunk)
       end
 
-      path
+      query
     
   end
 
@@ -657,88 +643,88 @@ class Parser < LL::Driver
 
   def _rule_4(val)
     
-      # Single selector
-      if val[1].empty?
-        ret = val[0]
+      node  = s(:axis, 'descendant', val[0])
+      preds = val[1]
+      more  = val[2]
 
-        if ret.is_a?(Array)
-          ret = s(:path, *ret)
-        end
-
-      # Multiple selectors
-      else
-        steps = [val[0]]
-
-        val[1].each do |step|
-          # "+ foo" is broken up into two steps.
-          if step.is_a?(Array)
-            # Using Array#+ or Array#| would require allocating an extra Array
-            step.each { |sub| steps << sub }
-          else
-            steps << step
-          end
-        end
-
-        ret = s(:path, *steps)
+      if preds
+        node = s(:predicate, node, preds)
       end
 
-      ret
+      node = add_child(node, more) if more
+
+      node
     
   end
 
   def _rule_5(val)
-     val[1] 
+    val[0]
   end
 
   def _rule_6(val)
     
-      val[1] ? s(:predicate, val[0], val[1]) : val[0]
+      node  = s(:axis, 'descendant', on_test(nil, '*'))
+      preds = val[0]
+      more  = val[1]
+
+      if preds
+        node = s(:predicate, node, preds)
+      else
+        node = s(:predicate, node)
+      end
+
+      node = add_child(node, more) if more
+
+      node
     
   end
 
   def _rule_7(val)
-    
-      val[1] ? s(:predicate, val[0], val[1]) : val[0]
-    
+     val[1] 
   end
 
   def _rule_8(val)
-    
-      s(:predicate, s(:axis, 'descendant', on_test(nil, '*')), val[0])
-    
+    val[0]
   end
 
   def _rule_9(val)
-     s(:axis, 'descendant', val[0]) 
+    
+      test, preds = val[1]
+      more        = val[2]
+
+      generate_axis('child', test, preds, more)
+    
   end
 
   def _rule_10(val)
     
-      s(:axis, 'child', val[1])
+      test, preds = val[1]
+      more        = val[2]
+
+      s(
+        :predicate,
+        s(:axis, 'following-sibling', on_test(nil, '*')),
+        s(:int, 1),
+        generate_axis('self', test, preds, more)
+      )
     
   end
 
   def _rule_11(val)
     
-      s(:axis, 'following-sibling', val[1])
+      test, preds = val[1]
+      more        = val[2]
+
+      generate_axis('following-sibling', test, preds, more)
     
   end
 
   def _rule_12(val)
-    
-      [
-        s(
-          :predicate,
-          s(:axis, 'following-sibling', on_test(nil, '*')),
-          s(:int, 1)
-        ),
-        s(:axis, 'self', val[1])
-      ]
-    
+    val
   end
 
   def _rule_13(val)
-    val[0]
+     [nil, val[0]] 
   end
 
   def _rule_14(val)
@@ -746,18 +732,26 @@ class Parser < LL::Driver
   end
 
   def _rule_15(val)
-     on_test(*val[0]) 
+    val[0]
   end
 
   def _rule_16(val)
-     val[1] ? [val[0], val[1]] : [nil, val[0]] 
+    val[0]
   end
 
   def _rule_17(val)
-     val[1] 
+     on_test(*val[0]) 
   end
 
   def _rule_18(val)
+     val[1] ? [val[0], val[1]] : [nil, val[0]] 
+  end
+
+  def _rule_19(val)
+     val[1] 
+  end
+
+  def _rule_20(val)
     
       ret = val[0]
 
@@ -769,14 +763,6 @@ class Parser < LL::Driver
     
   end
 
-  def _rule_19(val)
-    val[0]
-  end
-
-  def _rule_20(val)
-    val[0]
-  end
-
   def _rule_21(val)
     val[0]
   end
@@ -989,7 +975,7 @@ class Parser < LL::Driver
   end
 
   def _rule_56(val)
-    val
+    val[0]
   end
 
   def _rule_57(val)
@@ -1005,12 +991,28 @@ class Parser < LL::Driver
   end
 
   def _rule_60(val)
-    val[0]
+    val
   end
 
   def _rule_61(val)
     val[0]
   end
+
+  def _rule_62(val)
+    val[0]
+  end
+
+  def _rule_63(val)
+    val[0]
+  end
+
+  def _rule_64(val)
+    val[0]
+  end
+
+  def _rule_65(val)
+    val[0]
+  end
 end
 end
 end