kdl 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ded4c2fceb98dde6ae4421034c52e2c26ca36894da75def6bc358de10339dce
-  data.tar.gz: 00c0e2c08400aed4edddd124c337cd3a5169557bb74666d9cb5cbbc3821fd7aa
+  metadata.gz: e6560ca3f6df5d91a1a93832f8e5989f16d7e2ee100fa784dcc932e755425008
+  data.tar.gz: 76a907c6df892adf81898b03b204259284d08c43c4c9b2faff628d82d62c620d
 SHA512:
-  metadata.gz: 655e6cb06085648a3aab37298e1214ebda9cc64c8576e5b6ca8528f2d86e8376c14755fdcbd946999f30598189d95f31850de223f563a3c08099d71912714f61
-  data.tar.gz: cb7e37ea4400ec877fa7c3cbb584d88eb6686194a0c1545b99c2331725195da826a62f33bfe2e01f3b5d371c1d0429db7f550d26ad8b15cbc84e2c7b6fc0a580
+  metadata.gz: 05bff4830aa073df4e14ea87d9eb947ef83009afb5fc2e39ead76d54efe53836e9025e020b4d4a9cd139d52fd1e45bde55005d999ad4f1c2afccfc74d10f5a45
+  data.tar.gz: 7bea0334e44f33d2022ed2dfc9b59815ba0d380d04d79763958192b4e4146afe622d2e134208899a629f7638528227e50614476076f4e5de620510d8cc7d8e7f

data/.gitignore

@@ -10,3 +10,4 @@
 Gemfile.lock
 
 lib/kdl/kdl.tab.rb
+kdl.output

data/bin/kdl

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "kdl"
+
+system 'bin/rake racc'
+
+puts KDL.parse_document(ARGF.read).to_s

data/lib/kdl/kdl.tab.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.5.2
+# This file is automatically generated by Racc 1.6.0
 # from Racc grammar file "".
 #
 
@@ -8,7 +8,7 @@ require 'racc/parser.rb'
 module KDL
   class Parser < Racc::Parser
 
-module_eval(<<'...end kdl.yy/module_eval...', 'kdl.yy', 69)
+module_eval(<<'...end kdl.yy/module_eval...', 'kdl.yy', 70)
 
   def parse(str, options = {})
     if options.fetch(:parse_types, true)
@@ -29,92 +29,96 @@ module_eval(<<'...end kdl.yy/module_eval...', 'kdl.yy', 69)
 ##### State transition tables begin ###
 
 racc_action_table = [
-    -2,    10,    19,    20,    21,    19,    20,    21,     6,     7,
-     6,     7,    45,    25,    18,    38,     8,    18,     8,    17,
-    58,    32,    17,    19,    47,    48,    52,    53,    56,    57,
-    55,    45,    38,   -43,    62,    18,    19,    20,    21,    38,
-    43,   -29,   -30,    19,    20,    21,    64,    74,    18,    19,
-    20,    21,   nil,    17,    75,    18,    19,    20,    21,   nil,
-    17,    18,    19,    47,    48,    52,    53,    56,    57,    55,
-   nil,   nil,    58,   nil,    18,    66,    67,    52,    53,    56,
-    57,    55,    30,     7,   nil,   nil,    18,     6,     7,    35,
-     8,    32,     6,     7,    35,     8,     6,     7,   nil,    35,
-     8,     6,     7,   nil,     8,     6,     7,     6,     7,     8,
-     6,     7,   nil,     8,   nil,     8,   nil,   nil,     8,    66,
-    67,    52,    53,    56,    57,    55,    19,    20,    21 ]
+   -49,     9,    18,    19,    20,    18,    19,    20,     5,     6,
+    24,   -49,    60,   -49,    17,    64,     7,    17,   -49,    16,
+    63,    18,    49,    50,    54,    55,    58,    59,    57,    39,
+    39,    39,    63,    17,    18,    19,    20,    66,    45,    36,
+    36,    36,     5,     6,    39,   -29,    17,    18,    19,    20,
+     7,    16,   -30,    68,    36,     5,     6,    74,    78,    17,
+    18,    19,    20,     7,    16,   nil,    35,     6,    18,    19,
+    20,    79,    17,    34,     7,    31,    36,    16,    18,    49,
+    50,    54,    55,    58,    59,    57,   nil,   nil,    60,    39,
+    17,    70,    71,    54,    55,    58,    59,    57,    31,    36,
+     5,     6,    17,     5,     6,     5,     6,    34,     7,   nil,
+    34,     7,   nil,     7,     5,     6,     5,     6,     5,     6,
+   nil,   nil,     7,   nil,     7,   nil,     7,    70,    71,    54,
+    55,    58,    59,    57,    18,    19,    20 ]
 
 racc_action_check = [
-     3,     1,     2,     2,     2,     5,     5,     5,     0,     0,
-     3,     3,    45,    10,     2,    17,     0,     5,     3,     2,
-    31,    45,     5,    30,    30,    30,    30,    30,    30,    30,
-    30,    30,    32,    30,    39,    30,    68,    68,    68,    43,
-    30,    47,    48,    69,    69,    69,    49,    68,    68,    37,
-    37,    37,   nil,    68,    69,    69,    14,    14,    14,   nil,
-    69,    37,    63,    63,    63,    63,    63,    63,    63,    63,
-   nil,   nil,    63,   nil,    63,    64,    64,    64,    64,    64,
-    64,    64,    15,    15,   nil,   nil,    64,    28,    28,    15,
-    15,    15,    29,    29,    28,    28,    33,    33,   nil,    29,
-    29,    35,    35,   nil,    33,    58,    58,    60,    60,    35,
-    70,    70,   nil,    58,   nil,    60,   nil,   nil,    70,    51,
-    51,    51,    51,    51,    51,    51,    18,    18,    18 ]
+    35,     1,     2,     2,     2,    38,    38,    38,     0,     0,
+     9,    35,    30,    35,     2,    36,     0,    38,    35,     2,
+    35,    29,    29,    29,    29,    29,    29,    29,    29,    29,
+    16,    31,    39,    29,     3,     3,     3,    41,    29,    29,
+    16,    31,     3,     3,    45,    49,     3,    72,    72,    72,
+     3,     3,    50,    51,    45,    72,    72,    63,    72,    72,
+    73,    73,    73,    72,    72,   nil,    14,    14,    13,    13,
+    13,    73,    73,    14,    14,    14,    14,    73,    67,    67,
+    67,    67,    67,    67,    67,    67,   nil,   nil,    67,    47,
+    67,    68,    68,    68,    68,    68,    68,    68,    47,    47,
+    27,    27,    68,    28,    28,    32,    32,    27,    27,   nil,
+    28,    28,   nil,    32,    34,    34,    60,    60,    62,    62,
+   nil,   nil,    34,   nil,    60,   nil,    62,    53,    53,    53,
+    53,    53,    53,    53,    17,    17,    17 ]
 
 racc_action_pointer = [
-    -2,     1,     0,     0,   nil,     3,   nil,   nil,   nil,   nil,
-    13,   nil,   nil,   nil,    54,    72,   nil,     5,   124,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    77,    82,
-    21,     8,    22,    86,   nil,    91,   nil,    47,   nil,    19,
-   nil,   nil,   nil,    29,   nil,     2,   nil,    25,    26,    30,
-   nil,   116,   nil,   nil,   nil,   nil,   nil,   nil,    95,   nil,
-    97,   nil,   nil,    60,    72,   nil,   nil,   nil,    34,    41,
-   100,   nil,   nil,   nil,   nil,   nil ]
+    -2,     1,     0,    32,   nil,   nil,   nil,   nil,   nil,    10,
+   nil,   nil,   nil,    66,    56,   nil,    20,   132,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    90,    93,    19,
+     0,    21,    95,   nil,   104,     0,     5,   nil,     3,    12,
+   nil,    22,   nil,   nil,   nil,    34,   nil,    79,   nil,    29,
+    36,    37,   nil,   124,   nil,   nil,   nil,   nil,   nil,   nil,
+   106,   nil,   108,    47,   nil,   nil,   nil,    76,    88,   nil,
+   nil,   nil,    45,    58,   nil,   nil,   nil,   nil,   nil,   nil ]
 
 racc_action_default = [
-   -51,   -52,    -1,   -50,    -3,   -52,   -44,   -45,   -46,   -47,
-   -52,    -6,    -7,    -8,   -52,   -51,   -13,   -51,   -52,   -28,
-   -29,   -30,   -48,    -4,    -5,    76,    -9,   -10,   -52,   -52,
-   -44,   -52,   -51,   -23,   -24,   -25,   -42,   -52,   -43,   -52,
-   -11,   -12,   -14,   -51,   -16,   -52,   -22,   -34,   -35,   -52,
-   -32,   -52,   -36,   -37,   -38,   -39,   -40,   -41,   -51,   -21,
-   -26,   -18,   -27,   -52,   -52,   -33,   -34,   -35,   -52,   -52,
-   -50,   -15,   -17,   -31,   -20,   -19 ]
+   -54,   -55,    -1,    -2,    -3,   -49,   -50,   -51,   -52,   -55,
+    -6,    -7,    -8,   -55,   -54,   -13,   -54,   -55,   -28,   -29,
+   -30,    -4,    -5,   -53,    80,    -9,   -10,   -55,   -55,   -48,
+   -55,   -54,   -23,   -24,   -25,   -42,   -43,   -47,   -55,   -42,
+   -48,   -55,   -11,   -12,   -14,   -54,   -16,   -55,   -22,   -34,
+   -35,   -55,   -32,   -55,   -36,   -37,   -38,   -39,   -40,   -41,
+   -54,   -21,   -26,   -44,   -45,   -18,   -27,   -55,   -55,   -33,
+   -34,   -35,   -55,   -55,   -46,   -15,   -17,   -31,   -20,   -19 ]
 
 racc_goto_table = [
-    22,    23,    24,     2,     3,     4,    39,    51,     5,    42,
-    37,    44,    27,     1,    26,    28,    29,    65,    49,   nil,
-   nil,   nil,   nil,   nil,   nil,    40,    41,   nil,   nil,   nil,
-    22,   nil,   nil,    61,   nil,   nil,    63,   nil,   nil,    60,
-    51,    51,    71,    73,    72,   nil,   nil,   nil,   nil,   nil,
-   nil,    49,   nil,   nil,   nil,   nil,   nil,    22,   nil,   nil,
-   nil,    69,    70,     4,    23,    24,    68,    22 ]
+    21,    22,    23,     2,     3,     4,    41,    53,    29,    44,
+    38,    46,    26,     1,    25,    27,    28,    69,    51,   nil,
+   nil,   nil,   nil,    47,   nil,    42,    43,   nil,   nil,   nil,
+   nil,    23,   nil,   nil,   nil,    65,   nil,   nil,    62,    67,
+   nil,    47,   nil,   nil,   nil,    53,    53,    75,    77,    76,
+   nil,   nil,   nil,   nil,   nil,   nil,    51,   nil,   nil,   nil,
+   nil,    23,   nil,    73,    72,     4,   nil,   nil,   nil,    21,
+    22,    23 ]
 
 racc_goto_check = [
-    21,     6,     7,     2,     3,     4,    14,     9,     5,    15,
-    16,    17,    11,     1,     8,    12,    13,    19,    14,   nil,
-   nil,   nil,   nil,   nil,   nil,    11,    11,   nil,   nil,   nil,
-    21,   nil,   nil,     6,   nil,   nil,    16,   nil,   nil,     3,
-     9,     9,    15,    15,    17,   nil,   nil,   nil,   nil,   nil,
-   nil,    14,   nil,   nil,   nil,   nil,   nil,    21,   nil,   nil,
-   nil,     2,     3,     4,     6,     7,     5,    21 ]
+     5,     6,    21,     2,     3,     4,    13,     8,    14,    15,
+    16,    17,    10,     1,     7,    11,    12,    19,    13,   nil,
+   nil,   nil,   nil,    14,   nil,    10,    10,   nil,   nil,   nil,
+   nil,    21,   nil,   nil,   nil,     5,   nil,   nil,     3,    16,
+   nil,    14,   nil,   nil,   nil,     8,     8,    15,    15,    17,
+   nil,   nil,   nil,   nil,   nil,   nil,    13,   nil,   nil,   nil,
+   nil,    21,   nil,     2,     3,     4,   nil,   nil,   nil,     5,
+     6,    21 ]
 
 racc_goto_pointer = [
-   nil,    13,     3,     4,     5,     8,    -4,    -3,     0,   -23,
-   nil,    -3,     0,     1,   -12,   -21,    -7,   -19,   nil,   -34,
-   nil,    -3 ]
+   nil,    13,     3,     4,     5,    -3,    -2,     1,   -22,   nil,
+    -2,     1,     2,   -11,    -6,   -20,    -6,   -18,   nil,   -36,
+   nil,    -1 ]
 
 racc_goto_default = [
-   nil,   nil,   nil,    33,    36,   nil,    11,    12,    13,    14,
-    15,   nil,    59,    46,    16,   nil,    31,   nil,    34,    50,
-    54,     9 ]
+   nil,   nil,   nil,    32,    37,    10,    11,    12,    13,    14,
+   nil,    61,    48,    15,    40,   nil,    30,   nil,    33,    52,
+    56,     8 ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
-  1, 21, :_reduce_1,
-  1, 21, :_reduce_2,
-  1, 22, :_reduce_3,
-  2, 22, :_reduce_4,
-  2, 22, :_reduce_5,
-  2, 22, :_reduce_6,
-  2, 22, :_reduce_7,
+  1, 22, :_reduce_1,
+  1, 22, :_reduce_2,
+  1, 23, :_reduce_3,
+  2, 23, :_reduce_4,
+  2, 23, :_reduce_5,
+  2, 23, :_reduce_6,
+  2, 23, :_reduce_7,
   1, 26, :_reduce_8,
   2, 26, :_reduce_9,
   2, 28, :_reduce_10,
@@ -132,37 +136,40 @@ racc_reduce_table = [
   2, 33, :_reduce_none,
   1, 31, :_reduce_none,
   1, 31, :_reduce_none,
-  1, 38, :_reduce_none,
-  2, 38, :_reduce_none,
+  1, 39, :_reduce_none,
+  2, 39, :_reduce_none,
   3, 29, :_reduce_27,
   1, 34, :_reduce_28,
   1, 34, :_reduce_29,
   1, 34, :_reduce_30,
-  3, 37, :_reduce_31,
-  1, 35, :_reduce_none,
-  2, 35, :_reduce_33,
-  1, 39, :_reduce_34,
-  1, 39, :_reduce_35,
-  1, 39, :_reduce_36,
-  1, 39, :_reduce_37,
-  1, 39, :_reduce_38,
-  1, 39, :_reduce_39,
-  1, 40, :_reduce_40,
-  1, 40, :_reduce_41,
-  1, 36, :_reduce_none,
+  3, 38, :_reduce_31,
   1, 36, :_reduce_none,
-  1, 41, :_reduce_none,
-  1, 41, :_reduce_none,
-  1, 41, :_reduce_none,
-  1, 23, :_reduce_none,
-  2, 23, :_reduce_none,
-  1, 25, :_reduce_none,
-  1, 25, :_reduce_none,
-  0, 24, :_reduce_51 ]
-
-racc_reduce_n = 52
-
-racc_shift_n = 76
+  2, 36, :_reduce_33,
+  1, 40, :_reduce_34,
+  1, 40, :_reduce_35,
+  1, 40, :_reduce_36,
+  1, 40, :_reduce_37,
+  1, 40, :_reduce_38,
+  1, 40, :_reduce_39,
+  1, 41, :_reduce_40,
+  1, 41, :_reduce_41,
+  1, 35, :_reduce_none,
+  1, 35, :_reduce_none,
+  2, 35, :_reduce_none,
+  2, 35, :_reduce_none,
+  3, 35, :_reduce_none,
+  1, 37, :_reduce_none,
+  1, 37, :_reduce_none,
+  1, 42, :_reduce_none,
+  1, 42, :_reduce_none,
+  1, 42, :_reduce_none,
+  1, 24, :_reduce_none,
+  2, 24, :_reduce_none,
+  0, 25, :_reduce_54 ]
+
+racc_reduce_n = 55
+
+racc_shift_n = 80
 
 racc_token_table = {
   false => 0,
@@ -184,9 +191,10 @@ racc_token_table = {
   :EQUALS => 16,
   :SEMICOLON => 17,
   :EOF => 18,
-  :SLASHDASH => 19 }
+  :SLASHDASH => 19,
+  :ESCLINE => 20 }
 
-racc_nt_base = 20
+racc_nt_base = 21
 
 racc_use_result_var = false
 
@@ -227,12 +235,12 @@ Racc_token_to_s_table = [
   "SEMICOLON",
   "EOF",
   "SLASHDASH",
+  "ESCLINE",
   "$start",
   "document",
   "nodes",
   "linespaces",
   "none",
-  "linespace_star",
   "node",
   "empty_node",
   "untyped_node",
@@ -242,6 +250,7 @@ Racc_token_to_s_table = [
   "node_children",
   "empty_children",
   "identifier",
+  "ws",
   "value",
   "ws_star",
   "property",
@@ -256,103 +265,103 @@ Racc_debug_parser = false
 
 # reduce 0 omitted
 
-module_eval(<<'.,.,', 'kdl.yy', 13)
+module_eval(<<'.,.,', 'kdl.yy', 14)
   def _reduce_1(val, _values)
      KDL::Document.new(val[0])
   end
 .,.,
 
-module_eval(<<'.,.,', 'kdl.yy', 14)
+module_eval(<<'.,.,', 'kdl.yy', 15)
   def _reduce_2(val, _values)
      KDL::Document.new([])
   end
 .,.,
 
-module_eval(<<'.,.,', 'kdl.yy', 16)
+module_eval(<<'.,.,', 'kdl.yy', 17)
   def _reduce_3(val, _values)
      []
   end
 .,.,
 
-module_eval(<<'.,.,', 'kdl.yy', 17)
+module_eval(<<'.,.,', 'kdl.yy', 18)
   def _reduce_4(val, _values)
      [val[1]]
   end
 .,.,
 
-module_eval(<<'.,.,', 'kdl.yy', 18)
+module_eval(<<'.,.,', 'kdl.yy', 19)
   def _reduce_5(val, _values)
      []
   end
 .,.,
 
-module_eval(<<'.,.,', 'kdl.yy', 19)
+module_eval(<<'.,.,', 'kdl.yy', 20)
   def _reduce_6(val, _values)
      [*val[0], val[1]]
   end
 .,.,
 
-module_eval(<<'.,.,', 'kdl.yy', 20)
+module_eval(<<'.,.,', 'kdl.yy', 21)
   def _reduce_7(val, _values)
      val[0]
   end
 .,.,
 
-module_eval(<<'.,.,', 'kdl.yy', 21)
+module_eval(<<'.,.,', 'kdl.yy', 22)
   def _reduce_8(val, _values)
      val[0]
   end
 .,.,
 
-module_eval(<<'.,.,', 'kdl.yy', 22)
+module_eval(<<'.,.,', 'kdl.yy', 23)
   def _reduce_9(val, _values)
      val[1].as_type(val[0], @type_parsers.fetch(val[0], nil))
   end
 .,.,
 
-module_eval(<<'.,.,', 'kdl.yy', 23)
+module_eval(<<'.,.,', 'kdl.yy', 24)
   def _reduce_10(val, _values)
-     val[0].tap { |x| x.children = nil }
+     val[0].tap { |x| x.children = [] }
   end
 .,.,
 
-module_eval(<<'.,.,', 'kdl.yy', 24)
+module_eval(<<'.,.,', 'kdl.yy', 25)
   def _reduce_11(val, _values)
      val[0].tap { |x| x.children = val[1] }
   end
 .,.,
 
-module_eval(<<'.,.,', 'kdl.yy', 25)
+module_eval(<<'.,.,', 'kdl.yy', 26)
   def _reduce_12(val, _values)
-     val[0].tap { |x| x.children = nil }
+     val[0].tap { |x| x.children = [] }
   end
 .,.,
 
-module_eval(<<'.,.,', 'kdl.yy', 26)
+module_eval(<<'.,.,', 'kdl.yy', 27)
   def _reduce_13(val, _values)
      KDL::Node.new(val[0])
   end
 .,.,
 
-module_eval(<<'.,.,', 'kdl.yy', 27)
+module_eval(<<'.,.,', 'kdl.yy', 28)
   def _reduce_14(val, _values)
      val[0].tap { |x| x.arguments << val[2] }
   end
 .,.,
 
-module_eval(<<'.,.,', 'kdl.yy', 28)
+module_eval(<<'.,.,', 'kdl.yy', 29)
   def _reduce_15(val, _values)
      val[0]
   end
 .,.,
 
-module_eval(<<'.,.,', 'kdl.yy', 29)
+module_eval(<<'.,.,', 'kdl.yy', 30)
   def _reduce_16(val, _values)
      val[0].tap { |x| x.properties[val[2][0]] = val[2][1] }
   end
 .,.,
 
-module_eval(<<'.,.,', 'kdl.yy', 30)
+module_eval(<<'.,.,', 'kdl.yy', 31)
   def _reduce_17(val, _values)
      val[0]
   end
@@ -360,13 +369,13 @@ module_eval(<<'.,.,', 'kdl.yy', 30)
 
 # reduce 18 omitted
 
-module_eval(<<'.,.,', 'kdl.yy', 32)
+module_eval(<<'.,.,', 'kdl.yy', 33)
   def _reduce_19(val, _values)
      val[2]
   end
 .,.,
 
-module_eval(<<'.,.,', 'kdl.yy', 33)
+module_eval(<<'.,.,', 'kdl.yy', 34)
   def _reduce_20(val, _values)
      []
   end
@@ -384,31 +393,31 @@ module_eval(<<'.,.,', 'kdl.yy', 33)
 
 # reduce 26 omitted
 
-module_eval(<<'.,.,', 'kdl.yy', 39)
+module_eval(<<'.,.,', 'kdl.yy', 40)
   def _reduce_27(val, _values)
      val[1]
   end
 .,.,
 
-module_eval(<<'.,.,', 'kdl.yy', 41)
+module_eval(<<'.,.,', 'kdl.yy', 42)
   def _reduce_28(val, _values)
      val[0].value
   end
 .,.,
 
-module_eval(<<'.,.,', 'kdl.yy', 42)
+module_eval(<<'.,.,', 'kdl.yy', 43)
   def _reduce_29(val, _values)
      val[0].value
   end
 .,.,
 
-module_eval(<<'.,.,', 'kdl.yy', 43)
+module_eval(<<'.,.,', 'kdl.yy', 44)
   def _reduce_30(val, _values)
      val[0].value
   end
 .,.,
 
-module_eval(<<'.,.,', 'kdl.yy', 45)
+module_eval(<<'.,.,', 'kdl.yy', 46)
   def _reduce_31(val, _values)
      [val[0], val[2]]
   end
@@ -416,55 +425,55 @@ module_eval(<<'.,.,', 'kdl.yy', 45)
 
 # reduce 32 omitted
 
-module_eval(<<'.,.,', 'kdl.yy', 48)
+module_eval(<<'.,.,', 'kdl.yy', 49)
   def _reduce_33(val, _values)
      val[1].as_type(val[0], @type_parsers.fetch(val[0], nil))
   end
 .,.,
 
-module_eval(<<'.,.,', 'kdl.yy', 50)
+module_eval(<<'.,.,', 'kdl.yy', 51)
   def _reduce_34(val, _values)
      KDL::Value::String.new(val[0].value)
   end
 .,.,
 
-module_eval(<<'.,.,', 'kdl.yy', 51)
+module_eval(<<'.,.,', 'kdl.yy', 52)
   def _reduce_35(val, _values)
      KDL::Value::String.new(val[0].value)
   end
 .,.,
 
-module_eval(<<'.,.,', 'kdl.yy', 52)
+module_eval(<<'.,.,', 'kdl.yy', 53)
   def _reduce_36(val, _values)
      KDL::Value::Int.new(val[0].value)
   end
 .,.,
 
-module_eval(<<'.,.,', 'kdl.yy', 53)
+module_eval(<<'.,.,', 'kdl.yy', 54)
   def _reduce_37(val, _values)
      KDL::Value::Float.new(val[0].value, format: val[0].meta[:format])
   end
 .,.,
 
-module_eval(<<'.,.,', 'kdl.yy', 54)
+module_eval(<<'.,.,', 'kdl.yy', 55)
   def _reduce_38(val, _values)
      KDL::Value::Boolean.new(val[0])
   end
 .,.,
 
-module_eval(<<'.,.,', 'kdl.yy', 55)
+module_eval(<<'.,.,', 'kdl.yy', 56)
   def _reduce_39(val, _values)
      KDL::Value::Null
   end
 .,.,
 
-module_eval(<<'.,.,', 'kdl.yy', 57)
+module_eval(<<'.,.,', 'kdl.yy', 58)
   def _reduce_40(val, _values)
      true
   end
 .,.,
 
-module_eval(<<'.,.,', 'kdl.yy', 58)
+module_eval(<<'.,.,', 'kdl.yy', 59)
   def _reduce_41(val, _values)
      false
   end
@@ -488,8 +497,14 @@ module_eval(<<'.,.,', 'kdl.yy', 58)
 
 # reduce 50 omitted
 
-module_eval(<<'.,.,', 'kdl.yy', 65)
-  def _reduce_51(val, _values)
+# reduce 51 omitted
+
+# reduce 52 omitted
+
+# reduce 53 omitted
+
+module_eval(<<'.,.,', 'kdl.yy', 66)
+  def _reduce_54(val, _values)
      nil
   end
 .,.,

data/lib/kdl/kdl.yy

@@ -10,30 +10,31 @@ class KDL::Parser
         SEMICOLON
         EOF
         SLASHDASH
+        ESCLINE
 rule
   document  : nodes { KDL::Document.new(val[0]) }
             | linespaces { KDL::Document.new([])}
 
 nodes           : none                      { [] }
-                | linespace_star node       { [val[1]] }
-                | linespace_star empty_node { [] }
+                | linespaces node       { [val[1]] }
+                | linespaces empty_node { [] }
                 | nodes node                { [*val[0], val[1]] }
                 | nodes empty_node          { val[0] }
   node          : untyped_node      { val[0] }
                 | type untyped_node { val[1].as_type(val[0], @type_parsers.fetch(val[0], nil)) }
-  untyped_node  : node_decl node_term                { val[0].tap { |x| x.children = nil } }
+  untyped_node  : node_decl node_term                { val[0].tap { |x| x.children = [] } }
                 | node_decl node_children node_term  { val[0].tap { |x| x.children = val[1] } }
-                | node_decl empty_children node_term { val[0].tap { |x| x.children = nil } }
+                | node_decl empty_children node_term { val[0].tap { |x| x.children = [] } }
   node_decl     : identifier                              { KDL::Node.new(val[0]) }
-                | node_decl WS value                      { val[0].tap { |x| x.arguments << val[2] } }
-                | node_decl WS SLASHDASH ws_star value    { val[0] }
-                | node_decl WS property                   { val[0].tap { |x| x.properties[val[2][0]] = val[2][1] } }
-                | node_decl WS SLASHDASH ws_star property { val[0] }
+                | node_decl ws value                      { val[0].tap { |x| x.arguments << val[2] } }
+                | node_decl ws SLASHDASH ws_star value    { val[0] }
+                | node_decl ws property                   { val[0].tap { |x| x.properties[val[2][0]] = val[2][1] } }
+                | node_decl ws SLASHDASH ws_star property { val[0] }
   empty_node    : SLASHDASH ws_star node
   node_children : ws_star LBRACE nodes RBRACE { val[2] }
-                | ws_star LBRACE linespace_star RBRACE { [] }
+                | ws_star LBRACE linespaces RBRACE { [] }
   empty_children: SLASHDASH node_children
-                | WS empty_children
+                | ws empty_children
   node_term: linespaces | semicolon_term
   semicolon_term: SEMICOLON | SEMICOLON linespaces
 
@@ -58,10 +59,10 @@ nodes           : none                      { [] }
   boolean : TRUE  { true }
           | FALSE { false }
 
-  ws_star: none | WS
+  ws: WS | ESCLINE | WS ESCLINE | ESCLINE WS | WS ESCLINE WS
+  ws_star: none | ws
   linespace: WS | NEWLINE | EOF
   linespaces: linespace | linespaces linespace
-  linespace_star: none | linespaces
 
   none: { nil }
 

data/lib/kdl/node.rb

@@ -2,7 +2,7 @@ module KDL
   class Node
     attr_accessor :name, :arguments, :properties, :children, :type
 
-    def initialize(name, arguments = [], properties = {}, children = nil, type: nil)
+    def initialize(name, arguments = [], properties = {}, children = [], type: nil)
       @name = name
       @arguments = arguments
       @properties = properties
@@ -19,11 +19,9 @@ module KDL
       unless properties.empty?
         s += " #{properties.map { |k, v| "#{id_to_s k}=#{v}" }.join(' ')}"
       end
-      unless children.nil?
+      unless children.empty?
         s += " {\n"
-        unless children.empty?
-          s += children.map { |c| "#{c.to_s(level + 1)}\n" }.join("\n")
-        end
+        s += children.map { |c| "#{c.to_s(level + 1)}\n" }.join("\n")
         s += "#{indent}}"
       end
       s

data/lib/kdl/tokenizer.rb

@@ -125,15 +125,13 @@ module KDL
             end
           when '\\'
             t = Tokenizer.new(@str, @index + 1)
-            la = t.next_token[0]
-            if la == :NEWLINE
-              @index = t.index
-              new_line
-            elsif la == :WS && (lan = t.next_token[0]) == :NEWLINE
+            la = t.next_token
+            if la[0] == :NEWLINE || la[0] == :EOF || (la[0] == :WS && (lan = t.next_token[0]) == :NEWLINE || lan == :EOF)
               @index = t.index
               new_line
+              return token(:ESCLINE, "\\#{la[1].value}")
             else
-              raise_error "Unexpected '\\'"
+              raise_error "Unexpected '\\' (#{la[0]})"
             end
           when *SYMBOLS.keys
             return token(SYMBOLS[c], c).tap { traverse(1) }
@@ -293,18 +291,6 @@ module KDL
           if WHITEPACE.include?(c)
             traverse(1)
             @buffer += c
-          elsif c == "\\"
-            t = Tokenizer.new(@str, @index + 1)
-            la = t.next_token[0]
-            if la == :NEWLINE
-              @index = t.index
-              new_line
-            elsif (la == :WS && (lan = t.next_token[0]) == :NEWLINE)
-              @index = t.index
-              new_line
-            else
-              raise_error "Unexpected '\\'"
-            end
           elsif c == "/" && @str[@index + 1] == '*'
             self.context = :multi_line_comment
             @comment_nesting = 1
@@ -358,7 +344,7 @@ module KDL
     end
 
     def parse_float(s)
-      match, _, fraction, exponent = *s.match(/^([-+]?[\d_]+)(?:\.(\d+))?(?:[eE]([-+]?[\d_]+))?$/)
+      match, _, fraction, exponent = *s.match(/^([-+]?[\d_]+)(?:\.([\d_]+))?(?:[eE]([-+]?[\d_]+))?$/)
       raise_error "Invalid floating point value #{s}" if match.nil?
 
       s = munch_underscores(s)

data/lib/kdl/version.rb

@@ -1,3 +1,3 @@
 module KDL
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kdl
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Danielle Smith
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-04 00:00:00.000000000 Z
+date: 2021-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: racc
@@ -54,6 +54,7 @@ files:
 - README.md
 - Rakefile
 - bin/console
+- bin/kdl
 - bin/racc
 - bin/rake
 - bin/setup
@@ -111,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: KDL Document Language