kdl 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f41fc74596026506785cc654df47d91fcd5d0f067e8438cb5a55576076368ca5
-  data.tar.gz: 0a32c65029c336f01a39cdab2e5259fe366ac5439b96b408da9f31b6d44ddf9d
+  metadata.gz: 323bc0f1637f5dea4aaa671d7582c87118d8a7500557fbbec5907d34082d0914
+  data.tar.gz: abd85e1a66342b328ad9da3946a14565ee300a0f5e77c5c5418cbc931cf8fe38
 SHA512:
-  metadata.gz: 7d67ae26465031d210157ac38393084f6aa65863022934981054d5b6806c0e92b11344002ae12e77fecb4c0017fbd38dda03bf0c6cf60c93a917e98f427bf2c5
-  data.tar.gz: 0ade99c140539aa3e1c167019967985cd4bf91df1283a975ca7d6f12c9ab6f86fb1c657bc31592eff0df7d71a3e003010eb77d91df69601de4ea7d1cd13eba1f
+  metadata.gz: 9fafe1a9343387a093c324f84cccd47378a635c950f9892b9456d23f2c75fe2341ebb68ea09e0043b0672430fc0c799fb13263447ddb4586539cd5f306357c4b
+  data.tar.gz: 3cf0863f0e7751890f394f7f5d759adf980ca7b4fec872c40a1b75f71a08e380681bc8ed93e917567bbab337281b4c03a1a8f34760bd9fa66aefd67187a59a0e

data/.github/workflows/ruby.yml

@@ -15,9 +15,10 @@ on:
 
 jobs:
   test:
+    continue-on-error: ${{ matrix.ruby == 'head' }}
     strategy:
       matrix:
-        ruby: [3.1, 3.2, 3.3, head]
+        ruby: [3.1, 3.2, 3.3, 3.4, head]
 
     runs-on: ubuntu-latest
 

data/README.md

@@ -66,12 +66,20 @@ The resulting document will also serialize back to the same version it was parse
 KDL.parse(a_string, output_version: 2)
 ```
 
-This allows you to to convert document between versions:
+This allows you to to convert documents between versions:
 
 ```ruby
 KDL.parse('foo "bar" true', version: 1, output_version: 2).to_s #=> 'foo bar #true'
 ```
 
+You can also convert an already parsed document between versions with `to_v1` and `to_v2`:
+
+```ruby
+doc = KDL.parse('foo "bar" true', version: 1)
+doc.version #=> 1
+doc.to_v2.to_s #=> 'foo bar #true'
+```
+
 You can also set the default version globally:
 
 ```ruby
@@ -79,6 +87,14 @@ KDL.default_version = 2
 KDL.default_output_version = 2
 ```
 
+You can still force automatic version detection with `auto_parse`:
+
+```ruby
+KDL.default_version = 2
+KDL.parse('foo "bar" true') #=> Error
+KDL.auto_parse('foo "bar" true') #=> KDL::V1::Document
+```
+
 Version directives are also respected:
 
 ```ruby

data/lib/kdl/document.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module KDL
   class Document
     include Enumerable

data/lib/kdl/error.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module KDL
+  class Error < StandardError; end
+
+  class VersionMismatchError < Error
+    attr_reader :version, :parser_version
+
+    def initialize(message, version = nil, parser_version = nil)
+      super(message)
+      @version = version
+      @parser_version = parser_version
+    end
+  end
+
+  class UnsupportedVersionError < Error
+    attr_reader :version
+
+    def initialize(message, version = nil)
+      super(message)
+      @version = version
+    end
+  end
+end

data/lib/kdl/kdl.tab.rb

@@ -29,98 +29,100 @@ module_eval(<<'...end kdl.yy/module_eval...', 'kdl.yy', 78)
 ##### State transition tables begin ###
 
 racc_action_table = [
-    20,    21,    22,    20,    21,    22,    20,    21,    22,     9,
-    38,    38,    19,   -64,     5,     6,    26,    18,    19,    18,
-    18,    38,     7,    18,    56,    57,    58,    62,    63,    66,
-    67,    65,    38,    38,    38,   -64,    19,    20,    21,    22,
-    68,    18,    18,   -59,    38,     5,     6,   -40,    86,    19,
-    20,    21,    22,     7,    18,   -41,    20,    21,    22,   -42,
-    38,    88,    19,    76,    43,     6,    38,    18,    19,    18,
-    89,    38,     7,    56,    57,    58,    62,    63,    66,    67,
-    65,    43,     6,    93,    94,    19,    20,    21,    22,     7,
-    78,    79,    80,    62,    63,    66,    67,    65,    38,    38,
-    38,    38,    19,     5,     6,     5,     6,    18,    18,    18,
-    18,     7,    30,     7,     5,     6,     5,     6,    43,     6,
-     5,     6,     7,   nil,     7,   nil,     7,   nil,     7,     5,
-     6,     5,     6,    43,     6,    43,     6,     7,   nil,     7,
-    30,     7,    30,     7,    78,    79,    80,    62,    63,    66,
-    67,    65 ]
+    20,    21,    22,     9,    33,    26,    20,    21,    22,    33,
+    33,    33,    19,    18,     5,     6,    33,    18,    19,    18,
+    18,    33,     7,    18,    48,    49,    50,    54,    55,    58,
+    59,    57,    33,    33,   -63,   -63,    19,    20,    21,    22,
+    71,    18,    18,   -39,   -40,     5,     6,   -41,    85,    19,
+    20,    21,    22,     7,    18,    73,    20,    21,    22,    33,
+    33,    87,    19,    83,     5,     6,    33,    18,    19,    18,
+    91,    92,     7,    48,    49,    50,    54,    55,    58,    59,
+    57,    70,     6,   nil,    33,    19,   -54,   -54,   nil,     7,
+    75,    76,    77,    54,    55,    58,    59,    57,    33,    33,
+   nil,   nil,    19,     5,     6,     5,     6,    18,    18,     5,
+     6,     7,    30,     7,     5,     6,   nil,     7,     5,     6,
+     5,     6,     7,    70,     6,   nil,     7,   nil,     7,     5,
+     6,     7,    70,     6,    70,     6,   nil,     7,   nil,    30,
+     7,    30,     7,    75,    76,    77,    54,    55,    58,    59,
+    57,    20,    21,    22,    20,    21,    22 ]
 
 racc_action_check = [
-     2,     2,     2,    14,    14,    14,     3,     3,     3,     1,
-    32,    15,     2,    15,     3,     3,     9,     2,     3,    32,
-    15,    19,     3,     3,    34,    34,    34,    34,    34,    34,
-    34,    34,    34,    33,    43,    33,    34,    81,    81,    81,
-    35,    34,    33,    43,    38,    81,    81,    56,    81,    81,
-    82,    82,    82,    81,    81,    57,    17,    17,    17,    58,
-    47,    82,    82,    59,    17,    17,    72,    82,    17,    47,
-    83,    89,    17,    53,    53,    53,    53,    53,    53,    53,
-    53,    53,    53,    90,    91,    53,    44,    44,    44,    53,
-    76,    76,    76,    76,    76,    76,    76,    76,    48,    49,
-    50,    73,    76,     0,     0,    12,    12,    48,    49,    50,
-    73,     0,    12,    12,    28,    28,    30,    30,    36,    36,
-    42,    42,    28,   nil,    30,   nil,    36,   nil,    42,    46,
-    46,    68,    68,    85,    85,    87,    87,    46,   nil,    68,
-    85,    85,    87,    87,    61,    61,    61,    61,    61,    61,
-    61,    61 ]
+     2,     2,     2,     1,    40,     9,     3,     3,     3,    15,
+    46,    62,     2,    40,     3,     3,    19,     2,     3,    46,
+    62,    33,     3,     3,    32,    32,    32,    32,    32,    32,
+    32,    32,    32,    41,    32,    41,    32,    80,    80,    80,
+    45,    32,    41,    48,    49,    80,    80,    50,    80,    80,
+    81,    81,    81,    80,    80,    51,    17,    17,    17,    61,
+    64,    81,    81,    78,    17,    17,    83,    81,    17,    64,
+    89,    90,    17,    43,    43,    43,    43,    43,    43,    43,
+    43,    43,    43,   nil,    70,    43,    70,    70,   nil,    43,
+    73,    73,    73,    73,    73,    73,    73,    73,    65,    79,
+   nil,   nil,    73,     0,     0,    12,    12,    65,    79,    28,
+    28,     0,    12,    12,    30,    30,   nil,    28,    35,    35,
+    39,    39,    30,    63,    63,   nil,    35,   nil,    39,    71,
+    71,    63,    84,    84,    86,    86,   nil,    71,   nil,    84,
+    84,    86,    86,    53,    53,    53,    53,    53,    53,    53,
+    53,    14,    14,    14,    36,    36,    36 ]
 
 racc_action_pointer = [
-    93,     9,    -2,     4,   nil,   nil,   nil,   nil,   nil,    16,
-   nil,   nil,    95,   nil,     1,     1,   nil,    54,   nil,    11,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   104,   nil,
-   106,   nil,     0,    23,    22,    28,   108,   nil,    34,   nil,
-   nil,   nil,   110,    24,    84,   nil,   119,    50,    88,    89,
-    90,   nil,   nil,    71,   nil,   nil,    31,    39,    43,    47,
-   nil,   142,   nil,   nil,   nil,   nil,   nil,   nil,   121,   nil,
-   nil,   nil,    56,    91,   nil,   nil,    88,   nil,   nil,   nil,
-   nil,    35,    48,    55,   nil,   123,   nil,   125,   nil,    61,
-    70,    71,   nil,   nil,   nil ]
+    93,     3,    -2,     4,   nil,   nil,   nil,   nil,   nil,     5,
+   nil,   nil,    95,   nil,   149,    -1,   nil,    54,   nil,     6,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    99,   nil,
+   104,   nil,    22,    11,   nil,   108,   152,   nil,   nil,   110,
+    -6,    23,   nil,    71,   nil,    28,     0,   nil,    27,    28,
+    31,    39,   nil,   141,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,    49,     1,   113,    50,    88,   nil,   nil,   nil,   nil,
+    74,   119,   nil,    88,   nil,   nil,   nil,   nil,    48,    89,
+    35,    48,   nil,    56,   122,   nil,   124,   nil,   nil,    57,
+    58,   nil,   nil ]
 
 racc_action_default = [
-   -64,   -65,    -1,    -2,    -3,   -59,   -60,   -61,   -62,   -65,
-    -6,    -7,   -65,    -9,   -65,   -11,   -17,   -65,   -36,   -64,
-   -40,   -41,   -42,    -4,    -5,   -63,    95,    -8,   -32,   -33,
-   -34,   -10,   -12,   -13,   -22,   -65,   -64,   -30,   -55,   -57,
-   -23,   -37,   -38,   -55,   -65,   -58,   -35,   -15,   -65,   -14,
-   -58,   -31,   -18,   -64,   -20,   -29,   -46,   -47,   -48,   -65,
-   -44,   -65,   -49,   -50,   -51,   -52,   -53,   -54,   -64,   -28,
-   -37,   -56,   -64,   -16,   -19,   -21,   -65,   -45,   -46,   -47,
-   -48,   -65,   -65,   -65,   -43,   -64,   -25,   -64,   -24,   -64,
-   -65,   -65,   -39,   -27,   -26 ]
+   -63,   -64,    -1,    -2,    -3,   -58,   -59,   -60,   -61,   -64,
+    -6,    -7,   -64,    -9,   -64,   -11,   -17,   -64,   -36,   -63,
+   -39,   -40,   -41,    -4,    -5,   -62,    93,    -8,   -32,   -33,
+   -34,   -10,   -22,   -54,   -23,   -37,   -64,   -56,   -57,   -35,
+   -12,   -13,   -18,   -63,   -20,   -64,   -57,   -30,   -45,   -46,
+   -47,   -64,   -43,   -64,   -48,   -49,   -50,   -51,   -52,   -53,
+   -55,   -63,   -15,   -63,   -64,   -14,   -31,   -19,   -21,   -28,
+   -58,   -63,   -29,   -64,   -44,   -45,   -46,   -47,   -64,   -16,
+   -64,   -64,   -42,   -63,   -63,   -25,   -63,   -24,   -38,   -64,
+   -64,   -27,   -26 ]
 
 racc_goto_table = [
-    17,    17,    44,    23,    24,    25,     2,    61,    52,     4,
-    85,    87,     1,    31,    51,    55,    77,    40,    34,    54,
-    41,   nil,    45,     3,    59,   nil,    61,    74,    51,    55,
-    25,    55,    53,    32,    72,    33,    50,   nil,    75,    70,
-    42,    71,   nil,    59,    25,   nil,    71,   nil,    25,    61,
-    84,    49,    47,    46,    51,    83,    70,   nil,   nil,    42,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    90,    73,
-    91,   nil,    92,   nil,    82,    45,    42,     4,   nil,    17,
-    17,    23,    24,    25,   nil,   nil,   nil,   nil,    45,   nil,
-    45,    81,    45 ]
+    17,    17,     2,    23,    24,     3,    25,    36,    41,    53,
+    42,     4,     1,    44,    51,    31,    62,    34,    61,    74,
+    53,    67,    35,    66,    68,    51,   nil,    40,    72,   nil,
+    43,    25,    84,    86,   nil,    39,    65,   nil,    25,    32,
+   nil,    79,    25,   nil,    66,   nil,    72,   nil,    35,    78,
+    53,    82,   nil,   nil,   nil,   nil,    46,    60,   nil,   nil,
+   nil,    66,   nil,   nil,    64,    46,   nil,   nil,    35,   nil,
+    64,    88,    89,    81,    90,   nil,    80,   nil,    17,    17,
+    23,    24,     4,    25,   nil,   nil,    64,   nil,    64,    64,
+   nil,   nil,   nil,   nil,    60,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,    64 ]
 
 racc_goto_check = [
-    17,    17,    19,     5,     6,    24,     2,    10,    16,     4,
-     7,     7,     1,     9,    20,    20,    22,     5,    15,    18,
-    15,   nil,    15,     3,    14,   nil,    10,    16,    20,    20,
-    24,    20,    17,    12,    14,    13,    15,   nil,    18,    15,
-     3,    15,   nil,    14,    24,   nil,    15,   nil,    24,    10,
-    16,    12,    13,     3,    20,    19,    15,   nil,   nil,     3,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    19,    13,
-    19,   nil,    19,   nil,     2,    15,     3,     4,   nil,    17,
-    17,     5,     6,    24,   nil,   nil,   nil,   nil,    15,   nil,
-    15,     3,    15 ]
+    17,    17,     2,     5,     6,     3,    24,    19,    14,    10,
+    16,     4,     1,    18,    15,     9,    14,     5,    15,    22,
+    10,    16,     3,    20,    18,    15,   nil,    13,    20,   nil,
+    17,    24,     7,     7,   nil,     3,    13,   nil,    24,    12,
+   nil,    14,    24,   nil,    20,   nil,    20,   nil,     3,    19,
+    10,    16,   nil,   nil,   nil,   nil,    12,    12,   nil,   nil,
+   nil,    20,   nil,   nil,    12,    12,   nil,   nil,     3,   nil,
+    12,    19,    19,     2,    19,   nil,     3,   nil,    17,    17,
+     5,     6,     4,    24,   nil,   nil,    12,   nil,    12,    12,
+   nil,   nil,   nil,   nil,    12,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,    12 ]
 
 racc_goto_pointer = [
-   nil,    12,     6,    23,     9,     0,     1,   -71,   nil,    -1,
-   -27,   nil,    18,    20,   -10,     3,   -26,    -2,   -15,   -17,
-   -19,   nil,   -45,   nil,     2 ]
+   nil,    12,     2,     5,    11,     0,     1,   -48,   nil,     1,
+   -23,   nil,    24,    -5,   -24,   -18,   -22,    -2,   -19,   -12,
+   -18,   nil,   -34,   nil,     3 ]
 
 racc_goto_default = [
-   nil,   nil,   nil,    28,    39,    10,    11,    12,    27,    13,
-    14,    15,    69,   nil,    16,    48,   nil,    36,   nil,    35,
-    37,    29,    60,    64,     8 ]
+   nil,   nil,   nil,    28,    37,    10,    11,    12,    27,    13,
+    14,    15,    38,    69,   nil,    16,   nil,    63,   nil,    45,
+    47,    29,    52,    56,     8 ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
@@ -135,11 +137,11 @@ racc_reduce_table = [
   1, 27, :_reduce_9,
   2, 27, :_reduce_10,
   1, 29, :_reduce_11,
-  2, 29, :_reduce_12,
-  2, 29, :_reduce_13,
-  3, 29, :_reduce_14,
-  3, 29, :_reduce_15,
-  4, 29, :_reduce_16,
+  3, 29, :_reduce_12,
+  3, 29, :_reduce_13,
+  4, 29, :_reduce_14,
+  4, 29, :_reduce_15,
+  5, 29, :_reduce_16,
   1, 31, :_reduce_17,
   3, 31, :_reduce_18,
   4, 31, :_reduce_19,
@@ -147,39 +149,38 @@ racc_reduce_table = [
   4, 31, :_reduce_21,
   2, 31, :_reduce_22,
   2, 26, :_reduce_none,
-  4, 32, :_reduce_24,
-  4, 32, :_reduce_25,
-  6, 32, :_reduce_26,
-  6, 32, :_reduce_27,
+  4, 33, :_reduce_24,
+  4, 33, :_reduce_25,
+  6, 33, :_reduce_26,
+  6, 33, :_reduce_27,
   2, 40, :_reduce_none,
   2, 40, :_reduce_none,
-  1, 33, :_reduce_none,
-  2, 33, :_reduce_none,
+  1, 34, :_reduce_none,
+  2, 34, :_reduce_none,
   1, 28, :_reduce_none,
   1, 28, :_reduce_none,
   1, 41, :_reduce_none,
   2, 41, :_reduce_none,
   1, 37, :_reduce_none,
   2, 37, :_reduce_none,
-  2, 37, :_reduce_none,
-  6, 30, :_reduce_39,
-  1, 34, :_reduce_40,
-  1, 34, :_reduce_41,
-  1, 34, :_reduce_42,
-  3, 38, :_reduce_43,
+  6, 30, :_reduce_38,
+  1, 35, :_reduce_39,
+  1, 35, :_reduce_40,
+  1, 35, :_reduce_41,
+  3, 38, :_reduce_42,
   1, 36, :_reduce_none,
-  2, 36, :_reduce_45,
+  2, 36, :_reduce_44,
+  1, 42, :_reduce_45,
   1, 42, :_reduce_46,
   1, 42, :_reduce_47,
   1, 42, :_reduce_48,
   1, 42, :_reduce_49,
   1, 42, :_reduce_50,
   1, 42, :_reduce_51,
-  1, 42, :_reduce_52,
+  1, 43, :_reduce_52,
   1, 43, :_reduce_53,
-  1, 43, :_reduce_54,
-  1, 35, :_reduce_none,
-  2, 35, :_reduce_none,
+  1, 32, :_reduce_none,
+  2, 32, :_reduce_none,
   1, 39, :_reduce_none,
   1, 39, :_reduce_none,
   1, 44, :_reduce_none,
@@ -187,11 +188,11 @@ racc_reduce_table = [
   1, 44, :_reduce_none,
   1, 23, :_reduce_none,
   2, 23, :_reduce_none,
-  0, 24, :_reduce_64 ]
+  0, 24, :_reduce_63 ]
 
-racc_reduce_n = 65
+racc_reduce_n = 64
 
-racc_shift_n = 95
+racc_shift_n = 93
 
 racc_token_table = {
   false => 0,
@@ -269,10 +270,10 @@ Racc_token_to_s_table = [
   "untyped_node",
   "type",
   "node_decl",
+  "ws_plus",
   "node_children",
   "empty_childrens",
   "identifier",
-  "ws_plus",
   "value",
   "slashdash",
   "property",
@@ -358,7 +359,7 @@ module_eval(<<'.,.,', 'kdl.yy', 23)
 
 module_eval(<<'.,.,', 'kdl.yy', 24)
   def _reduce_12(val, _values)
-     val[0].tap { |x| x.children = val[1] }
+     val[0].tap { |x| x.children = val[2] }
   end
 .,.,
 
@@ -370,19 +371,19 @@ module_eval(<<'.,.,', 'kdl.yy', 25)
 
 module_eval(<<'.,.,', 'kdl.yy', 26)
   def _reduce_14(val, _values)
-     val[0].tap { |x| x.children = val[2] }
+     val[0].tap { |x| x.children = val[3] }
   end
 .,.,
 
 module_eval(<<'.,.,', 'kdl.yy', 27)
   def _reduce_15(val, _values)
-     val[0].tap { |x| x.children = val[1] }
+     val[0].tap { |x| x.children = val[2] }
   end
 .,.,
 
 module_eval(<<'.,.,', 'kdl.yy', 28)
   def _reduce_16(val, _values)
-     val[0].tap { |x| x.children = val[2] }
+     val[0].tap { |x| x.children = val[3] }
   end
 .,.,
 
@@ -468,100 +469,100 @@ module_eval(<<'.,.,', 'kdl.yy', 39)
 
 # reduce 37 omitted
 
-# reduce 38 omitted
-
 module_eval(<<'.,.,', 'kdl.yy', 47)
-  def _reduce_39(val, _values)
+  def _reduce_38(val, _values)
      val[2]
   end
 .,.,
 
 module_eval(<<'.,.,', 'kdl.yy', 49)
-  def _reduce_40(val, _values)
+  def _reduce_39(val, _values)
      val[0].value
   end
 .,.,
 
 module_eval(<<'.,.,', 'kdl.yy', 50)
-  def _reduce_41(val, _values)
+  def _reduce_40(val, _values)
      val[0].value
   end
 .,.,
 
 module_eval(<<'.,.,', 'kdl.yy', 51)
-  def _reduce_42(val, _values)
+  def _reduce_41(val, _values)
      val[0].value
   end
 .,.,
 
 module_eval(<<'.,.,', 'kdl.yy', 53)
-  def _reduce_43(val, _values)
+  def _reduce_42(val, _values)
      [val[0], val[2]]
   end
 .,.,
 
-# reduce 44 omitted
+# reduce 43 omitted
 
 module_eval(<<'.,.,', 'kdl.yy', 56)
-  def _reduce_45(val, _values)
+  def _reduce_44(val, _values)
      val[1].as_type(val[0], @type_parsers.fetch(val[0], nil))
   end
 .,.,
 
 module_eval(<<'.,.,', 'kdl.yy', 58)
-  def _reduce_46(val, _values)
+  def _reduce_45(val, _values)
      @output_module::Value::String.new(val[0].value)
   end
 .,.,
 
 module_eval(<<'.,.,', 'kdl.yy', 59)
-  def _reduce_47(val, _values)
+  def _reduce_46(val, _values)
      @output_module::Value::String.new(val[0].value)
   end
 .,.,
 
 module_eval(<<'.,.,', 'kdl.yy', 60)
-  def _reduce_48(val, _values)
+  def _reduce_47(val, _values)
      @output_module::Value::String.new(val[0].value)
   end
 .,.,
 
 module_eval(<<'.,.,', 'kdl.yy', 61)
-  def _reduce_49(val, _values)
+  def _reduce_48(val, _values)
      @output_module::Value::Int.new(val[0].value)
   end
 .,.,
 
 module_eval(<<'.,.,', 'kdl.yy', 62)
-  def _reduce_50(val, _values)
+  def _reduce_49(val, _values)
      @output_module::Value::Float.new(val[0].value, format: val[0].meta[:format])
   end
 .,.,
 
 module_eval(<<'.,.,', 'kdl.yy', 63)
-  def _reduce_51(val, _values)
+  def _reduce_50(val, _values)
      @output_module::Value::Boolean.new(val[0])
   end
 .,.,
 
 module_eval(<<'.,.,', 'kdl.yy', 64)
-  def _reduce_52(val, _values)
+  def _reduce_51(val, _values)
      @output_module::Value::Null
   end
 .,.,
 
 module_eval(<<'.,.,', 'kdl.yy', 66)
-  def _reduce_53(val, _values)
+  def _reduce_52(val, _values)
      true
   end
 .,.,
 
 module_eval(<<'.,.,', 'kdl.yy', 67)
-  def _reduce_54(val, _values)
+  def _reduce_53(val, _values)
      false
   end
 .,.,
 
+# reduce 54 omitted
+
 # reduce 55 omitted
 
 # reduce 56 omitted
@@ -578,10 +579,8 @@ module_eval(<<'.,.,', 'kdl.yy', 67)
 
 # reduce 62 omitted
 
-# reduce 63 omitted
-
 module_eval(<<'.,.,', 'kdl.yy', 74)
-  def _reduce_64(val, _values)
+  def _reduce_63(val, _values)
      nil
   end
 .,.,

data/lib/kdl/kdl.yy

@@ -21,12 +21,12 @@ rule
   node           : unterm_node node_term       { val[0] }
   unterm_node    : untyped_node      { val[0] }
                  | type untyped_node { val[1].as_type(val[0], @type_parsers.fetch(val[0], nil)) }
-  untyped_node   : node_decl                                               { val[0].tap { |x| x.children = [] } }
-                 | node_decl node_children                                 { val[0].tap { |x| x.children = val[1] } }
-                 | node_decl empty_childrens                               { val[0].tap { |x| x.children = [] } }
-                 | node_decl empty_childrens node_children                 { val[0].tap { |x| x.children = val[2] } }
-                 | node_decl node_children empty_childrens                 { val[0].tap { |x| x.children = val[1] } }
-                 | node_decl empty_childrens node_children empty_childrens { val[0].tap { |x| x.children = val[2] } }
+  untyped_node   : node_decl                                                       { val[0].tap { |x| x.children = [] } }
+                 | node_decl ws_plus node_children                                 { val[0].tap { |x| x.children = val[2] } }
+                 | node_decl ws_plus empty_childrens                               { val[0].tap { |x| x.children = [] } }
+                 | node_decl ws_plus empty_childrens node_children                 { val[0].tap { |x| x.children = val[3] } }
+                 | node_decl ws_plus node_children empty_childrens                 { val[0].tap { |x| x.children = val[2] } }
+                 | node_decl ws_plus empty_childrens node_children empty_childrens { val[0].tap { |x| x.children = val[3] } }
   node_decl      : identifier                           { @output_module::Node.new(val[0]) }
                  | node_decl ws_plus value              { val[0].tap { |x| x.arguments << val[2] } }
                  | node_decl ws_plus slashdash value    { val[0] }
@@ -43,7 +43,7 @@ rule
   empty_childrens: empty_children | empty_childrens empty_children
   node_term: linespaces | semicolon_term
   semicolon_term: SEMICOLON | SEMICOLON linespaces
-  slashdash: SLASHDASH | slashdash ws_plus | slashdash linespaces
+  slashdash: SLASHDASH | slashdash linespaces
 
   type : LPAREN ws_star identifier ws_star RPAREN ws_star { val[2] }
 

data/lib/kdl/node.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module KDL
   class Node
     class Custom < Node
@@ -92,15 +94,15 @@ module KDL
       indent = '    ' * level
       s = "#{indent}#{type ? "(#{id_to_s type, m })" : ''}#{id_to_s name, m}"
       unless arguments.empty?
-        s += " #{arguments.map(&m).join(' ')}"
+        s << " #{arguments.map(&m).join(' ')}"
       end
       unless properties.empty?
-        s += " #{properties.map { |k, v| "#{id_to_s k, m}=#{v.public_send(m)}" }.join(' ')}"
+        s << " #{properties.map { |k, v| "#{id_to_s k, m}=#{v.public_send(m)}" }.join(' ')}"
       end
       unless children.empty?
-        s += " {\n"
-        s += children.map { |c| "#{c.public_send(m, level + 1)}" }.join("\n")
-        s += "\n#{indent}}"
+        s << " {\n"
+        s << children.map { |c| "#{c.public_send(m, level + 1)}" }.join("\n")
+        s << "\n#{indent}}"
       end
       s
     end

data/lib/kdl/parser_common.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module KDL
   module ParserCommon
 
@@ -19,7 +21,7 @@ module KDL
     def check_version
       return unless doc_version = @tokenizer.version_directive
       if doc_version != parser_version
-        raise ParseError, "Version mismatch, document specified v#{doc_version}, but this is a v#{parser_version} parser"
+        raise VersionMismatchError.new("Version mismatch, document specified v#{doc_version}, but this is a v#{parser_version} parser", doc_version, parser_version)
       end
     end
   end

data/lib/kdl/string_dumper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module KDL
   module StringDumper
     def call(string)