regexp_parser 2.3.1 → 2.4.0

data/lib/regexp_parser/scanner.rb

@@ -2,7 +2,7 @@
 
 # line 1 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 
-# line 649 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+# line 646 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 
 
 # THIS IS A GENERATED FILE, DO NOT EDIT DIRECTLY
@@ -43,6 +43,7 @@ class Regexp::Scanner
   end
 
   # Invalid groupOption. Used for inline options.
+  # TODO: should become InvalidGroupOptionError in v3.0.0 for consistency
   class InvalidGroupOption < ValidationError
     def initialize(option, text)
       super "Invalid group option #{option} in #{text}"
@@ -63,6 +64,13 @@ class Regexp::Scanner
     end
   end
 
+  # The POSIX class name was not recognized by the scanner.
+  class UnknownPosixClassError < ValidationError
+    def initialize(text)
+      super "Unknown POSIX class #{text}"
+    end
+  end
+
   # Scans the given regular expression text, or Regexp object and collects the
   # emitted token into an array that gets returned at the end. If a block is
   # given, it gets called for each emitted token.
@@ -93,7 +101,7 @@ class Regexp::Scanner
     self.char_pos = 0
 
     
-# line 96 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner.rb"
+# line 104 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner.rb"
 class << self
 	attr_accessor :_re_scanner_trans_keys
 	private :_re_scanner_trans_keys, :_re_scanner_trans_keys=
@@ -116,51 +124,34 @@ self._re_scanner_trans_keys = [
 	57, 48, 125, 44, 125, 
 	123, 123, 9, 122, 9, 125, 
 	9, 122, -128, -65, -128, 
-	-65, 38, 38, 94, 120, 
-	97, 120, 108, 115, 110, 112, 
-	117, 117, 109, 109, 58, 
-	58, 93, 93, 104, 104, 
-	97, 97, 99, 99, 105, 105, 
-	105, 105, 108, 108, 97, 
-	97, 110, 110, 107, 107, 
-	110, 110, 116, 116, 114, 114, 
-	108, 108, 105, 105, 103, 
-	103, 105, 105, 116, 116, 
-	114, 114, 97, 97, 112, 112, 
-	104, 104, 111, 111, 119, 
-	119, 101, 101, 114, 114, 
-	114, 117, 105, 105, 110, 110, 
-	110, 110, 99, 99, 112, 
-	112, 97, 97, 99, 99, 
-	101, 101, 112, 112, 112, 112, 
-	111, 111, 114, 114, 100, 
-	100, 100, 100, -128, -65, 
-	-128, -65, 45, 45, 92, 92, 
-	92, 92, 45, 45, 92, 
-	92, 92, 92, 48, 123, 
-	48, 102, 48, 102, 48, 102, 
-	48, 102, 9, 125, 9, 
-	125, 9, 125, 9, 125, 
-	9, 125, 9, 125, 48, 123, 
-	39, 39, 41, 41, 41, 
-	57, 62, 62, -128, 127, 
-	-62, -12, 1, 127, 1, 127, 
-	9, 32, 33, 126, 10, 
-	10, 63, 63, 33, 126, 
-	33, 126, 62, 62, 43, 63, 
-	43, 63, 43, 63, 65, 
-	122, 44, 57, 43, 63, 
-	68, 119, 80, 112, -62, 125, 
-	-128, -65, -128, -65, -128, 
-	-65, 38, 38, 38, 93, 
-	58, 58, 67, 120, -62, 125, 
-	-128, -65, -128, -65, -128, 
-	-65, 48, 55, 48, 55, 
-	77, 77, 45, 45, 0, 0, 
-	67, 99, 45, 45, 0, 
-	0, 92, 92, 48, 102, 
-	39, 60, 39, 57, 49, 57, 
-	41, 57, 45, 62, 0
+	-65, 38, 38, 58, 93, 
+	58, 93, -128, -65, -128, -65, 
+	45, 45, 92, 92, 92, 
+	92, 45, 45, 92, 92, 
+	92, 92, 48, 123, 48, 102, 
+	48, 102, 48, 102, 48, 
+	102, 9, 125, 9, 125, 
+	9, 125, 9, 125, 9, 125, 
+	9, 125, 48, 123, 39, 
+	39, 41, 41, 41, 57, 
+	62, 62, -128, 127, -62, -12, 
+	1, 127, 1, 127, 9, 
+	32, 33, 126, 10, 10, 
+	63, 63, 33, 126, 33, 126, 
+	62, 62, 43, 63, 43, 
+	63, 43, 63, 65, 122, 
+	44, 57, 68, 119, 80, 112, 
+	-62, 125, -128, -65, -128, 
+	-65, -128, -65, 38, 38, 
+	38, 93, 58, 58, 67, 120, 
+	-62, 125, -128, -65, -128, 
+	-65, -128, -65, 48, 55, 
+	48, 55, 77, 77, 45, 45, 
+	0, 0, 67, 99, 45, 
+	45, 0, 0, 92, 92, 
+	48, 102, 39, 60, 39, 57, 
+	49, 57, 41, 57, 45, 
+	62, 0
 ]
 
 class << self
@@ -173,22 +164,16 @@ self._re_scanner_key_spans = [
 	1, 18, 1, 10, 15, 20, 10, 1, 
 	22, 19, 1, 10, 19, 19, 10, 18, 
 	1, 10, 15, 20, 10, 10, 78, 82, 
-	1, 114, 117, 114, 64, 64, 1, 27, 
-	24, 8, 3, 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, 1, 
-	4, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 64, 
-	64, 1, 1, 1, 1, 1, 1, 76, 
-	55, 55, 55, 55, 117, 117, 117, 117, 
-	117, 117, 76, 1, 1, 17, 1, 256, 
-	51, 127, 127, 24, 94, 1, 1, 94, 
-	94, 1, 21, 21, 21, 58, 14, 21, 
-	52, 33, 188, 64, 64, 64, 1, 56, 
-	1, 54, 188, 64, 64, 64, 8, 8, 
-	1, 1, 0, 33, 1, 0, 1, 55, 
-	22, 19, 9, 17, 18
+	1, 114, 117, 114, 64, 64, 1, 36, 
+	36, 64, 64, 1, 1, 1, 1, 1, 
+	1, 76, 55, 55, 55, 55, 117, 117, 
+	117, 117, 117, 117, 76, 1, 1, 17, 
+	1, 256, 51, 127, 127, 24, 94, 1, 
+	1, 94, 94, 1, 21, 21, 21, 58, 
+	14, 52, 33, 188, 64, 64, 64, 1, 
+	56, 1, 54, 188, 64, 64, 64, 8, 
+	8, 1, 1, 0, 33, 1, 0, 1, 
+	55, 22, 19, 9, 17, 18
 ]
 
 class << self
@@ -202,21 +187,15 @@ self._re_scanner_index_offsets = [
 	443, 466, 486, 488, 499, 519, 539, 550, 
 	569, 571, 582, 598, 619, 630, 641, 720, 
 	803, 805, 920, 1038, 1153, 1218, 1283, 1285, 
-	1313, 1338, 1347, 1351, 1353, 1355, 1357, 1359, 
-	1361, 1363, 1365, 1367, 1369, 1371, 1373, 1375, 
-	1377, 1379, 1381, 1383, 1385, 1387, 1389, 1391, 
-	1393, 1395, 1397, 1399, 1401, 1403, 1405, 1407, 
-	1409, 1414, 1416, 1418, 1420, 1422, 1424, 1426, 
-	1428, 1430, 1432, 1434, 1436, 1438, 1440, 1442, 
-	1507, 1572, 1574, 1576, 1578, 1580, 1582, 1584, 
-	1661, 1717, 1773, 1829, 1885, 2003, 2121, 2239, 
-	2357, 2475, 2593, 2670, 2672, 2674, 2692, 2694, 
-	2951, 3003, 3131, 3259, 3284, 3379, 3381, 3383, 
-	3478, 3573, 3575, 3597, 3619, 3641, 3700, 3715, 
-	3737, 3790, 3824, 4013, 4078, 4143, 4208, 4210, 
-	4267, 4269, 4324, 4513, 4578, 4643, 4708, 4717, 
-	4726, 4728, 4730, 4731, 4765, 4767, 4768, 4770, 
-	4826, 4849, 4869, 4879, 4897
+	1322, 1359, 1424, 1489, 1491, 1493, 1495, 1497, 
+	1499, 1501, 1578, 1634, 1690, 1746, 1802, 1920, 
+	2038, 2156, 2274, 2392, 2510, 2587, 2589, 2591, 
+	2609, 2611, 2868, 2920, 3048, 3176, 3201, 3296, 
+	3298, 3300, 3395, 3490, 3492, 3514, 3536, 3558, 
+	3617, 3632, 3685, 3719, 3908, 3973, 4038, 4103, 
+	4105, 4162, 4164, 4219, 4408, 4473, 4538, 4603, 
+	4612, 4621, 4623, 4625, 4626, 4660, 4662, 4663, 
+	4665, 4721, 4744, 4764, 4774, 4792
 ]
 
 class << self
@@ -385,158 +364,147 @@ self._re_scanner_indicies = [
 	51, 51, 51, 51, 51, 51, 51, 51, 
 	51, 51, 51, 51, 51, 51, 51, 51, 
 	51, 51, 49, 53, 52, 56, 55, 55, 
-	57, 58, 59, 60, 55, 55, 61, 55, 
-	55, 55, 55, 62, 55, 55, 55, 63, 
-	55, 55, 64, 55, 65, 55, 66, 67, 
-	55, 57, 58, 59, 60, 55, 55, 61, 
-	55, 55, 55, 55, 62, 55, 55, 55, 
-	63, 55, 55, 64, 55, 65, 55, 66, 
-	67, 55, 68, 55, 55, 55, 55, 55, 
-	55, 69, 55, 70, 55, 71, 55, 72, 
-	55, 73, 55, 74, 55, 75, 55, 76, 
-	55, 73, 55, 77, 55, 78, 55, 73, 
-	55, 79, 55, 80, 55, 81, 55, 73, 
-	55, 82, 55, 83, 55, 84, 55, 73, 
-	55, 85, 55, 86, 55, 87, 55, 73, 
-	55, 88, 55, 89, 55, 90, 55, 73, 
-	55, 91, 55, 92, 55, 93, 55, 73, 
-	55, 94, 55, 55, 95, 55, 96, 55, 
-	87, 55, 97, 55, 87, 55, 98, 55, 
-	99, 55, 100, 55, 73, 55, 101, 55, 
-	92, 55, 102, 55, 103, 55, 73, 55, 
-	60, 55, 105, 105, 105, 105, 105, 105, 
-	105, 105, 105, 105, 105, 105, 105, 105, 
-	105, 105, 105, 105, 105, 105, 105, 105, 
-	105, 105, 105, 105, 105, 105, 105, 105, 
-	105, 105, 105, 105, 105, 105, 105, 105, 
-	105, 105, 105, 105, 105, 105, 105, 105, 
-	105, 105, 105, 105, 105, 105, 105, 105, 
-	105, 105, 105, 105, 105, 105, 105, 105, 
-	105, 105, 104, 106, 106, 106, 106, 106, 
-	106, 106, 106, 106, 106, 106, 106, 106, 
-	106, 106, 106, 106, 106, 106, 106, 106, 
-	106, 106, 106, 106, 106, 106, 106, 106, 
-	106, 106, 106, 106, 106, 106, 106, 106, 
-	106, 106, 106, 106, 106, 106, 106, 106, 
-	106, 106, 106, 106, 106, 106, 106, 106, 
-	106, 106, 106, 106, 106, 106, 106, 106, 
-	106, 106, 106, 104, 107, 45, 109, 108, 
-	111, 108, 112, 45, 114, 113, 116, 113, 
-	117, 117, 117, 117, 117, 117, 117, 117, 
-	117, 117, 45, 45, 45, 45, 45, 45, 
-	45, 117, 117, 117, 117, 117, 117, 45, 
+	55, 55, 55, 55, 55, 55, 55, 55, 
+	55, 55, 55, 55, 55, 55, 55, 55, 
+	55, 55, 55, 55, 55, 55, 55, 55, 
+	55, 55, 55, 55, 55, 55, 57, 55, 
+	57, 55, 56, 55, 55, 55, 55, 55, 
+	55, 55, 55, 55, 55, 55, 55, 55, 
+	55, 55, 55, 55, 55, 55, 55, 55, 
+	55, 55, 55, 55, 55, 55, 55, 55, 
+	55, 55, 55, 57, 55, 58, 55, 60, 
+	60, 60, 60, 60, 60, 60, 60, 60, 
+	60, 60, 60, 60, 60, 60, 60, 60, 
+	60, 60, 60, 60, 60, 60, 60, 60, 
+	60, 60, 60, 60, 60, 60, 60, 60, 
+	60, 60, 60, 60, 60, 60, 60, 60, 
+	60, 60, 60, 60, 60, 60, 60, 60, 
+	60, 60, 60, 60, 60, 60, 60, 60, 
+	60, 60, 60, 60, 60, 60, 60, 59, 
+	61, 61, 61, 61, 61, 61, 61, 61, 
+	61, 61, 61, 61, 61, 61, 61, 61, 
+	61, 61, 61, 61, 61, 61, 61, 61, 
+	61, 61, 61, 61, 61, 61, 61, 61, 
+	61, 61, 61, 61, 61, 61, 61, 61, 
+	61, 61, 61, 61, 61, 61, 61, 61, 
+	61, 61, 61, 61, 61, 61, 61, 61, 
+	61, 61, 61, 61, 61, 61, 61, 61, 
+	59, 62, 45, 64, 63, 66, 63, 67, 
+	45, 69, 68, 71, 68, 72, 72, 72, 
+	72, 72, 72, 72, 72, 72, 72, 45, 
+	45, 45, 45, 45, 45, 45, 72, 72, 
+	72, 72, 72, 72, 45, 45, 45, 45, 
 	45, 45, 45, 45, 45, 45, 45, 45, 
 	45, 45, 45, 45, 45, 45, 45, 45, 
+	45, 45, 45, 45, 45, 45, 72, 72, 
+	72, 72, 72, 72, 45, 45, 45, 45, 
 	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 117, 117, 117, 117, 117, 117, 45, 
 	45, 45, 45, 45, 45, 45, 45, 45, 
+	73, 45, 74, 74, 74, 74, 74, 74, 
+	74, 74, 74, 74, 45, 45, 45, 45, 
+	45, 45, 45, 74, 74, 74, 74, 74, 
+	74, 45, 45, 45, 45, 45, 45, 45, 
 	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 118, 45, 119, 119, 119, 
-	119, 119, 119, 119, 119, 119, 119, 45, 
-	45, 45, 45, 45, 45, 45, 119, 119, 
-	119, 119, 119, 119, 45, 45, 45, 45, 
 	45, 45, 45, 45, 45, 45, 45, 45, 
+	45, 45, 45, 74, 74, 74, 74, 74, 
+	74, 45, 75, 75, 75, 75, 75, 75, 
+	75, 75, 75, 75, 45, 45, 45, 45, 
+	45, 45, 45, 75, 75, 75, 75, 75, 
+	75, 45, 45, 45, 45, 45, 45, 45, 
 	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 45, 45, 119, 119, 
-	119, 119, 119, 119, 45, 120, 120, 120, 
-	120, 120, 120, 120, 120, 120, 120, 45, 
-	45, 45, 45, 45, 45, 45, 120, 120, 
-	120, 120, 120, 120, 45, 45, 45, 45, 
 	45, 45, 45, 45, 45, 45, 45, 45, 
+	45, 45, 45, 75, 75, 75, 75, 75, 
+	75, 45, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 45, 45, 45, 45, 
+	45, 45, 45, 76, 76, 76, 76, 76, 
+	76, 45, 45, 45, 45, 45, 45, 45, 
 	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 45, 45, 120, 120, 
-	120, 120, 120, 120, 45, 121, 121, 121, 
-	121, 121, 121, 121, 121, 121, 121, 45, 
-	45, 45, 45, 45, 45, 45, 121, 121, 
-	121, 121, 121, 121, 45, 45, 45, 45, 
 	45, 45, 45, 45, 45, 45, 45, 45, 
+	45, 45, 45, 76, 76, 76, 76, 76, 
+	76, 45, 77, 77, 77, 77, 77, 77, 
+	77, 77, 77, 77, 45, 45, 45, 45, 
+	45, 45, 45, 77, 77, 77, 77, 77, 
+	77, 45, 45, 45, 45, 45, 45, 45, 
 	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 45, 45, 121, 121, 
-	121, 121, 121, 121, 45, 122, 122, 122, 
-	122, 122, 122, 122, 122, 122, 122, 45, 
-	45, 45, 45, 45, 45, 45, 122, 122, 
-	122, 122, 122, 122, 45, 45, 45, 45, 
 	45, 45, 45, 45, 45, 45, 45, 45, 
+	45, 45, 45, 77, 77, 77, 77, 77, 
+	77, 45, 73, 73, 73, 73, 73, 45, 
 	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 45, 45, 122, 122, 
-	122, 122, 122, 122, 45, 118, 118, 118, 
-	118, 118, 45, 45, 45, 45, 45, 45, 
 	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 118, 45, 45, 45, 
+	45, 73, 45, 45, 45, 45, 45, 45, 
 	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 123, 123, 123, 123, 
-	123, 123, 123, 123, 123, 123, 45, 45, 
-	45, 45, 45, 45, 45, 123, 123, 123, 
-	123, 123, 123, 45, 45, 45, 45, 45, 
+	45, 78, 78, 78, 78, 78, 78, 78, 
+	78, 78, 78, 45, 45, 45, 45, 45, 
+	45, 45, 78, 78, 78, 78, 78, 78, 
 	45, 45, 45, 45, 45, 45, 45, 45, 
 	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 45, 123, 123, 123, 
-	123, 123, 123, 45, 45, 45, 45, 45, 
 	45, 45, 45, 45, 45, 45, 45, 45, 
+	45, 45, 78, 78, 78, 78, 78, 78, 
 	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 121, 45, 118, 118, 118, 118, 118, 
 	45, 45, 45, 45, 45, 45, 45, 45, 
+	45, 45, 45, 45, 45, 45, 76, 45, 
+	73, 73, 73, 73, 73, 45, 45, 45, 
 	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 118, 45, 45, 45, 45, 45, 
+	45, 45, 45, 45, 45, 45, 45, 73, 
 	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 124, 124, 124, 124, 124, 124, 
-	124, 124, 124, 124, 45, 45, 45, 45, 
-	45, 45, 45, 124, 124, 124, 124, 124, 
-	124, 45, 45, 45, 45, 45, 45, 45, 
+	45, 45, 45, 45, 45, 45, 45, 79, 
+	79, 79, 79, 79, 79, 79, 79, 79, 
+	79, 45, 45, 45, 45, 45, 45, 45, 
+	79, 79, 79, 79, 79, 79, 45, 45, 
 	45, 45, 45, 45, 45, 45, 45, 45, 
 	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 124, 124, 124, 124, 124, 
-	124, 45, 45, 45, 45, 45, 45, 45, 
 	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 45, 45, 45, 121, 
-	45, 118, 118, 118, 118, 118, 45, 45, 
+	79, 79, 79, 79, 79, 79, 45, 45, 
 	45, 45, 45, 45, 45, 45, 45, 45, 
 	45, 45, 45, 45, 45, 45, 45, 45, 
-	118, 45, 45, 45, 45, 45, 45, 45, 
+	45, 45, 45, 45, 76, 45, 73, 73, 
+	73, 73, 73, 45, 45, 45, 45, 45, 
 	45, 45, 45, 45, 45, 45, 45, 45, 
-	125, 125, 125, 125, 125, 125, 125, 125, 
-	125, 125, 45, 45, 45, 45, 45, 45, 
-	45, 125, 125, 125, 125, 125, 125, 45, 
+	45, 45, 45, 45, 45, 73, 45, 45, 
 	45, 45, 45, 45, 45, 45, 45, 45, 
+	45, 45, 45, 45, 45, 80, 80, 80, 
+	80, 80, 80, 80, 80, 80, 80, 45, 
+	45, 45, 45, 45, 45, 45, 80, 80, 
+	80, 80, 80, 80, 45, 45, 45, 45, 
 	45, 45, 45, 45, 45, 45, 45, 45, 
 	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 125, 125, 125, 125, 125, 125, 45, 
+	45, 45, 45, 45, 45, 45, 80, 80, 
+	80, 80, 80, 80, 45, 45, 45, 45, 
 	45, 45, 45, 45, 45, 45, 45, 45, 
 	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 45, 121, 45, 118, 
-	118, 118, 118, 118, 45, 45, 45, 45, 
+	45, 45, 76, 45, 73, 73, 73, 73, 
+	73, 45, 45, 45, 45, 45, 45, 45, 
 	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 45, 45, 118, 45, 
+	45, 45, 45, 73, 45, 45, 45, 45, 
 	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 45, 45, 126, 126, 
-	126, 126, 126, 126, 126, 126, 126, 126, 
-	45, 45, 45, 45, 45, 45, 45, 126, 
-	126, 126, 126, 126, 126, 45, 45, 45, 
+	45, 45, 45, 81, 81, 81, 81, 81, 
+	81, 81, 81, 81, 81, 45, 45, 45, 
+	45, 45, 45, 45, 81, 81, 81, 81, 
+	81, 81, 45, 45, 45, 45, 45, 45, 
 	45, 45, 45, 45, 45, 45, 45, 45, 
 	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 45, 45, 45, 126, 
-	126, 126, 126, 126, 126, 45, 45, 45, 
+	45, 45, 45, 45, 81, 81, 81, 81, 
+	81, 81, 45, 45, 45, 45, 45, 45, 
 	45, 45, 45, 45, 45, 45, 45, 45, 
 	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 121, 45, 118, 118, 118, 
-	118, 118, 45, 45, 45, 45, 45, 45, 
+	76, 45, 73, 73, 73, 73, 73, 45, 
 	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 118, 45, 45, 45, 
 	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 127, 127, 127, 127, 
-	127, 127, 127, 127, 127, 127, 45, 45, 
-	45, 45, 45, 45, 45, 127, 127, 127, 
-	127, 127, 127, 45, 45, 45, 45, 45, 
+	45, 73, 45, 45, 45, 45, 45, 45, 
 	45, 45, 45, 45, 45, 45, 45, 45, 
+	45, 82, 82, 82, 82, 82, 82, 82, 
+	82, 82, 82, 45, 45, 45, 45, 45, 
+	45, 45, 82, 82, 82, 82, 82, 82, 
 	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 45, 127, 127, 127, 
-	127, 127, 127, 45, 45, 45, 45, 45, 
 	45, 45, 45, 45, 45, 45, 45, 45, 
 	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 121, 45, 118, 118, 118, 118, 118, 
+	45, 45, 82, 82, 82, 82, 82, 82, 
 	45, 45, 45, 45, 45, 45, 45, 45, 
 	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 118, 45, 45, 45, 45, 45, 
+	45, 45, 45, 45, 45, 45, 76, 45, 
+	73, 73, 73, 73, 73, 45, 45, 45, 
+	45, 45, 45, 45, 45, 45, 45, 45, 
+	45, 45, 45, 45, 45, 45, 45, 73, 
 	45, 45, 45, 45, 45, 45, 45, 45, 
 	45, 45, 45, 45, 45, 45, 45, 45, 
 	45, 45, 45, 45, 45, 45, 45, 45, 
@@ -547,21 +515,21 @@ self._re_scanner_indicies = [
 	45, 45, 45, 45, 45, 45, 45, 45, 
 	45, 45, 45, 45, 45, 45, 45, 45, 
 	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 45, 45, 45, 121, 
-	45, 129, 129, 129, 129, 129, 129, 129, 
-	129, 129, 129, 128, 128, 128, 128, 128, 
-	128, 128, 129, 129, 129, 129, 129, 129, 
-	128, 128, 128, 128, 128, 128, 128, 128, 
-	128, 128, 128, 128, 128, 128, 128, 128, 
-	128, 128, 128, 128, 128, 128, 128, 128, 
-	128, 128, 129, 129, 129, 129, 129, 129, 
-	128, 128, 128, 128, 128, 128, 128, 128, 
-	128, 128, 128, 128, 128, 128, 128, 128, 
-	128, 128, 128, 128, 45, 128, 132, 131, 
-	133, 130, 133, 130, 130, 130, 130, 130, 
-	130, 134, 134, 134, 134, 134, 134, 134, 
-	134, 134, 134, 130, 132, 135, 45, 45, 
 	45, 45, 45, 45, 45, 45, 45, 45, 
+	45, 45, 45, 45, 76, 45, 84, 84, 
+	84, 84, 84, 84, 84, 84, 84, 84, 
+	83, 83, 83, 83, 83, 83, 83, 84, 
+	84, 84, 84, 84, 84, 83, 83, 83, 
+	83, 83, 83, 83, 83, 83, 83, 83, 
+	83, 83, 83, 83, 83, 83, 83, 83, 
+	83, 83, 83, 83, 83, 83, 83, 84, 
+	84, 84, 84, 84, 84, 83, 83, 83, 
+	83, 83, 83, 83, 83, 83, 83, 83, 
+	83, 83, 83, 83, 83, 83, 83, 83, 
+	83, 45, 83, 87, 86, 88, 85, 88, 
+	85, 85, 85, 85, 85, 85, 89, 89, 
+	89, 89, 89, 89, 89, 89, 89, 89, 
+	85, 87, 90, 45, 45, 45, 45, 45, 
 	45, 45, 45, 45, 45, 45, 45, 45, 
 	45, 45, 45, 45, 45, 45, 45, 45, 
 	45, 45, 45, 45, 45, 45, 45, 45, 
@@ -569,163 +537,161 @@ self._re_scanner_indicies = [
 	45, 45, 45, 45, 45, 45, 45, 45, 
 	45, 45, 45, 45, 45, 45, 45, 45, 
 	45, 45, 45, 45, 45, 45, 45, 45, 
+	45, 45, 45, 45, 45, 2, 2, 2, 
 	2, 2, 2, 2, 2, 2, 2, 2, 
 	2, 2, 2, 2, 2, 2, 2, 2, 
 	2, 2, 2, 2, 2, 2, 2, 2, 
-	2, 2, 2, 2, 2, 2, 3, 3, 
+	2, 2, 2, 3, 3, 3, 3, 3, 
 	3, 3, 3, 3, 3, 3, 3, 3, 
-	3, 3, 3, 3, 3, 3, 136, 136, 
-	136, 136, 136, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 45, 45, 45, 137, 
-	137, 137, 137, 137, 137, 137, 137, 138, 
-	138, 138, 138, 138, 137, 137, 137, 137, 
-	137, 137, 137, 137, 137, 137, 137, 137, 
-	137, 137, 137, 137, 137, 137, 139, 140, 
-	140, 141, 142, 140, 140, 140, 143, 144, 
-	145, 146, 140, 140, 147, 140, 140, 140, 
-	140, 140, 140, 140, 140, 140, 140, 140, 
-	140, 140, 140, 140, 140, 148, 140, 140, 
-	140, 140, 140, 140, 140, 140, 140, 140, 
-	140, 140, 140, 140, 140, 140, 140, 140, 
-	140, 140, 140, 140, 140, 140, 140, 140, 
-	140, 149, 150, 151, 152, 140, 140, 140, 
-	140, 140, 140, 140, 140, 140, 140, 140, 
-	140, 140, 140, 140, 140, 140, 140, 140, 
-	140, 140, 140, 140, 140, 140, 140, 140, 
-	140, 153, 154, 151, 140, 137, 140, 2, 
+	3, 3, 3, 91, 91, 91, 91, 91, 
+	45, 45, 45, 45, 45, 45, 45, 45, 
+	45, 45, 45, 45, 92, 92, 92, 92, 
+	92, 92, 92, 92, 93, 93, 93, 93, 
+	93, 92, 92, 92, 92, 92, 92, 92, 
+	92, 92, 92, 92, 92, 92, 92, 92, 
+	92, 92, 92, 94, 95, 95, 96, 97, 
+	95, 95, 95, 98, 99, 100, 101, 95, 
+	95, 102, 95, 95, 95, 95, 95, 95, 
+	95, 95, 95, 95, 95, 95, 95, 95, 
+	95, 95, 103, 95, 95, 95, 95, 95, 
+	95, 95, 95, 95, 95, 95, 95, 95, 
+	95, 95, 95, 95, 95, 95, 95, 95, 
+	95, 95, 95, 95, 95, 95, 104, 105, 
+	106, 107, 95, 95, 95, 95, 95, 95, 
+	95, 95, 95, 95, 95, 95, 95, 95, 
+	95, 95, 95, 95, 95, 95, 95, 95, 
+	95, 95, 95, 95, 95, 95, 108, 109, 
+	106, 95, 92, 95, 2, 2, 2, 2, 
 	2, 2, 2, 2, 2, 2, 2, 2, 
 	2, 2, 2, 2, 2, 2, 2, 2, 
 	2, 2, 2, 2, 2, 2, 2, 2, 
-	2, 2, 2, 2, 2, 3, 3, 3, 
+	2, 2, 3, 3, 3, 3, 3, 3, 
 	3, 3, 3, 3, 3, 3, 3, 3, 
-	3, 3, 3, 3, 3, 136, 136, 136, 
-	136, 136, 155, 137, 137, 137, 137, 137, 
-	137, 137, 137, 137, 137, 137, 137, 137, 
-	137, 137, 137, 137, 137, 137, 137, 137, 
-	137, 137, 137, 137, 137, 137, 137, 137, 
-	137, 137, 155, 155, 155, 155, 155, 155, 
-	155, 155, 155, 155, 155, 155, 155, 155, 
-	155, 155, 155, 155, 155, 155, 155, 155, 
-	155, 155, 155, 155, 155, 155, 155, 155, 
-	155, 155, 155, 155, 155, 155, 155, 155, 
-	155, 155, 155, 155, 155, 155, 155, 155, 
-	155, 155, 155, 155, 155, 155, 155, 155, 
-	155, 155, 155, 155, 155, 155, 155, 155, 
-	155, 155, 155, 155, 155, 155, 155, 155, 
-	155, 155, 155, 155, 155, 155, 155, 155, 
-	155, 155, 155, 155, 155, 155, 155, 155, 
-	155, 155, 155, 155, 155, 155, 155, 155, 
-	155, 137, 155, 137, 137, 137, 137, 137, 
-	137, 137, 137, 138, 138, 138, 138, 138, 
-	137, 137, 137, 137, 137, 137, 137, 137, 
-	137, 137, 137, 137, 137, 137, 137, 137, 
-	137, 137, 139, 156, 156, 156, 156, 156, 
-	156, 156, 156, 156, 156, 156, 156, 156, 
-	156, 156, 156, 156, 156, 156, 156, 156, 
-	156, 156, 156, 156, 156, 156, 156, 156, 
-	156, 156, 156, 156, 156, 156, 156, 156, 
-	156, 156, 156, 156, 156, 156, 156, 156, 
-	156, 156, 156, 156, 156, 156, 156, 156, 
-	156, 156, 156, 156, 156, 156, 156, 156, 
-	156, 156, 156, 156, 156, 156, 156, 156, 
-	156, 156, 156, 156, 156, 156, 156, 156, 
-	156, 156, 156, 156, 156, 156, 156, 156, 
-	156, 156, 156, 156, 156, 156, 156, 156, 
-	156, 137, 156, 139, 139, 139, 139, 139, 
-	156, 156, 156, 156, 156, 156, 156, 156, 
-	156, 156, 156, 156, 156, 156, 156, 156, 
-	156, 156, 139, 156, 140, 140, 155, 155, 
-	140, 140, 140, 155, 155, 155, 155, 140, 
-	140, 155, 140, 140, 140, 140, 140, 140, 
-	140, 140, 140, 140, 140, 140, 140, 140, 
-	140, 140, 155, 140, 140, 140, 140, 140, 
-	140, 140, 140, 140, 140, 140, 140, 140, 
-	140, 140, 140, 140, 140, 140, 140, 140, 
-	140, 140, 140, 140, 140, 140, 155, 155, 
-	155, 155, 140, 140, 140, 140, 140, 140, 
-	140, 140, 140, 140, 140, 140, 140, 140, 
+	3, 3, 91, 91, 91, 91, 91, 110, 
+	92, 92, 92, 92, 92, 92, 92, 92, 
+	92, 92, 92, 92, 92, 92, 92, 92, 
+	92, 92, 92, 92, 92, 92, 92, 92, 
+	92, 92, 92, 92, 92, 92, 92, 110, 
+	110, 110, 110, 110, 110, 110, 110, 110, 
+	110, 110, 110, 110, 110, 110, 110, 110, 
+	110, 110, 110, 110, 110, 110, 110, 110, 
+	110, 110, 110, 110, 110, 110, 110, 110, 
+	110, 110, 110, 110, 110, 110, 110, 110, 
+	110, 110, 110, 110, 110, 110, 110, 110, 
+	110, 110, 110, 110, 110, 110, 110, 110, 
+	110, 110, 110, 110, 110, 110, 110, 110, 
+	110, 110, 110, 110, 110, 110, 110, 110, 
+	110, 110, 110, 110, 110, 110, 110, 110, 
+	110, 110, 110, 110, 110, 110, 110, 110, 
+	110, 110, 110, 110, 110, 110, 92, 110, 
+	92, 92, 92, 92, 92, 92, 92, 92, 
+	93, 93, 93, 93, 93, 92, 92, 92, 
+	92, 92, 92, 92, 92, 92, 92, 92, 
+	92, 92, 92, 92, 92, 92, 92, 94, 
+	111, 111, 111, 111, 111, 111, 111, 111, 
+	111, 111, 111, 111, 111, 111, 111, 111, 
+	111, 111, 111, 111, 111, 111, 111, 111, 
+	111, 111, 111, 111, 111, 111, 111, 111, 
+	111, 111, 111, 111, 111, 111, 111, 111, 
+	111, 111, 111, 111, 111, 111, 111, 111, 
+	111, 111, 111, 111, 111, 111, 111, 111, 
+	111, 111, 111, 111, 111, 111, 111, 111, 
+	111, 111, 111, 111, 111, 111, 111, 111, 
+	111, 111, 111, 111, 111, 111, 111, 111, 
+	111, 111, 111, 111, 111, 111, 111, 111, 
+	111, 111, 111, 111, 111, 111, 92, 111, 
+	94, 94, 94, 94, 94, 111, 111, 111, 
+	111, 111, 111, 111, 111, 111, 111, 111, 
+	111, 111, 111, 111, 111, 111, 111, 94, 
+	111, 95, 95, 110, 110, 95, 95, 95, 
+	110, 110, 110, 110, 95, 95, 110, 95, 
+	95, 95, 95, 95, 95, 95, 95, 95, 
+	95, 95, 95, 95, 95, 95, 95, 110, 
+	95, 95, 95, 95, 95, 95, 95, 95, 
+	95, 95, 95, 95, 95, 95, 95, 95, 
+	95, 95, 95, 95, 95, 95, 95, 95, 
+	95, 95, 95, 110, 110, 110, 110, 95, 
+	95, 95, 95, 95, 95, 95, 95, 95, 
+	95, 95, 95, 95, 95, 95, 95, 95, 
+	95, 95, 95, 95, 95, 95, 95, 95, 
+	95, 95, 95, 110, 110, 110, 95, 110, 
+	113, 96, 115, 114, 118, 117, 5, 117, 
+	117, 117, 119, 120, 116, 117, 117, 117, 
+	117, 117, 117, 117, 117, 117, 117, 117, 
+	117, 117, 117, 117, 117, 8, 117, 121, 
+	118, 8, 117, 117, 117, 117, 117, 117, 
+	117, 117, 117, 117, 117, 117, 117, 117, 
+	117, 117, 117, 117, 117, 117, 117, 117, 
+	117, 117, 117, 117, 117, 117, 117, 117, 
+	117, 117, 117, 117, 117, 117, 117, 117, 
+	117, 117, 117, 117, 117, 117, 117, 117, 
+	117, 117, 117, 117, 117, 117, 117, 117, 
+	117, 117, 117, 117, 117, 117, 117, 117, 
+	117, 8, 117, 116, 117, 116, 117, 117, 
+	117, 116, 116, 116, 117, 117, 117, 117, 
+	117, 117, 117, 117, 117, 117, 117, 117, 
+	117, 117, 117, 117, 122, 117, 116, 116, 
+	116, 117, 117, 117, 117, 117, 117, 117, 
+	117, 117, 117, 117, 117, 117, 117, 117, 
+	117, 117, 117, 117, 117, 117, 117, 117, 
+	117, 117, 117, 117, 117, 117, 117, 117, 
+	117, 117, 117, 117, 117, 117, 117, 117, 
+	117, 117, 117, 117, 117, 117, 117, 117, 
+	117, 117, 117, 117, 117, 117, 117, 117, 
+	117, 117, 117, 117, 117, 117, 117, 117, 
+	116, 117, 8, 9, 125, 124, 124, 124, 
+	124, 124, 124, 124, 124, 124, 124, 124, 
+	124, 124, 124, 124, 124, 124, 124, 124, 
+	125, 124, 127, 126, 126, 126, 126, 126, 
+	126, 126, 126, 126, 126, 126, 126, 126, 
+	126, 126, 126, 126, 126, 126, 127, 126, 
+	129, 128, 128, 128, 128, 128, 128, 128, 
+	128, 128, 128, 128, 128, 128, 128, 128, 
+	128, 128, 128, 128, 129, 128, 131, 131, 
+	130, 130, 130, 130, 131, 130, 130, 130, 
+	132, 130, 130, 130, 130, 130, 130, 130, 
+	130, 130, 130, 130, 130, 130, 130, 131, 
+	130, 130, 130, 130, 130, 130, 130, 131, 
+	130, 130, 130, 130, 133, 130, 130, 130, 
+	134, 130, 130, 130, 130, 130, 130, 130, 
+	130, 130, 130, 130, 130, 130, 130, 131, 
+	130, 136, 135, 135, 135, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 135, 
+	137, 45, 45, 45, 137, 45, 45, 45, 
+	45, 45, 45, 45, 45, 45, 137, 137, 
+	45, 45, 45, 137, 137, 45, 45, 45, 
+	45, 45, 45, 45, 45, 45, 45, 45, 
+	137, 45, 45, 45, 137, 45, 45, 45, 
+	45, 45, 45, 45, 45, 45, 45, 137, 
+	45, 45, 45, 137, 45, 138, 45, 45, 
+	45, 45, 45, 45, 45, 45, 45, 45, 
+	45, 45, 45, 45, 45, 45, 45, 45, 
+	45, 45, 45, 45, 45, 45, 45, 45, 
+	45, 45, 45, 45, 45, 138, 45, 139, 
+	139, 139, 139, 139, 139, 139, 139, 139, 
+	139, 139, 139, 139, 139, 139, 139, 139, 
+	139, 139, 139, 139, 139, 139, 139, 139, 
+	139, 139, 139, 139, 139, 140, 140, 140, 
 	140, 140, 140, 140, 140, 140, 140, 140, 
-	140, 140, 140, 140, 140, 140, 155, 155, 
-	155, 140, 155, 158, 141, 160, 159, 163, 
-	162, 5, 162, 162, 162, 164, 165, 161, 
-	162, 162, 162, 162, 162, 162, 162, 162, 
-	162, 162, 162, 162, 162, 162, 162, 162, 
-	8, 162, 166, 163, 8, 162, 162, 162, 
-	162, 162, 162, 162, 162, 162, 162, 162, 
-	162, 162, 162, 162, 162, 162, 162, 162, 
-	162, 162, 162, 162, 162, 162, 162, 162, 
-	162, 162, 162, 162, 162, 162, 162, 162, 
-	162, 162, 162, 162, 162, 162, 162, 162, 
-	162, 162, 162, 162, 162, 162, 162, 162, 
-	162, 162, 162, 162, 162, 162, 162, 162, 
-	162, 162, 162, 162, 8, 162, 161, 162, 
-	161, 162, 162, 162, 161, 161, 161, 162, 
-	162, 162, 162, 162, 162, 162, 162, 162, 
-	162, 162, 162, 162, 162, 162, 162, 167, 
-	162, 161, 161, 161, 162, 162, 162, 162, 
-	162, 162, 162, 162, 162, 162, 162, 162, 
-	162, 162, 162, 162, 162, 162, 162, 162, 
-	162, 162, 162, 162, 162, 162, 162, 162, 
-	162, 162, 162, 162, 162, 162, 162, 162, 
-	162, 162, 162, 162, 162, 162, 162, 162, 
-	162, 162, 162, 162, 162, 162, 162, 162, 
-	162, 162, 162, 162, 162, 162, 162, 162, 
-	162, 162, 162, 161, 162, 8, 9, 170, 
-	169, 169, 169, 169, 169, 169, 169, 169, 
-	169, 169, 169, 169, 169, 169, 169, 169, 
-	169, 169, 169, 170, 169, 172, 171, 171, 
-	171, 171, 171, 171, 171, 171, 171, 171, 
-	171, 171, 171, 171, 171, 171, 171, 171, 
-	171, 172, 171, 174, 173, 173, 173, 173, 
-	173, 173, 173, 173, 173, 173, 173, 173, 
-	173, 173, 173, 173, 173, 173, 173, 174, 
-	173, 176, 176, 175, 175, 175, 175, 176, 
-	175, 175, 175, 177, 175, 175, 175, 175, 
-	175, 175, 175, 175, 175, 175, 175, 175, 
-	175, 175, 176, 175, 175, 175, 175, 175, 
-	175, 175, 176, 175, 175, 175, 175, 178, 
-	175, 175, 175, 179, 175, 175, 175, 175, 
-	175, 175, 175, 175, 175, 175, 175, 175, 
-	175, 175, 176, 175, 181, 180, 180, 180, 
-	43, 43, 43, 43, 43, 43, 43, 43, 
-	43, 43, 180, 183, 182, 182, 182, 182, 
-	182, 182, 182, 182, 182, 182, 182, 182, 
-	182, 182, 182, 182, 182, 182, 182, 183, 
-	182, 184, 45, 45, 45, 184, 45, 45, 
-	45, 45, 45, 45, 45, 45, 45, 184, 
-	184, 45, 45, 45, 184, 184, 45, 45, 
-	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 184, 45, 45, 45, 184, 45, 45, 
-	45, 45, 45, 45, 45, 45, 45, 45, 
-	184, 45, 45, 45, 184, 45, 185, 45, 
-	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 45, 45, 185, 45, 
-	186, 186, 186, 186, 186, 186, 186, 186, 
-	186, 186, 186, 186, 186, 186, 186, 186, 
-	186, 186, 186, 186, 186, 186, 186, 186, 
-	186, 186, 186, 186, 186, 186, 187, 187, 
-	187, 187, 187, 187, 187, 187, 187, 187, 
-	187, 187, 187, 187, 187, 187, 188, 188, 
-	188, 188, 188, 50, 50, 50, 50, 50, 
+	140, 140, 140, 140, 140, 141, 141, 141, 
+	141, 141, 50, 50, 50, 50, 50, 50, 
 	50, 50, 50, 50, 50, 50, 50, 50, 
 	50, 50, 50, 50, 50, 50, 50, 50, 
 	50, 50, 50, 50, 50, 50, 50, 50, 
 	50, 50, 50, 50, 50, 50, 50, 50, 
 	50, 50, 50, 50, 50, 50, 50, 50, 
-	50, 50, 189, 50, 190, 50, 189, 189, 
-	189, 189, 50, 191, 189, 50, 50, 50, 
+	50, 142, 50, 143, 50, 142, 142, 142, 
+	142, 50, 144, 142, 50, 50, 50, 50, 
 	50, 50, 50, 50, 50, 50, 50, 50, 
-	50, 50, 50, 50, 50, 189, 50, 50, 
+	50, 50, 50, 50, 142, 50, 50, 50, 
 	50, 50, 50, 50, 50, 50, 50, 50, 
 	50, 50, 50, 50, 50, 50, 50, 50, 
 	50, 50, 50, 50, 50, 50, 50, 50, 
-	50, 192, 193, 194, 195, 50, 50, 50, 
+	145, 146, 147, 148, 50, 50, 50, 50, 
 	50, 50, 50, 50, 50, 50, 50, 50, 
 	50, 50, 50, 50, 50, 50, 50, 50, 
 	50, 50, 50, 50, 50, 50, 50, 50, 
-	50, 189, 189, 189, 50, 50, 50, 50, 
+	142, 142, 142, 50, 50, 50, 50, 50, 
 	50, 50, 50, 50, 50, 50, 50, 50, 
 	50, 50, 50, 50, 50, 50, 50, 50, 
 	50, 50, 50, 50, 50, 50, 50, 50, 
@@ -733,7 +699,7 @@ self._re_scanner_indicies = [
 	50, 50, 50, 50, 50, 50, 50, 50, 
 	50, 50, 50, 50, 50, 50, 50, 50, 
 	50, 50, 50, 50, 50, 50, 50, 50, 
-	50, 50, 50, 50, 50, 196, 51, 51, 
+	50, 50, 50, 50, 149, 51, 51, 51, 
 	51, 51, 51, 51, 51, 51, 51, 51, 
 	51, 51, 51, 51, 51, 51, 51, 51, 
 	51, 51, 51, 51, 51, 51, 51, 51, 
@@ -741,104 +707,104 @@ self._re_scanner_indicies = [
 	51, 51, 51, 51, 51, 51, 51, 51, 
 	51, 51, 51, 51, 51, 51, 51, 51, 
 	51, 51, 51, 51, 51, 51, 51, 51, 
-	51, 51, 51, 51, 51, 51, 196, 197, 
-	197, 197, 197, 197, 197, 197, 197, 197, 
-	197, 197, 197, 197, 197, 197, 197, 197, 
-	197, 197, 197, 197, 197, 197, 197, 197, 
-	197, 197, 197, 197, 197, 197, 197, 197, 
-	197, 197, 197, 197, 197, 197, 197, 197, 
-	197, 197, 197, 197, 197, 197, 197, 197, 
-	197, 197, 197, 197, 197, 197, 197, 197, 
-	197, 197, 197, 197, 197, 197, 197, 196, 
-	198, 196, 200, 199, 199, 199, 199, 199, 
-	199, 199, 199, 199, 199, 199, 199, 199, 
-	199, 199, 199, 199, 199, 199, 199, 199, 
-	199, 199, 199, 199, 199, 199, 199, 199, 
-	199, 199, 199, 199, 199, 199, 199, 199, 
-	199, 199, 199, 199, 199, 199, 199, 199, 
-	199, 199, 199, 199, 199, 199, 199, 199, 
-	199, 201, 199, 204, 203, 206, 206, 205, 
-	205, 205, 206, 205, 205, 205, 205, 206, 
-	205, 205, 206, 205, 205, 206, 205, 205, 
-	205, 206, 205, 205, 205, 206, 206, 206, 
-	205, 205, 205, 206, 206, 206, 206, 206, 
-	206, 205, 206, 205, 205, 205, 205, 205, 
-	206, 205, 206, 205, 206, 206, 206, 206, 
-	206, 206, 206, 205, 207, 207, 207, 207, 
-	207, 207, 207, 207, 207, 207, 207, 207, 
-	207, 207, 207, 207, 207, 207, 207, 207, 
-	207, 207, 207, 207, 207, 207, 207, 207, 
-	207, 207, 208, 208, 208, 208, 208, 208, 
-	208, 208, 208, 208, 208, 208, 208, 208, 
-	208, 208, 209, 209, 209, 209, 209, 105, 
-	105, 105, 105, 105, 105, 105, 105, 105, 
-	105, 105, 105, 105, 105, 105, 105, 105, 
-	105, 105, 105, 105, 105, 105, 105, 105, 
-	105, 105, 105, 105, 105, 105, 105, 105, 
-	105, 105, 105, 105, 105, 105, 105, 105, 
-	105, 105, 105, 105, 105, 105, 210, 105, 
-	105, 105, 210, 210, 210, 210, 105, 105, 
-	210, 105, 211, 212, 212, 212, 212, 212, 
-	212, 212, 213, 213, 105, 105, 105, 105, 
-	105, 210, 105, 45, 45, 214, 215, 105, 
-	105, 45, 215, 105, 105, 45, 105, 216, 
-	105, 105, 217, 105, 215, 215, 105, 105, 
-	105, 215, 215, 105, 45, 210, 210, 210, 
-	210, 105, 105, 218, 218, 107, 215, 218, 
-	218, 105, 215, 105, 105, 105, 105, 105, 
-	218, 105, 217, 105, 218, 215, 218, 219, 
-	218, 215, 220, 105, 45, 210, 210, 210, 
-	105, 105, 105, 105, 105, 105, 105, 105, 
-	105, 105, 105, 105, 105, 105, 105, 105, 
-	105, 105, 105, 105, 105, 105, 105, 105, 
-	105, 105, 105, 105, 105, 105, 105, 105, 
-	105, 105, 105, 105, 105, 105, 105, 105, 
-	105, 105, 105, 105, 105, 105, 105, 105, 
-	105, 105, 105, 105, 105, 105, 105, 105, 
-	105, 105, 105, 105, 105, 105, 105, 105, 
-	105, 221, 106, 106, 106, 106, 106, 106, 
-	106, 106, 106, 106, 106, 106, 106, 106, 
-	106, 106, 106, 106, 106, 106, 106, 106, 
-	106, 106, 106, 106, 106, 106, 106, 106, 
-	106, 106, 106, 106, 106, 106, 106, 106, 
-	106, 106, 106, 106, 106, 106, 106, 106, 
-	106, 106, 106, 106, 106, 106, 106, 106, 
-	106, 106, 106, 106, 106, 106, 106, 106, 
-	106, 106, 221, 222, 222, 222, 222, 222, 
-	222, 222, 222, 222, 222, 222, 222, 222, 
-	222, 222, 222, 222, 222, 222, 222, 222, 
-	222, 222, 222, 222, 222, 222, 222, 222, 
-	222, 222, 222, 222, 222, 222, 222, 222, 
-	222, 222, 222, 222, 222, 222, 222, 222, 
-	222, 222, 222, 222, 222, 222, 222, 222, 
-	222, 222, 222, 222, 222, 222, 222, 222, 
-	222, 222, 222, 221, 224, 224, 224, 224, 
-	224, 224, 224, 224, 223, 226, 226, 226, 
-	226, 226, 226, 226, 226, 225, 228, 108, 
-	230, 229, 108, 232, 113, 113, 113, 113, 
-	113, 113, 113, 113, 113, 113, 113, 113, 
-	113, 113, 113, 113, 113, 113, 113, 113, 
-	113, 113, 113, 113, 113, 113, 113, 113, 
-	113, 113, 113, 233, 113, 235, 234, 113, 
-	116, 113, 237, 237, 237, 237, 237, 237, 
-	237, 237, 237, 237, 236, 236, 236, 236, 
-	236, 236, 236, 237, 237, 237, 237, 237, 
-	237, 236, 236, 236, 236, 236, 236, 236, 
-	236, 236, 236, 236, 236, 236, 236, 236, 
-	236, 236, 236, 236, 236, 236, 236, 236, 
-	236, 236, 236, 237, 237, 237, 237, 237, 
-	237, 236, 239, 238, 238, 238, 238, 238, 
-	240, 238, 238, 238, 241, 241, 241, 241, 
-	241, 241, 241, 241, 241, 238, 238, 242, 
-	238, 132, 131, 131, 131, 131, 131, 243, 
-	131, 131, 243, 243, 243, 243, 243, 243, 
-	243, 243, 243, 243, 131, 134, 134, 134, 
-	134, 134, 134, 134, 134, 134, 243, 133, 
-	243, 243, 243, 243, 243, 243, 134, 134, 
-	134, 134, 134, 134, 134, 134, 134, 134, 
-	243, 243, 135, 135, 243, 243, 243, 243, 
-	243, 243, 243, 243, 243, 243, 135, 135, 
-	135, 135, 132, 135, 0
+	51, 51, 51, 51, 51, 149, 150, 150, 
+	150, 150, 150, 150, 150, 150, 150, 150, 
+	150, 150, 150, 150, 150, 150, 150, 150, 
+	150, 150, 150, 150, 150, 150, 150, 150, 
+	150, 150, 150, 150, 150, 150, 150, 150, 
+	150, 150, 150, 150, 150, 150, 150, 150, 
+	150, 150, 150, 150, 150, 150, 150, 150, 
+	150, 150, 150, 150, 150, 150, 150, 150, 
+	150, 150, 150, 150, 150, 150, 149, 151, 
+	149, 153, 152, 152, 152, 152, 152, 152, 
+	152, 152, 152, 152, 152, 152, 152, 152, 
+	152, 152, 152, 152, 152, 152, 152, 152, 
+	152, 152, 152, 152, 152, 152, 152, 152, 
+	152, 152, 152, 152, 152, 152, 152, 152, 
+	152, 152, 152, 152, 152, 152, 152, 152, 
+	152, 152, 152, 152, 152, 152, 152, 152, 
+	154, 152, 55, 156, 158, 158, 157, 157, 
+	157, 158, 157, 157, 157, 157, 158, 157, 
+	157, 158, 157, 157, 158, 157, 157, 157, 
+	158, 157, 157, 157, 158, 158, 158, 157, 
+	157, 157, 158, 158, 158, 158, 158, 158, 
+	157, 158, 157, 157, 157, 157, 157, 158, 
+	157, 158, 157, 158, 158, 158, 158, 158, 
+	158, 158, 157, 159, 159, 159, 159, 159, 
+	159, 159, 159, 159, 159, 159, 159, 159, 
+	159, 159, 159, 159, 159, 159, 159, 159, 
+	159, 159, 159, 159, 159, 159, 159, 159, 
+	159, 160, 160, 160, 160, 160, 160, 160, 
+	160, 160, 160, 160, 160, 160, 160, 160, 
+	160, 161, 161, 161, 161, 161, 60, 60, 
+	60, 60, 60, 60, 60, 60, 60, 60, 
+	60, 60, 60, 60, 60, 60, 60, 60, 
+	60, 60, 60, 60, 60, 60, 60, 60, 
+	60, 60, 60, 60, 60, 60, 60, 60, 
+	60, 60, 60, 60, 60, 60, 60, 60, 
+	60, 60, 60, 60, 60, 162, 60, 60, 
+	60, 162, 162, 162, 162, 60, 60, 162, 
+	60, 163, 164, 164, 164, 164, 164, 164, 
+	164, 165, 165, 60, 60, 60, 60, 60, 
+	162, 60, 45, 45, 166, 167, 60, 60, 
+	45, 167, 60, 60, 45, 60, 168, 60, 
+	60, 169, 60, 167, 167, 60, 60, 60, 
+	167, 167, 60, 45, 162, 162, 162, 162, 
+	60, 60, 170, 170, 62, 167, 170, 170, 
+	60, 167, 60, 60, 60, 60, 60, 170, 
+	60, 169, 60, 170, 167, 170, 171, 170, 
+	167, 172, 60, 45, 162, 162, 162, 60, 
+	60, 60, 60, 60, 60, 60, 60, 60, 
+	60, 60, 60, 60, 60, 60, 60, 60, 
+	60, 60, 60, 60, 60, 60, 60, 60, 
+	60, 60, 60, 60, 60, 60, 60, 60, 
+	60, 60, 60, 60, 60, 60, 60, 60, 
+	60, 60, 60, 60, 60, 60, 60, 60, 
+	60, 60, 60, 60, 60, 60, 60, 60, 
+	60, 60, 60, 60, 60, 60, 60, 60, 
+	173, 61, 61, 61, 61, 61, 61, 61, 
+	61, 61, 61, 61, 61, 61, 61, 61, 
+	61, 61, 61, 61, 61, 61, 61, 61, 
+	61, 61, 61, 61, 61, 61, 61, 61, 
+	61, 61, 61, 61, 61, 61, 61, 61, 
+	61, 61, 61, 61, 61, 61, 61, 61, 
+	61, 61, 61, 61, 61, 61, 61, 61, 
+	61, 61, 61, 61, 61, 61, 61, 61, 
+	61, 173, 174, 174, 174, 174, 174, 174, 
+	174, 174, 174, 174, 174, 174, 174, 174, 
+	174, 174, 174, 174, 174, 174, 174, 174, 
+	174, 174, 174, 174, 174, 174, 174, 174, 
+	174, 174, 174, 174, 174, 174, 174, 174, 
+	174, 174, 174, 174, 174, 174, 174, 174, 
+	174, 174, 174, 174, 174, 174, 174, 174, 
+	174, 174, 174, 174, 174, 174, 174, 174, 
+	174, 174, 173, 176, 176, 176, 176, 176, 
+	176, 176, 176, 175, 178, 178, 178, 178, 
+	178, 178, 178, 178, 177, 180, 63, 182, 
+	181, 63, 184, 68, 68, 68, 68, 68, 
+	68, 68, 68, 68, 68, 68, 68, 68, 
+	68, 68, 68, 68, 68, 68, 68, 68, 
+	68, 68, 68, 68, 68, 68, 68, 68, 
+	68, 68, 185, 68, 187, 186, 68, 71, 
+	68, 189, 189, 189, 189, 189, 189, 189, 
+	189, 189, 189, 188, 188, 188, 188, 188, 
+	188, 188, 189, 189, 189, 189, 189, 189, 
+	188, 188, 188, 188, 188, 188, 188, 188, 
+	188, 188, 188, 188, 188, 188, 188, 188, 
+	188, 188, 188, 188, 188, 188, 188, 188, 
+	188, 188, 189, 189, 189, 189, 189, 189, 
+	188, 191, 190, 190, 190, 190, 190, 192, 
+	190, 190, 190, 193, 193, 193, 193, 193, 
+	193, 193, 193, 193, 190, 190, 194, 190, 
+	87, 86, 86, 86, 86, 86, 195, 86, 
+	86, 195, 195, 195, 195, 195, 195, 195, 
+	195, 195, 195, 86, 89, 89, 89, 89, 
+	89, 89, 89, 89, 89, 195, 88, 195, 
+	195, 195, 195, 195, 195, 89, 89, 89, 
+	89, 89, 89, 89, 89, 89, 89, 195, 
+	195, 90, 90, 195, 195, 195, 195, 195, 
+	195, 195, 195, 195, 195, 90, 90, 90, 
+	90, 87, 90, 0
 ]
 
 class << self
@@ -846,37 +812,31 @@ class << self
 	private :_re_scanner_trans_targs, :_re_scanner_trans_targs=
 end
 self._re_scanner_trans_targs = [
-	119, 120, 1, 2, 119, 4, 119, 6, 
-	119, 8, 129, 119, 10, 17, 11, 119, 
+	73, 74, 1, 2, 73, 4, 73, 6, 
+	73, 8, 83, 73, 10, 17, 11, 73, 
 	12, 16, 14, 13, 15, 18, 19, 23, 
-	21, 20, 22, 25, 31, 26, 119, 27, 
+	21, 20, 22, 25, 31, 26, 73, 27, 
 	29, 28, 30, 32, 33, 35, 34, 36, 
-	119, 38, 135, 39, 41, 0, 42, 43, 
-	137, 138, 138, 44, 138, 138, 138, 138, 
-	48, 49, 60, 64, 68, 72, 76, 80, 
-	85, 89, 91, 94, 50, 57, 51, 55, 
-	52, 53, 54, 138, 56, 58, 59, 61, 
-	62, 63, 65, 66, 67, 69, 70, 71, 
-	73, 74, 75, 77, 78, 79, 81, 83, 
-	82, 84, 86, 87, 88, 90, 92, 93, 
-	146, 146, 95, 98, 146, 152, 146, 154, 
-	101, 146, 155, 146, 157, 104, 107, 105, 
-	106, 146, 108, 109, 110, 111, 112, 113, 
-	146, 159, 160, 115, 116, 160, 117, 118, 
-	3, 121, 122, 123, 124, 125, 119, 126, 
-	119, 130, 131, 119, 132, 119, 133, 119, 
-	119, 134, 119, 119, 119, 119, 119, 119, 
-	127, 119, 128, 119, 5, 119, 7, 119, 
-	119, 119, 119, 119, 119, 119, 119, 119, 
-	119, 119, 9, 24, 119, 37, 119, 119, 
-	136, 40, 139, 140, 141, 138, 142, 143, 
-	144, 138, 138, 138, 138, 45, 138, 138, 
-	46, 138, 138, 138, 47, 145, 145, 147, 
-	148, 149, 146, 150, 150, 146, 97, 146, 
-	100, 146, 146, 103, 114, 146, 96, 146, 
-	151, 146, 146, 146, 153, 146, 99, 146, 
-	156, 158, 146, 102, 146, 146, 160, 161, 
-	162, 163, 164, 160
+	73, 38, 73, 39, 41, 0, 42, 43, 
+	90, 91, 91, 44, 91, 91, 91, 47, 
+	48, 91, 91, 99, 99, 49, 52, 99, 
+	105, 99, 107, 55, 99, 108, 99, 110, 
+	58, 61, 59, 60, 99, 62, 63, 64, 
+	65, 66, 67, 99, 112, 113, 69, 70, 
+	113, 71, 72, 3, 75, 76, 77, 78, 
+	79, 73, 80, 73, 84, 85, 73, 86, 
+	73, 87, 73, 73, 88, 73, 73, 73, 
+	73, 73, 73, 81, 73, 82, 73, 5, 
+	73, 7, 73, 73, 73, 73, 73, 73, 
+	73, 73, 73, 73, 73, 9, 24, 73, 
+	37, 89, 40, 92, 93, 94, 91, 95, 
+	96, 97, 91, 91, 91, 91, 45, 91, 
+	91, 46, 91, 91, 91, 98, 98, 100, 
+	101, 102, 99, 103, 103, 99, 51, 99, 
+	54, 99, 99, 57, 68, 99, 50, 99, 
+	104, 99, 99, 99, 106, 99, 53, 99, 
+	109, 111, 99, 56, 99, 99, 113, 114, 
+	115, 116, 117, 113
 ]
 
 class << self
@@ -889,32 +849,26 @@ self._re_scanner_trans_actions = [
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 10, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	11, 0, 0, 0, 0, 0, 0, 0, 
-	13, 14, 15, 0, 16, 17, 18, 19, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 20, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	21, 22, 0, 0, 24, 0, 25, 0, 
-	0, 26, 0, 27, 0, 0, 0, 0, 
-	0, 28, 0, 0, 0, 0, 0, 0, 
-	29, 0, 30, 0, 0, 31, 0, 0, 
-	0, 0, 0, 0, 0, 0, 34, 35, 
-	36, 0, 0, 37, 0, 38, 39, 40, 
-	41, 39, 42, 43, 44, 45, 46, 47, 
-	48, 49, 0, 50, 0, 51, 0, 52, 
-	53, 54, 55, 56, 57, 58, 59, 60, 
-	61, 62, 0, 0, 63, 0, 64, 65, 
-	67, 0, 0, 39, 39, 68, 0, 39, 
-	69, 70, 71, 72, 73, 0, 74, 75, 
-	0, 76, 77, 78, 0, 79, 80, 0, 
-	39, 39, 81, 82, 83, 84, 0, 85, 
-	0, 86, 87, 0, 0, 88, 0, 89, 
-	0, 90, 91, 92, 39, 93, 0, 94, 
-	39, 0, 95, 0, 96, 97, 98, 39, 
-	39, 39, 39, 99
+	11, 0, 12, 0, 0, 0, 0, 0, 
+	14, 15, 16, 0, 17, 18, 19, 0, 
+	0, 20, 21, 22, 23, 0, 0, 25, 
+	0, 26, 0, 0, 27, 0, 28, 0, 
+	0, 0, 0, 0, 29, 0, 0, 0, 
+	0, 0, 0, 30, 0, 31, 0, 0, 
+	32, 0, 0, 0, 0, 0, 0, 0, 
+	0, 35, 36, 37, 0, 0, 38, 0, 
+	39, 40, 41, 42, 40, 43, 44, 45, 
+	46, 47, 48, 49, 50, 0, 51, 0, 
+	52, 0, 53, 54, 55, 56, 57, 58, 
+	59, 60, 61, 62, 63, 0, 0, 64, 
+	0, 66, 0, 0, 40, 40, 67, 0, 
+	40, 68, 69, 70, 71, 72, 0, 73, 
+	74, 0, 75, 76, 77, 78, 79, 0, 
+	40, 40, 80, 81, 82, 83, 0, 84, 
+	0, 85, 86, 0, 0, 87, 0, 88, 
+	0, 89, 90, 91, 40, 92, 0, 93, 
+	40, 0, 94, 0, 95, 96, 97, 40, 
+	40, 40, 40, 98
 ]
 
 class << self
@@ -931,18 +885,12 @@ self._re_scanner_to_state_actions = [
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 33, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 65, 65, 65, 0, 0, 0, 0, 
+	0, 0, 65, 65, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 32, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	66, 66, 66, 0, 0, 0, 0, 0, 
-	0, 66, 66, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	66, 0, 0, 0, 0
+	0, 65, 0, 0, 0, 0
 ]
 
 class << self
@@ -959,18 +907,12 @@ self._re_scanner_from_state_actions = [
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 34, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 34, 34, 34, 0, 0, 0, 0, 
+	0, 0, 34, 34, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 33, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	33, 33, 33, 0, 0, 0, 0, 0, 
-	0, 33, 33, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	33, 0, 0, 0, 0
+	0, 34, 0, 0, 0, 0
 ]
 
 class << self
@@ -983,22 +925,16 @@ self._re_scanner_eof_actions = [
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	12, 12, 12, 12, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
+	13, 13, 13, 13, 0, 0, 0, 0, 
+	0, 0, 0, 24, 24, 0, 24, 24, 
+	0, 24, 24, 24, 24, 24, 24, 24, 
+	24, 24, 24, 24, 24, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 24, 0, 0, 0, 0, 
+	0, 0, 0, 24, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 23, 23, 0, 23, 23, 0, 23, 
-	23, 23, 23, 23, 23, 23, 23, 23, 
-	23, 23, 23, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 23, 0, 0, 0, 0, 0, 
-	0, 0, 23, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0
+	0, 0, 0, 0, 0, 0
 ]
 
 class << self
@@ -1012,31 +948,25 @@ self._re_scanner_eof_trans = [
 	12, 12, 12, 12, 12, 12, 12, 12, 
 	12, 12, 12, 12, 12, 41, 41, 41, 
 	0, 0, 0, 0, 50, 50, 53, 55, 
-	55, 55, 55, 55, 55, 55, 55, 55, 
-	55, 55, 55, 55, 55, 55, 55, 55, 
-	55, 55, 55, 55, 55, 55, 55, 55, 
-	55, 55, 55, 55, 55, 55, 55, 55, 
-	55, 55, 55, 55, 55, 55, 55, 55, 
-	55, 55, 55, 55, 55, 55, 55, 105, 
-	105, 0, 0, 111, 0, 0, 116, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 131, 131, 131, 131, 0, 
-	156, 156, 157, 157, 156, 158, 160, 162, 
-	162, 169, 170, 172, 174, 176, 181, 183, 
-	0, 0, 0, 197, 197, 197, 197, 200, 
-	203, 0, 0, 222, 222, 222, 224, 226, 
-	228, 228, 228, 232, 232, 232, 232, 237, 
-	0, 244, 244, 244, 244
+	55, 60, 60, 0, 0, 66, 0, 0, 
+	71, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 86, 86, 86, 
+	86, 0, 111, 111, 112, 112, 111, 113, 
+	115, 117, 117, 124, 125, 127, 129, 131, 
+	136, 0, 0, 0, 150, 150, 150, 150, 
+	153, 156, 0, 0, 174, 174, 174, 176, 
+	178, 180, 180, 180, 184, 184, 184, 184, 
+	189, 0, 196, 196, 196, 196
 ]
 
 class << self
 	attr_accessor :re_scanner_start
 end
-self.re_scanner_start = 119;
+self.re_scanner_start = 73;
 class << self
 	attr_accessor :re_scanner_first_final
 end
-self.re_scanner_first_final = 119;
+self.re_scanner_first_final = 73;
 class << self
 	attr_accessor :re_scanner_error
 end
@@ -1045,36 +975,36 @@ self.re_scanner_error = 0;
 class << self
 	attr_accessor :re_scanner_en_char_type
 end
-self.re_scanner_en_char_type = 136;
+self.re_scanner_en_char_type = 89;
 class << self
 	attr_accessor :re_scanner_en_unicode_property
 end
-self.re_scanner_en_unicode_property = 137;
+self.re_scanner_en_unicode_property = 90;
 class << self
 	attr_accessor :re_scanner_en_character_set
 end
-self.re_scanner_en_character_set = 138;
+self.re_scanner_en_character_set = 91;
 class << self
 	attr_accessor :re_scanner_en_set_escape_sequence
 end
-self.re_scanner_en_set_escape_sequence = 145;
+self.re_scanner_en_set_escape_sequence = 98;
 class << self
 	attr_accessor :re_scanner_en_escape_sequence
 end
-self.re_scanner_en_escape_sequence = 146;
+self.re_scanner_en_escape_sequence = 99;
 class << self
 	attr_accessor :re_scanner_en_conditional_expression
 end
-self.re_scanner_en_conditional_expression = 160;
+self.re_scanner_en_conditional_expression = 113;
 class << self
 	attr_accessor :re_scanner_en_main
 end
-self.re_scanner_en_main = 119;
+self.re_scanner_en_main = 73;
 
 
-# line 739 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+# line 744 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
     
-# line 1077 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner.rb"
+# line 1007 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner.rb"
 begin
 	p ||= 0
 	pe ||= data.length
@@ -1085,9 +1015,9 @@ begin
 	act = 0
 end
 
-# line 740 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+# line 745 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
     
-# line 1090 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner.rb"
+# line 1020 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner.rb"
 begin
 	testEof = false
 	_slen, _trans, _keys, _inds, _acts, _nacts = nil
@@ -1110,12 +1040,12 @@ begin
 	end
 	if _goto_level <= _resume
 	case _re_scanner_from_state_actions[cs] 
-	when 33 then
+	when 34 then
 # line 1 "NONE"
 		begin
 ts = p
 		end
-# line 1118 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner.rb"
+# line 1048 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner.rb"
 	end
 	_keys = cs << 1
 	_inds = _re_scanner_index_offsets[cs]
@@ -1134,20 +1064,20 @@ ts = p
 	cs = _re_scanner_trans_targs[_trans]
 	if _re_scanner_trans_actions[_trans] != 0
 	case _re_scanner_trans_actions[_trans]
-	when 35 then
-# line 159 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 36 then
+# line 152 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
  self.group_depth = group_depth + 1 		end
 	when 4 then
-# line 160 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+# line 153 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
  self.group_depth = group_depth - 1 		end
-	when 39 then
+	when 40 then
 # line 1 "NONE"
 		begin
 te = p+1
 		end
-	when 67 then
+	when 66 then
 # line 12 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/char_type.rl"
 		begin
 te = p+1
@@ -1173,7 +1103,7 @@ te = p+1
 
      end
 		end
-	when 13 then
+	when 14 then
 # line 16 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/property.rl"
 		begin
 te = p+1
@@ -1184,7 +1114,7 @@ te = p+1
       name = data[ts+2..te-2].pack('c*').gsub(/[\^\s_\-]/, '').downcase
 
       token = self.class.short_prop_map[name] || self.class.long_prop_map[name]
-      raise UnknownUnicodePropertyError.new(name) unless token
+      validation_error(:property, name) unless token
 
       self.emit(type, token.to_sym, text)
 
@@ -1197,8 +1127,8 @@ te = p+1
 
      end
 		end
-	when 17 then
-# line 187 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 18 then
+# line 180 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin  # special case, emits two tokens
@@ -1206,8 +1136,8 @@ te = p+1
       emit(:set, :intersection, '&&')
      end
 		end
-	when 72 then
-# line 192 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 71 then
+# line 185 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
@@ -1219,39 +1149,39 @@ te = p+1
       end
      end
 		end
-	when 74 then
-# line 213 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 73 then
+# line 206 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
       emit(:set, :intersection, copy(data, ts, te))
      end
 		end
-	when 70 then
-# line 217 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 69 then
+# line 210 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 145
+		cs = 98
 		_goto_level = _again
 		next
 	end
 
      end
 		end
-	when 68 then
-# line 247 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 67 then
+# line 244 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
       emit(:literal, :literal, copy(data, ts, te))
      end
 		end
-	when 15 then
-# line 251 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 16 then
+# line 248 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
@@ -1259,8 +1189,8 @@ te = p+1
       emit(:literal, :literal, text)
      end
 		end
-	when 75 then
-# line 201 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 74 then
+# line 194 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -1273,8 +1203,8 @@ p = p - 1; begin
       end
      end
 		end
-	when 78 then
-# line 221 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 77 then
+# line 214 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -1282,15 +1212,15 @@ p = p - 1; begin
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 138
+		cs = 91
 		_goto_level = _again
 		next
 	end
 
      end
 		end
-	when 73 then
-# line 251 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 72 then
+# line 248 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -1298,8 +1228,8 @@ p = p - 1; begin
       emit(:literal, :literal, text)
      end
 		end
-	when 16 then
-# line 201 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 17 then
+# line 194 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
  begin p = ((te))-1; end
  begin 
@@ -1312,8 +1242,8 @@ p = p - 1; begin
       end
      end
 		end
-	when 19 then
-# line 221 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 20 then
+# line 214 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
  begin p = ((te))-1; end
  begin 
@@ -1321,15 +1251,15 @@ p = p - 1; begin
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 138
+		cs = 91
 		_goto_level = _again
 		next
 	end
 
      end
 		end
-	when 14 then
-# line 251 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 15 then
+# line 248 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
  begin p = ((te))-1; end
  begin 
@@ -1337,25 +1267,25 @@ p = p - 1; begin
       emit(:literal, :literal, text)
      end
 		end
-	when 80 then
-# line 260 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 79 then
+# line 257 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
       p = p - 1;
-      cs = 138;
+      cs = 91;
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 146
+		cs = 99
 		_goto_level = _again
 		next
 	end
 
      end
 		end
-	when 79 then
-# line 266 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 78 then
+# line 263 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
@@ -1369,8 +1299,8 @@ te = p+1
 
      end
 		end
-	when 84 then
-# line 276 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 83 then
+# line 273 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
@@ -1385,8 +1315,8 @@ te = p+1
 
      end
 		end
-	when 91 then
-# line 282 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 90 then
+# line 279 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
@@ -1400,8 +1330,8 @@ te = p+1
 
      end
 		end
-	when 81 then
-# line 287 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 80 then
+# line 284 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
@@ -1431,8 +1361,8 @@ te = p+1
 
      end
 		end
-	when 87 then
-# line 308 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 86 then
+# line 305 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
@@ -1457,13 +1387,13 @@ te = p+1
 
      end
 		end
-	when 28 then
-# line 324 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 29 then
+# line 321 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
       text = copy(data, ts-1, te)
-      if text[2].chr == '{'
+      if text[2] == '{'
         emit(:escape, :codepoint_list, text)
       else
         emit(:escape, :codepoint,      text)
@@ -1477,8 +1407,8 @@ te = p+1
 
      end
 		end
-	when 97 then
-# line 334 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 96 then
+# line 331 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
@@ -1492,8 +1422,8 @@ te = p+1
 
      end
 		end
-	when 24 then
-# line 343 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 25 then
+# line 340 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
@@ -1507,8 +1437,8 @@ te = p+1
 
      end
 		end
-	when 26 then
-# line 348 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 27 then
+# line 345 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
@@ -1522,42 +1452,42 @@ te = p+1
 
      end
 		end
-	when 85 then
-# line 353 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 84 then
+# line 350 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
       p = p - 1;
-      cs = ((in_set? ? 138 : 119));
+      cs = ((in_set? ? 91 : 73));
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 136
+		cs = 89
 		_goto_level = _again
 		next
 	end
 
      end
 		end
-	when 86 then
-# line 359 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 85 then
+# line 356 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
       p = p - 1;
-      cs = ((in_set? ? 138 : 119));
+      cs = ((in_set? ? 91 : 73));
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 137
+		cs = 90
 		_goto_level = _again
 		next
 	end
 
      end
 		end
-	when 22 then
-# line 365 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 23 then
+# line 362 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
@@ -1571,8 +1501,8 @@ te = p+1
 
      end
 		end
-	when 90 then
-# line 282 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 89 then
+# line 279 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -1586,8 +1516,8 @@ p = p - 1; begin
 
      end
 		end
-	when 96 then
-# line 334 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 95 then
+# line 331 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -1601,8 +1531,8 @@ p = p - 1; begin
 
      end
 		end
-	when 93 then
-# line 343 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 92 then
+# line 340 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -1616,8 +1546,8 @@ p = p - 1; begin
 
      end
 		end
-	when 95 then
-# line 348 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 94 then
+# line 345 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -1631,8 +1561,8 @@ p = p - 1; begin
 
      end
 		end
-	when 88 then
-# line 365 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 87 then
+# line 362 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -1646,8 +1576,8 @@ p = p - 1; begin
 
      end
 		end
-	when 21 then
-# line 365 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 22 then
+# line 362 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
  begin p = ((te))-1; end
  begin 
@@ -1661,7 +1591,7 @@ p = p - 1; begin
 
      end
 		end
-	when 89 then
+	when 88 then
 # line 1 "NONE"
 		begin
 	case act
@@ -1692,8 +1622,8 @@ p = p - 1; begin
     end
 end 
 			end
-	when 31 then
-# line 375 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 32 then
+# line 372 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
@@ -1702,8 +1632,8 @@ te = p+1
       emit(:conditional, :condition_close, ')')
      end
 		end
-	when 98 then
-# line 381 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 97 then
+# line 378 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
@@ -1711,15 +1641,15 @@ te = p+1
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 119
+		cs = 73
 		_goto_level = _again
 		next
 	end
 
      end
 		end
-	when 99 then
-# line 381 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 98 then
+# line 378 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -1727,15 +1657,15 @@ p = p - 1; begin
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 119
+		cs = 73
 		_goto_level = _again
 		next
 	end
 
      end
 		end
-	when 30 then
-# line 381 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 31 then
+# line 378 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
  begin p = ((te))-1; end
  begin 
@@ -1743,23 +1673,23 @@ p = p - 1; begin
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 119
+		cs = 73
 		_goto_level = _again
 		next
 	end
 
      end
 		end
-	when 37 then
-# line 394 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 38 then
+# line 391 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
       emit(:meta, :dot, copy(data, ts, te))
      end
 		end
-	when 42 then
-# line 398 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 43 then
+# line 395 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
@@ -1770,55 +1700,55 @@ te = p+1
       end
      end
 		end
-	when 41 then
-# line 408 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 42 then
+# line 405 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
       emit(:anchor, :bol, copy(data, ts, te))
      end
 		end
-	when 34 then
-# line 412 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 35 then
+# line 409 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
       emit(:anchor, :eol, copy(data, ts, te))
      end
 		end
-	when 62 then
-# line 416 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 63 then
+# line 413 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
       emit(:keep, :mark, copy(data, ts, te))
      end
 		end
-	when 61 then
-# line 420 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 62 then
+# line 417 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
       case text = copy(data, ts, te)
-      when '\\A'; emit(:anchor, :bos,                text)
-      when '\\z'; emit(:anchor, :eos,                text)
-      when '\\Z'; emit(:anchor, :eos_ob_eol,         text)
-      when '\\b'; emit(:anchor, :word_boundary,      text)
-      when '\\B'; emit(:anchor, :nonword_boundary,   text)
-      when '\\G'; emit(:anchor, :match_start,        text)
+      when '\A';  emit(:anchor, :bos,                text)
+      when '\z';  emit(:anchor, :eos,                text)
+      when '\Z';  emit(:anchor, :eos_ob_eol,         text)
+      when '\b';  emit(:anchor, :word_boundary,      text)
+      when '\B';  emit(:anchor, :nonword_boundary,   text)
+      when '\G';  emit(:anchor, :match_start,        text)
       end
      end
 		end
-	when 40 then
-# line 431 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 41 then
+# line 428 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
       append_literal(data, ts, te)
      end
 		end
-	when 51 then
-# line 446 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 52 then
+# line 443 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
@@ -1831,27 +1761,27 @@ te = p+1
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 160
+		cs = 113
 		_goto_level = _again
 		next
 	end
 
      end
 		end
-	when 52 then
-# line 477 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 53 then
+# line 474 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
       text = copy(data, ts, te)
       if text[2..-1] =~ /([^\-mixdau:]|^$)|-.*([dau])/
-        raise InvalidGroupOption.new($1 || "-#{$2}", text)
+        validation_error(:group_option, $1 || "-#{$2}", text)
       end
       emit_options(text)
      end
 		end
-	when 50 then
-# line 491 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 51 then
+# line 488 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
@@ -1864,7 +1794,7 @@ te = p+1
      end
 		end
 	when 6 then
-# line 508 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+# line 505 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
@@ -1886,7 +1816,7 @@ te = p+1
      end
 		end
 	when 10 then
-# line 549 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+# line 546 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
@@ -1907,7 +1837,7 @@ te = p+1
      end
 		end
 	when 9 then
-# line 568 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+# line 565 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
@@ -1923,8 +1853,8 @@ te = p+1
       end
      end
 		end
-	when 59 then
-# line 584 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 60 then
+# line 581 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
@@ -1935,8 +1865,8 @@ te = p+1
       end
      end
 		end
-	when 55 then
-# line 592 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 56 then
+# line 589 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
@@ -1947,8 +1877,8 @@ te = p+1
       end
      end
 		end
-	when 57 then
-# line 600 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 58 then
+# line 597 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
@@ -1959,16 +1889,16 @@ te = p+1
       end
      end
 		end
-	when 65 then
-# line 608 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 12 then
+# line 605 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
       emit(:quantifier, :interval, copy(data, ts, te))
      end
 		end
-	when 46 then
-# line 623 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 47 then
+# line 620 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
@@ -1982,20 +1912,20 @@ te = p+1
       end
      end
 		end
-	when 49 then
-# line 477 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 50 then
+# line 474 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
       text = copy(data, ts, te)
       if text[2..-1] =~ /([^\-mixdau:]|^$)|-.*([dau])/
-        raise InvalidGroupOption.new($1 || "-#{$2}", text)
+        validation_error(:group_option, $1 || "-#{$2}", text)
       end
       emit_options(text)
      end
 		end
-	when 53 then
-# line 491 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 54 then
+# line 488 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -2007,8 +1937,8 @@ p = p - 1; begin
       end
      end
 		end
-	when 47 then
-# line 526 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 48 then
+# line 523 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -2016,8 +1946,8 @@ p = p - 1; begin
       emit(:group, :capture, text)
      end
 		end
-	when 58 then
-# line 584 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 59 then
+# line 581 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -2028,8 +1958,8 @@ p = p - 1; begin
       end
      end
 		end
-	when 54 then
-# line 592 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 55 then
+# line 589 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -2040,8 +1970,8 @@ p = p - 1; begin
       end
      end
 		end
-	when 56 then
-# line 600 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 57 then
+# line 597 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -2053,38 +1983,30 @@ p = p - 1; begin
      end
 		end
 	when 64 then
-# line 608 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
-		begin
-te = p
-p = p - 1; begin 
-      emit(:quantifier, :interval, copy(data, ts, te))
-     end
-		end
-	when 63 then
-# line 613 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+# line 610 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
       append_literal(data, ts, te)
      end
 		end
-	when 60 then
-# line 619 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 61 then
+# line 616 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 146
+		cs = 99
 		_goto_level = _again
 		next
 	end
 
      end
 		end
-	when 45 then
-# line 623 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 46 then
+# line 620 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -2098,8 +2020,8 @@ p = p - 1; begin
       end
      end
 		end
-	when 44 then
-# line 633 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 45 then
+# line 630 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -2110,8 +2032,8 @@ p = p - 1; begin
       end
      end
 		end
-	when 43 then
-# line 644 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 44 then
+# line 641 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -2119,19 +2041,19 @@ p = p - 1; begin
      end
 		end
 	when 3 then
-# line 477 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+# line 474 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
  begin p = ((te))-1; end
  begin 
       text = copy(data, ts, te)
       if text[2..-1] =~ /([^\-mixdau:]|^$)|-.*([dau])/
-        raise InvalidGroupOption.new($1 || "-#{$2}", text)
+        validation_error(:group_option, $1 || "-#{$2}", text)
       end
       emit_options(text)
      end
 		end
 	when 11 then
-# line 613 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+# line 610 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
  begin p = ((te))-1; end
  begin 
@@ -2139,14 +2061,14 @@ p = p - 1; begin
      end
 		end
 	when 8 then
-# line 619 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+# line 616 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
  begin p = ((te))-1; end
  begin 
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 146
+		cs = 99
 		_goto_level = _again
 		next
 	end
@@ -2169,7 +2091,7 @@ end
 
       text = copy(data, ts, te)
       if text[2..-1] =~ /([^\-mixdau:]|^$)|-.*([dau])/
-        raise InvalidGroupOption.new($1 || "-#{$2}", text)
+        validation_error(:group_option, $1 || "-#{$2}", text)
       end
       emit_options(text)
     end
@@ -2190,14 +2112,14 @@ end
     end
 end 
 			end
-	when 77 then
-# line 147 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 76 then
+# line 140 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 
     text = copy(data, ts ? ts-1 : 0, -1)
     raise PrematureEndError.new( text )
   		end
-# line 221 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+# line 214 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -2205,21 +2127,21 @@ p = p - 1; begin
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 138
+		cs = 91
 		_goto_level = _again
 		next
 	end
 
      end
 		end
-	when 18 then
-# line 147 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 19 then
+# line 140 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 
     text = copy(data, ts ? ts-1 : 0, -1)
     raise PrematureEndError.new( text )
   		end
-# line 221 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+# line 214 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
  begin p = ((te))-1; end
  begin 
@@ -2227,21 +2149,21 @@ p = p - 1; begin
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 138
+		cs = 91
 		_goto_level = _again
 		next
 	end
 
      end
 		end
-	when 92 then
-# line 147 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 91 then
+# line 140 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 
     text = copy(data, ts ? ts-1 : 0, -1)
     raise PrematureEndError.new( text )
   		end
-# line 343 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+# line 340 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -2255,14 +2177,14 @@ p = p - 1; begin
 
      end
 		end
-	when 94 then
-# line 147 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 93 then
+# line 140 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 
     text = copy(data, ts ? ts-1 : 0, -1)
     raise PrematureEndError.new( text )
   		end
-# line 348 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+# line 345 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -2276,14 +2198,14 @@ p = p - 1; begin
 
      end
 		end
-	when 25 then
-# line 147 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 26 then
+# line 140 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 
     text = copy(data, ts ? ts-1 : 0, -1)
     raise PrematureEndError.new( text )
   		end
-# line 343 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+# line 340 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
  begin p = ((te))-1; end
  begin 
@@ -2297,14 +2219,14 @@ p = p - 1; begin
 
      end
 		end
-	when 27 then
-# line 147 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 28 then
+# line 140 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 
     text = copy(data, ts ? ts-1 : 0, -1)
     raise PrematureEndError.new( text )
   		end
-# line 348 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+# line 345 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
  begin p = ((te))-1; end
  begin 
@@ -2318,14 +2240,14 @@ p = p - 1; begin
 
      end
 		end
-	when 29 then
-# line 153 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 30 then
+# line 146 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 
     text = copy(data, ts ? ts-1 : 0, -1)
     validation_error(:sequence, 'sequence', text)
   		end
-# line 339 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+# line 336 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
@@ -2339,21 +2261,21 @@ te = p+1
      end
 		end
 	when 5 then
-# line 160 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+# line 153 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
  self.group_depth = group_depth - 1 		end
-# line 462 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+# line 459 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
       emit(:group, :comment, copy(data, ts, te))
      end
 		end
-	when 36 then
-# line 160 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 37 then
+# line 153 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
  self.group_depth = group_depth - 1 		end
-# line 531 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+# line 528 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
@@ -2371,11 +2293,11 @@ te = p+1
       end
      end
 		end
-	when 38 then
-# line 161 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 39 then
+# line 154 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
  self.set_depth   = set_depth   + 1 		end
-# line 437 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+# line 434 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
@@ -2383,18 +2305,18 @@ te = p+1
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 138
+		cs = 91
 		_goto_level = _again
 		next
 	end
 
      end
 		end
-	when 71 then
-# line 162 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 70 then
+# line 155 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
  self.set_depth   = set_depth   - 1 		end
-# line 168 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+# line 161 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
@@ -2409,7 +2331,7 @@ te = p+1
 
       else
         	begin
-		cs = 119
+		cs = 73
 		_goto_level = _again
 		next
 	end
@@ -2417,11 +2339,11 @@ te = p+1
       end
      end
 		end
-	when 76 then
-# line 162 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 75 then
+# line 155 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
  self.set_depth   = set_depth   - 1 		end
-# line 177 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+# line 170 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin  # special case, emits two tokens
@@ -2437,7 +2359,7 @@ te = p+1
 
       else
         	begin
-		cs = 119
+		cs = 73
 		_goto_level = _again
 		next
 	end
@@ -2445,11 +2367,11 @@ te = p+1
       end
      end
 		end
-	when 20 then
-# line 162 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 21 then
+# line 155 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
  self.set_depth   = set_depth   - 1 		end
-# line 226 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+# line 219 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 te = p+1
  begin 
@@ -2457,36 +2379,40 @@ te = p+1
 
       type = :posixclass
       class_name = text[2..-3]
-      if class_name[0].chr == '^'
+      if class_name[0] == '^'
         class_name = class_name[1..-1]
         type = :nonposixclass
       end
 
+      unless self.class.posix_classes.include?(class_name)
+        validation_error(:posix_class, text)
+      end
+
       emit(type, class_name.to_sym, text)
      end
 		end
-	when 69 then
+	when 68 then
 # line 1 "NONE"
 		begin
 te = p+1
 		end
-# line 161 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+# line 154 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
  self.set_depth   = set_depth   + 1 		end
-	when 83 then
+	when 82 then
 # line 1 "NONE"
 		begin
 te = p+1
 		end
-# line 276 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+# line 273 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 act = 16;		end
-	when 82 then
+	when 81 then
 # line 1 "NONE"
 		begin
 te = p+1
 		end
-# line 282 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+# line 279 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 act = 17;		end
 	when 7 then
@@ -2494,7 +2420,7 @@ act = 17;		end
 		begin
 te = p+1
 		end
-# line 491 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+# line 488 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 act = 41;		end
 	when 2 then
@@ -2502,34 +2428,34 @@ act = 41;		end
 		begin
 te = p+1
 		end
-# line 644 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+# line 641 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 act = 55;		end
-	when 48 then
+	when 49 then
 # line 1 "NONE"
 		begin
 te = p+1
 		end
-# line 160 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+# line 153 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
  self.group_depth = group_depth - 1 		end
-# line 159 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+# line 152 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
  self.group_depth = group_depth + 1 		end
-# line 477 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+# line 474 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 act = 40;		end
-# line 2522 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner.rb"
+# line 2448 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner.rb"
 	end
 	end
 	end
 	if _goto_level <= _again
 	case _re_scanner_to_state_actions[cs] 
-	when 66 then
+	when 65 then
 # line 1 "NONE"
 		begin
 ts = nil;		end
-	when 32 then
+	when 33 then
 # line 1 "NONE"
 		begin
 ts = nil;		end
@@ -2537,7 +2463,7 @@ ts = nil;		end
 		begin
 act = 0
 		end
-# line 2540 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner.rb"
+# line 2466 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner.rb"
 	end
 
 	if cs == 0
@@ -2558,20 +2484,20 @@ act = 0
 		next;
 	end
 	  case _re_scanner_eof_actions[cs]
-	when 12 then
+	when 13 then
 # line 8 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/property.rl"
 		begin
 
     raise PrematureEndError.new('unicode property')
   		end
-	when 23 then
-# line 147 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+	when 24 then
+# line 140 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 		begin
 
     text = copy(data, ts ? ts-1 : 0, -1)
     raise PrematureEndError.new( text )
   		end
-# line 2574 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner.rb"
+# line 2500 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner.rb"
 	  end
 	end
 
@@ -2582,7 +2508,7 @@ act = 0
 end
 	end
 
-# line 741 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
+# line 746 "/Users/janoschmuller/code/regexp_parser/tasks/../lib/regexp_parser/scanner/scanner.rl"
 
     # to avoid "warning: assigned but unused variable - testEof"
     testEof = testEof
@@ -2616,6 +2542,11 @@ end
     File.read("#{__dir__}/scanner/properties/#{name}.csv").scan(/(.+),(.+)/).to_h
   end
 
+  def self.posix_classes
+    %w[alnum alpha ascii blank cntrl digit graph
+       lower print punct space upper word xdigit]
+  end
+
   # Emits an array with the details of the scanned pattern
   def emit(type, token, text)
     #puts "EMIT: type: #{type}, token: #{token}, text: #{text}, ts: #{ts}, te: #{te}"
@@ -2718,15 +2649,16 @@ end
 
   # Centralizes and unifies the handling of validation related
   # errors.
-  def validation_error(type, what, reason)
-    case type
-    when :group
-      error = InvalidGroupError.new(what, reason)
-    when :backref
-      error = InvalidBackrefError.new(what, reason)
-    when :sequence
-      error = InvalidSequenceError.new(what, reason)
-    end
+  def validation_error(type, what, reason = nil)
+    error =
+      case type
+      when :backref      then InvalidBackrefError.new(what, reason)
+      when :group        then InvalidGroupError.new(what, reason)
+      when :group_option then InvalidGroupOption.new(what, reason)
+      when :posix_class  then UnknownPosixClassError.new(what)
+      when :property     then UnknownUnicodePropertyError.new(what)
+      when :sequence     then InvalidSequenceError.new(what, reason)
+      end
 
     raise error # unless @@config.validation_ignore
   end