kdl 1.0.0.rc1 → 1.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1da5c7ecdbb21b75f621fbb6876fd46270c525311d9b34443ebbda8e715f6b0d
-  data.tar.gz: c8317287f0573c91b256d28ff902e3a38bd3275b009016ce0d41c631e7321303
+  metadata.gz: 0ad96fca4491347ec286e3a6ccdaa2c48027ac6e51e4541ea4583d858885192c
+  data.tar.gz: '0863341cc116e0d95b663be4cf7becd89173773d20db4e80a0575f224f9590f1'
 SHA512:
-  metadata.gz: 549b4b676a95b83146647aca4dbbccf44463fbaa5cc0192dc7e0e1e8977e194bdc505c29edde3c71f5f225a22eb23ea2ba484d4a26c24cdbae152015dde99b77
-  data.tar.gz: 13520a974cb5e28658bebd7b09fa79bb13e40cf2c12f50e0a51408fef74ab756e314f7e6758a357b0ef82afdda3cfa7604197184dad45607296ffb7469507df3
+  metadata.gz: 1371e648e0b27a19664fd58c4d6b8cfa136727b20235fd845735d1b6ac4eb1eea8b978634fc58c86e15af8d2ee2641e0afbf7b798d678fb19dd607123d734d7c
+  data.tar.gz: 54d709fda2686dec0dd3d3fa9b11fd3e90c23651d12fb94136efd37b5f67b2fe533a0c540fdbea0597708ee7d14fd609b1d2ad9d6cc4e1fb297438ad9f641c22

data/.github/workflows/ruby.yml

@@ -17,7 +17,7 @@ jobs:
   test:
     strategy:
       matrix:
-        ruby: [2.3, 2.4, 2.5, 2.6, 2.7, 3.0, head]
+        ruby: [2.4, 2.5, 2.6, 2.7, 3.0, head]
 
     runs-on: ubuntu-latest
 

data/README.md

@@ -1,6 +1,6 @@
 # KDL
 
-[![Actions Status](https://github.com/jellymann/kdl-rb/workflows/Ruby/badge.svg)](https://github.com/jellymann/kdl-rb/actions)
+[![Actions Status](https://github.com/danini-the-panini/kdl-rb/workflows/Ruby/badge.svg)](https://github.com/danini-the-panini/kdl-rb/actions)
 
 This is a Ruby implementation of the [KDL Document Language](https://kdl.dev)
 
@@ -28,6 +28,20 @@ require 'kdl'
 KDL.parse_document(a_string) #=> KDL::Document
 ```
 
+You can optionally provide your own type annotation handlers:
+
+```ruby
+KDL.parse_document(a_string, type_parsers: {
+  'foo' => -> (value, type) {
+    Foo.new(value.value, type: type)
+  }
+})
+```
+
+The `foo` proc will be called with instances of Value or Node with the type annotation `(foo)`.
+
+Parsers are expected to have a `call` method that takes the Value or Node, and the type annotation itself, as arguments, and is expected to return either an instance of Value or Node (depending on the input type) or `nil` to return the original value as is. Take a look at [the built in parsers](lib/kdl/types) as a reference.
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
@@ -36,7 +50,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/jellymann/kdl-rb.
+Bug reports and pull requests are welcome on GitHub at https://github.com/danini-the-panini/kdl-rb.
 
 
 ## License

data/kdl.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.description   = %q{Ruby implementation of the KDL Document Language Spec}
   spec.homepage      = "https://kdl.dev"
   spec.license       = "MIT"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/danini-the-panini/kdl-rb"
@@ -25,4 +25,5 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency 'racc', '~> 1.5'
+  spec.add_dependency 'simpleidn', '~> 0.2.1'
 end

data/lib/kdl/kdl.tab.rb

@@ -8,8 +8,14 @@ require 'racc/parser.rb'
 module KDL
   class Parser < Racc::Parser
 
-module_eval(<<'...end kdl.yy/module_eval...', 'kdl.yy', 68)
-  def parse(str)
+module_eval(<<'...end kdl.yy/module_eval...', 'kdl.yy', 69)
+
+  def parse(str, options = {})
+    if options.fetch(:parse_types, true)
+      @type_parsers = ::KDL::Types::MAPPING.merge(options.fetch(:type_parsers, {}))
+    else
+      @type_parsers = {}
+    end
     @tokenizer = ::KDL::Tokenizer.new(str)
     do_parse
   end
@@ -23,82 +29,82 @@ module_eval(<<'...end kdl.yy/module_eval...', 'kdl.yy', 68)
 ##### State transition tables begin ###
 
 racc_action_table = [
-    -2,    10,    18,    19,    20,    18,    19,    20,     6,     7,
-     6,     7,    44,    24,    17,    37,     8,    17,     8,    16,
-    57,    30,    16,    18,    46,    47,    51,    52,    55,    56,
-    54,    44,    37,   -42,    61,    17,    18,    19,    20,    37,
-    42,   -28,   -29,    18,    19,    20,    63,    73,    17,    18,
-    19,    20,   nil,    16,    74,    17,    18,    19,    20,   nil,
-    16,    17,    18,    46,    47,    51,    52,    55,    56,    54,
-   nil,   nil,    57,   nil,    17,    65,    66,    51,    52,    55,
-    56,    54,    28,     7,   nil,   nil,    17,     6,     7,    33,
-     8,    30,     6,     7,    33,     8,     6,     7,   nil,    33,
+    -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,    65,
-    66,    51,    52,    55,    56,    54,    18,    19,    20 ]
+     6,     7,   nil,     8,   nil,     8,   nil,   nil,     8,    66,
+    67,    52,    53,    56,    57,    55,    19,    20,    21 ]
 
 racc_action_check = [
      3,     1,     2,     2,     2,     5,     5,     5,     0,     0,
-     3,     3,    44,    10,     2,    16,     0,     5,     3,     2,
-    29,    44,     5,    28,    28,    28,    28,    28,    28,    28,
-    28,    28,    30,    28,    38,    28,    67,    67,    67,    42,
-    28,    46,    47,    68,    68,    68,    48,    67,    67,    36,
-    36,    36,   nil,    67,    68,    68,    15,    15,    15,   nil,
-    68,    36,    62,    62,    62,    62,    62,    62,    62,    62,
-   nil,   nil,    62,   nil,    62,    63,    63,    63,    63,    63,
-    63,    63,    13,    13,   nil,   nil,    63,    26,    26,    13,
-    13,    13,    27,    27,    26,    26,    31,    31,   nil,    27,
-    27,    33,    33,   nil,    31,    57,    57,    59,    59,    33,
-    69,    69,   nil,    57,   nil,    59,   nil,   nil,    69,    50,
-    50,    50,    50,    50,    50,    50,    17,    17,    17 ]
+     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 ]
 
 racc_action_pointer = [
     -2,     1,     0,     0,   nil,     3,   nil,   nil,   nil,   nil,
-    13,   nil,   nil,    72,   nil,    54,     5,   124,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,    77,    82,    21,     8,
-    22,    86,   nil,    91,   nil,   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 ]
+    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 ]
 
 racc_action_default = [
-   -50,   -51,    -1,   -49,    -3,   -51,   -43,   -44,   -45,   -46,
-   -51,    -6,    -7,   -50,   -11,   -51,   -50,   -51,   -27,   -28,
-   -29,   -47,    -4,    -5,    75,    -8,   -51,   -51,   -43,   -51,
-   -50,   -22,   -23,   -24,   -41,   -12,   -51,   -42,   -51,    -9,
-   -10,   -13,   -50,   -15,   -51,   -21,   -33,   -34,   -51,   -31,
-   -51,   -35,   -36,   -37,   -38,   -39,   -40,   -50,   -20,   -25,
-   -17,   -26,   -51,   -51,   -32,   -33,   -34,   -51,   -51,   -49,
-   -14,   -16,   -30,   -19,   -18 ]
+   -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 ]
 
 racc_goto_table = [
-    21,    22,    23,     2,     3,     4,    50,    35,     5,    38,
-    41,    25,    43,    36,     1,    26,    27,    64,   nil,   nil,
-    48,   nil,   nil,   nil,    39,    40,   nil,   nil,    21,   nil,
-   nil,   nil,    60,   nil,   nil,   nil,   nil,    59,   nil,    62,
-    50,    50,   nil,   nil,    70,    72,    71,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    48,   nil,    21,   nil,   nil,   nil,
-    68,    69,     4,    22,    23,    67,    21 ]
+    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 ]
 
 racc_goto_check = [
-    20,     6,     7,     2,     3,     4,    13,    12,     5,    12,
-    14,     9,    16,    15,     1,    10,    11,    18,   nil,   nil,
-    12,   nil,   nil,   nil,     9,     9,   nil,   nil,    20,   nil,
-   nil,   nil,     6,   nil,   nil,   nil,   nil,     3,   nil,    15,
-    13,    13,   nil,   nil,    14,    14,    16,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    12,   nil,    20,   nil,   nil,   nil,
-     2,     3,     4,     6,     7,     5,    20 ]
+    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 ]
 
 racc_goto_pointer = [
-   nil,    14,     3,     4,     5,     8,    -4,    -3,   nil,    -2,
-     2,     3,    -8,   -22,   -18,    -3,   -16,   nil,   -33,   nil,
-    -3 ]
+   nil,    13,     3,     4,     5,     8,    -4,    -3,     0,   -23,
+   nil,    -3,     0,     1,   -12,   -21,    -7,   -19,   nil,   -34,
+   nil,    -3 ]
 
 racc_goto_default = [
-   nil,   nil,   nil,    31,    34,   nil,    11,    12,    13,   nil,
-    58,    45,    14,    15,   nil,    29,   nil,    32,    49,    53,
-     9 ]
+   nil,   nil,   nil,    33,    36,   nil,    11,    12,    13,    14,
+    15,   nil,    59,    46,    16,   nil,    31,   nil,    34,    50,
+    54,     9 ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
@@ -109,53 +115,54 @@ racc_reduce_table = [
   2, 22, :_reduce_5,
   2, 22, :_reduce_6,
   2, 22, :_reduce_7,
-  2, 26, :_reduce_8,
-  3, 26, :_reduce_9,
-  3, 26, :_reduce_10,
-  1, 28, :_reduce_11,
-  2, 28, :_reduce_12,
-  3, 28, :_reduce_13,
-  5, 28, :_reduce_14,
-  3, 28, :_reduce_15,
-  5, 28, :_reduce_16,
+  1, 26, :_reduce_8,
+  2, 26, :_reduce_9,
+  2, 28, :_reduce_10,
+  3, 28, :_reduce_11,
+  3, 28, :_reduce_12,
+  1, 30, :_reduce_13,
+  3, 30, :_reduce_14,
+  5, 30, :_reduce_15,
+  3, 30, :_reduce_16,
+  5, 30, :_reduce_17,
   3, 27, :_reduce_none,
-  4, 30, :_reduce_18,
-  4, 30, :_reduce_19,
-  2, 31, :_reduce_none,
-  2, 31, :_reduce_none,
-  1, 29, :_reduce_none,
-  1, 29, :_reduce_none,
-  1, 37, :_reduce_none,
-  2, 37, :_reduce_none,
-  3, 33, :_reduce_26,
-  1, 32, :_reduce_27,
-  1, 32, :_reduce_28,
-  1, 32, :_reduce_29,
-  3, 36, :_reduce_30,
-  1, 34, :_reduce_none,
-  2, 34, :_reduce_32,
-  1, 38, :_reduce_33,
-  1, 38, :_reduce_34,
-  1, 38, :_reduce_35,
-  1, 38, :_reduce_36,
-  1, 38, :_reduce_37,
-  1, 38, :_reduce_38,
-  1, 39, :_reduce_39,
-  1, 39, :_reduce_40,
-  1, 35, :_reduce_none,
+  4, 32, :_reduce_19,
+  4, 32, :_reduce_20,
+  2, 33, :_reduce_none,
+  2, 33, :_reduce_none,
+  1, 31, :_reduce_none,
+  1, 31, :_reduce_none,
+  1, 38, :_reduce_none,
+  2, 38, :_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,
-  1, 40, :_reduce_none,
-  1, 40, :_reduce_none,
-  1, 40, :_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,
+  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_50 ]
+  0, 24, :_reduce_51 ]
 
-racc_reduce_n = 51
+racc_reduce_n = 52
 
-racc_shift_n = 75
+racc_shift_n = 76
 
 racc_token_table = {
   false => 0,
@@ -228,12 +235,13 @@ Racc_token_to_s_table = [
   "linespace_star",
   "node",
   "empty_node",
+  "untyped_node",
+  "type",
   "node_decl",
   "node_term",
   "node_children",
   "empty_children",
   "identifier",
-  "type",
   "value",
   "ws_star",
   "property",
@@ -292,13 +300,13 @@ module_eval(<<'.,.,', 'kdl.yy', 20)
 
 module_eval(<<'.,.,', 'kdl.yy', 21)
   def _reduce_8(val, _values)
-     val[0].tap { |x| x.children = nil }
+     val[0]
   end
 .,.,
 
 module_eval(<<'.,.,', 'kdl.yy', 22)
   def _reduce_9(val, _values)
-     val[0].tap { |x| x.children = val[1] }
+     val[1].as_type(val[0], @type_parsers.fetch(val[0], nil))
   end
 .,.,
 
@@ -310,56 +318,60 @@ module_eval(<<'.,.,', 'kdl.yy', 23)
 
 module_eval(<<'.,.,', 'kdl.yy', 24)
   def _reduce_11(val, _values)
-     KDL::Node.new(val[0])
+     val[0].tap { |x| x.children = val[1] }
   end
 .,.,
 
 module_eval(<<'.,.,', 'kdl.yy', 25)
   def _reduce_12(val, _values)
-     KDL::Node.new(val[1], type: val[0])
+     val[0].tap { |x| x.children = nil }
   end
 .,.,
 
 module_eval(<<'.,.,', 'kdl.yy', 26)
   def _reduce_13(val, _values)
-     val[0].tap { |x| x.arguments << val[2] }
+     KDL::Node.new(val[0])
   end
 .,.,
 
 module_eval(<<'.,.,', 'kdl.yy', 27)
   def _reduce_14(val, _values)
-     val[0]
+     val[0].tap { |x| x.arguments << val[2] }
   end
 .,.,
 
 module_eval(<<'.,.,', 'kdl.yy', 28)
   def _reduce_15(val, _values)
-     val[0].tap { |x| x.properties[val[2][0]] = val[2][1] }
+     val[0]
   end
 .,.,
 
 module_eval(<<'.,.,', 'kdl.yy', 29)
   def _reduce_16(val, _values)
+     val[0].tap { |x| x.properties[val[2][0]] = val[2][1] }
+  end
+.,.,
+
+module_eval(<<'.,.,', 'kdl.yy', 30)
+  def _reduce_17(val, _values)
      val[0]
   end
 .,.,
 
-# reduce 17 omitted
+# reduce 18 omitted
 
-module_eval(<<'.,.,', 'kdl.yy', 31)
-  def _reduce_18(val, _values)
+module_eval(<<'.,.,', 'kdl.yy', 32)
+  def _reduce_19(val, _values)
      val[2]
   end
 .,.,
 
-module_eval(<<'.,.,', 'kdl.yy', 32)
-  def _reduce_19(val, _values)
+module_eval(<<'.,.,', 'kdl.yy', 33)
+  def _reduce_20(val, _values)
      []
   end
 .,.,
 
-# reduce 20 omitted
-
 # reduce 21 omitted
 
 # reduce 22 omitted
@@ -370,15 +382,11 @@ module_eval(<<'.,.,', 'kdl.yy', 32)
 
 # reduce 25 omitted
 
-module_eval(<<'.,.,', 'kdl.yy', 38)
-  def _reduce_26(val, _values)
-     val[1]
-  end
-.,.,
+# reduce 26 omitted
 
-module_eval(<<'.,.,', 'kdl.yy', 40)
+module_eval(<<'.,.,', 'kdl.yy', 39)
   def _reduce_27(val, _values)
-     val[0].value
+     val[1]
   end
 .,.,
 
@@ -394,23 +402,23 @@ module_eval(<<'.,.,', 'kdl.yy', 42)
   end
 .,.,
 
-module_eval(<<'.,.,', 'kdl.yy', 44)
+module_eval(<<'.,.,', 'kdl.yy', 43)
   def _reduce_30(val, _values)
-     [val[0], val[2]]
+     val[0].value
   end
 .,.,
 
-# reduce 31 omitted
-
-module_eval(<<'.,.,', 'kdl.yy', 47)
-  def _reduce_32(val, _values)
-     val[1].as_type(val[0])
+module_eval(<<'.,.,', 'kdl.yy', 45)
+  def _reduce_31(val, _values)
+     [val[0], val[2]]
   end
 .,.,
 
-module_eval(<<'.,.,', 'kdl.yy', 49)
+# reduce 32 omitted
+
+module_eval(<<'.,.,', 'kdl.yy', 48)
   def _reduce_33(val, _values)
-     KDL::Value::String.new(val[0].value)
+     val[1].as_type(val[0], @type_parsers.fetch(val[0], nil))
   end
 .,.,
 
@@ -422,41 +430,45 @@ module_eval(<<'.,.,', 'kdl.yy', 50)
 
 module_eval(<<'.,.,', 'kdl.yy', 51)
   def _reduce_35(val, _values)
-     KDL::Value::Int.new(val[0].value)
+     KDL::Value::String.new(val[0].value)
   end
 .,.,
 
 module_eval(<<'.,.,', 'kdl.yy', 52)
   def _reduce_36(val, _values)
-     KDL::Value::Float.new(val[0].value, format: val[0].meta[:format])
+     KDL::Value::Int.new(val[0].value)
   end
 .,.,
 
 module_eval(<<'.,.,', 'kdl.yy', 53)
   def _reduce_37(val, _values)
-     KDL::Value::Boolean.new(val[0])
+     KDL::Value::Float.new(val[0].value, format: val[0].meta[:format])
   end
 .,.,
 
 module_eval(<<'.,.,', 'kdl.yy', 54)
   def _reduce_38(val, _values)
-     KDL::Value::Null
+     KDL::Value::Boolean.new(val[0])
   end
 .,.,
 
-module_eval(<<'.,.,', 'kdl.yy', 56)
+module_eval(<<'.,.,', 'kdl.yy', 55)
   def _reduce_39(val, _values)
-     true
+     KDL::Value::Null
   end
 .,.,
 
 module_eval(<<'.,.,', 'kdl.yy', 57)
   def _reduce_40(val, _values)
-     false
+     true
   end
 .,.,
 
-# reduce 41 omitted
+module_eval(<<'.,.,', 'kdl.yy', 58)
+  def _reduce_41(val, _values)
+     false
+  end
+.,.,
 
 # reduce 42 omitted
 
@@ -474,8 +486,10 @@ module_eval(<<'.,.,', 'kdl.yy', 57)
 
 # reduce 49 omitted
 
-module_eval(<<'.,.,', 'kdl.yy', 64)
-  def _reduce_50(val, _values)
+# reduce 50 omitted
+
+module_eval(<<'.,.,', 'kdl.yy', 65)
+  def _reduce_51(val, _values)
      nil
   end
 .,.,

data/lib/kdl/kdl.yy

@@ -14,23 +14,24 @@ rule
   document  : nodes { KDL::Document.new(val[0]) }
             | linespaces { KDL::Document.new([])}
 
-  nodes     : none                      { [] }
-            | linespace_star node       { [val[1]] }
-            | linespace_star empty_node { [] }
-            | nodes node                { [*val[0], val[1]] }
-            | nodes empty_node          { val[0] }
-  node      : node_decl node_term                                 { val[0].tap { |x| x.children = nil } }
-            | 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 : identifier                              { KDL::Node.new(val[0]) }
-            | type identifier                         { KDL::Node.new(val[1], type: 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 { [] }
+nodes           : none                      { [] }
+                | linespace_star node       { [val[1]] }
+                | linespace_star 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 } }
+                | 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     : 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] }
+  empty_node    : SLASHDASH ws_star node
+  node_children : ws_star LBRACE nodes RBRACE { val[2] }
+                | ws_star LBRACE linespace_star RBRACE { [] }
   empty_children: SLASHDASH node_children
                 | WS empty_children
   node_term: linespaces | semicolon_term
@@ -45,7 +46,7 @@ rule
   property: identifier EQUALS value { [val[0], val[2]] }
 
   value : untyped_value
-        | type untyped_value { val[1].as_type(val[0]) }
+        | type untyped_value { val[1].as_type(val[0], @type_parsers.fetch(val[0], nil)) }
 
   untyped_value : STRING     { KDL::Value::String.new(val[0].value) }
                 | RAWSTRING  { KDL::Value::String.new(val[0].value) }
@@ -65,7 +66,13 @@ rule
   none: { nil }
 
 ---- inner
-  def parse(str)
+
+  def parse(str, options = {})
+    if options.fetch(:parse_types, true)
+      @type_parsers = ::KDL::Types::MAPPING.merge(options.fetch(:type_parsers, {}))
+    else
+      @type_parsers = {}
+    end
     @tokenizer = ::KDL::Tokenizer.new(str)
     do_parse
   end

data/lib/kdl/node.rb

@@ -38,6 +38,23 @@ module KDL
       children   == other.children
     end
 
+    def as_type(type, parser = nil)
+      if parser.nil?
+        @type = type
+        self
+      else
+        result = parser.call(self, type)
+
+        return self.as_type(type) if result.nil?
+
+        unless result.is_a?(::KDL::Node)
+          raise ArgumentError, "expected parser to return an instance of ::KDL::Node, got `#{result.class}'"
+        end
+
+        result
+      end
+    end
+
     private
 
     def id_to_s(id)