kdl 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 323bc0f1637f5dea4aaa671d7582c87118d8a7500557fbbec5907d34082d0914
-  data.tar.gz: abd85e1a66342b328ad9da3946a14565ee300a0f5e77c5c5418cbc931cf8fe38
+  metadata.gz: 24483470a3eb179aeb4a3e2e759693a4e818316cb7cb6c3b019b22b2318504af
+  data.tar.gz: 73ce32af9afa6ebcd4be7a73add2ee1077e08aad71425863b75b1581613a2628
 SHA512:
-  metadata.gz: 9fafe1a9343387a093c324f84cccd47378a635c950f9892b9456d23f2c75fe2341ebb68ea09e0043b0672430fc0c799fb13263447ddb4586539cd5f306357c4b
-  data.tar.gz: 3cf0863f0e7751890f394f7f5d759adf980ca7b4fec872c40a1b75f71a08e380681bc8ed93e917567bbab337281b4c03a1a8f34760bd9fa66aefd67187a59a0e
+  metadata.gz: b2ea10129c13825376583228ce0d5e91f888c89e6adb0787f02c1f046801d79809b0fa2997799b30237493b70717c1bc5423eefc360d07387333709157f6690b
+  data.tar.gz: fbbf3d6e8d148ab9a67855ed8751d31b1f28adc1a4798309c6dc6344d02042c655997ab9abfe833b32686f58cc1fb9da4024bb56e62794d14c7b0c1b201fedc4

data/Gemfile

@@ -3,7 +3,7 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in kdl.gemspec
 gemspec
 
-gem "rake", "~> 12.0"
+gem "rake", "~> 13.0"
 
 group :test do
   gem "minitest", "~> 5.0"

data/lib/kdl/builder.rb

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+module KDL
+  class Builder < BasicObject
+    class Error < ::KDL::Error; end
+
+    def initialize
+      @nesting = []
+      @document = Document.new
+    end
+
+    def document(&block)
+      yield if block
+      @document
+    end
+
+    def node(name = nil, *args, type: nil, **props, &block)
+      n = Node.new(name&.to_s || "node", type:)
+      @nesting << n
+      args.each do |value|
+        case value
+        when ::Hash
+          value.each { |k, v| prop k, v }
+        else arg value
+        end
+      end
+      props.each do |key, value|
+        prop key, value
+      end
+      yield if block
+      @nesting.pop
+      if parent = current_node
+        parent.children << n
+      else
+        @document << n
+      end
+      n
+    end
+    alias _ node
+
+    def arg(value, type: nil)
+      if n = current_node
+        val = Value.from(value)
+        val = val.as_type(type) if type
+        n.arguments << val
+        val
+      else
+        raise Error, "Can't do argument, not inside Node"
+      end
+    end
+
+    def prop(key, value, type: nil)
+      key = key.to_s
+      if n = current_node
+        val = Value.from(value)
+        val = val.as_type(type) if type
+        n.properties[key] = val
+        val
+      else
+        raise Error, "Can't do property, not inside Node"
+      end
+    end
+
+    def method_missing(name, *args, **props, &block)
+      node name, *args, **props, &block
+    end
+
+    private
+
+    def current_node
+      return nil if @nesting.empty?
+
+      @nesting.last
+    end
+  end
+end

data/lib/kdl/document.rb

@@ -6,7 +6,7 @@ module KDL
 
     attr_accessor :nodes
 
-    def initialize(nodes)
+    def initialize(nodes = [])
       @nodes = nodes
     end
 
@@ -21,6 +21,10 @@ module KDL
       end
     end
 
+    def <<(node)
+      nodes << node
+    end
+
     def arg(key)
       self[key]&.arguments&.first&.value
     end

data/lib/kdl/error.rb

@@ -1,13 +1,24 @@
 # frozen_string_literal: true
 
 module KDL
-  class Error < StandardError; end
+  class Error < StandardError
+    attr_reader :filename, :line, :column
+
+    def initialize(message, filename = nil, line = nil, column = nil)
+      message += " (#{line}:#{column})" if line
+      message = "#{[filename, line, column].compact.join(':')}: #{message}" if filename
+      super(message)
+      @filename = filename
+      @line = line
+      @column = column
+    end
+  end
 
   class VersionMismatchError < Error
     attr_reader :version, :parser_version
 
-    def initialize(message, version = nil, parser_version = nil)
-      super(message)
+    def initialize(message, version = nil, parser_version = nil, filename = nil)
+      super(message, filename, 1, 1)
       @version = version
       @parser_version = parser_version
     end
@@ -16,9 +27,11 @@ module KDL
   class UnsupportedVersionError < Error
     attr_reader :version
 
-    def initialize(message, version = nil)
-      super(message)
+    def initialize(message, version = nil, filename = nil)
+      super(message, filename, 1, 1)
       @version = version
     end
   end
+
+  class ParseError < Error; end
 end

data/lib/kdl/kdl.tab.rb

@@ -29,100 +29,100 @@ module_eval(<<'...end kdl.yy/module_eval...', 'kdl.yy', 78)
 ##### State transition tables begin ###
 
 racc_action_table = [
-    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 ]
+    20,    21,    22,     9,    34,    26,    20,    21,    22,    20,
+    21,    22,    19,    18,     5,     6,    34,    18,    19,    20,
+    21,    22,     7,    18,    34,    18,    34,     5,     6,    72,
+    86,    19,    20,    21,    22,     7,    18,   -39,    20,    21,
+    22,   -40,    34,    88,    19,   -41,     5,     6,    74,    18,
+    19,    18,    34,    84,     7,    49,    50,    51,    55,    56,
+    59,    60,    58,    71,     6,    34,    34,    19,   -54,   -54,
+    92,     7,    49,    50,    51,    55,    56,    59,    60,    58,
+    20,    21,    22,    93,    19,    76,    77,    78,    55,    56,
+    59,    60,    58,    34,    34,   -63,   -63,    19,    34,    34,
+    34,    34,   -63,    18,     5,     6,   nil,    18,    18,    18,
+    18,   nil,     7,     5,     6,     5,     6,     5,     6,   nil,
+    30,     7,   nil,     7,   nil,     7,     5,     6,     5,     6,
+    71,     6,     5,     6,     7,   nil,     7,   nil,     7,   nil,
+     7,    71,     6,    71,     6,   nil,   nil,   nil,    30,     7,
+    30,     7,    76,    77,    78,    55,    56,    59,    60,    58 ]
 
 racc_action_check = [
-     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 ]
+     2,     2,     2,     1,    32,     9,     3,     3,     3,    14,
+    14,    14,     2,    32,     3,     3,    41,     2,     3,    81,
+    81,    81,     3,     3,    19,    41,    34,    81,    81,    44,
+    81,    81,    82,    82,    82,    81,    81,    49,    17,    17,
+    17,    50,    45,    82,    82,    51,    17,    17,    52,    82,
+    17,    45,    62,    79,    17,    43,    43,    43,    43,    43,
+    43,    43,    43,    43,    43,    84,    71,    43,    71,    71,
+    90,    43,    33,    33,    33,    33,    33,    33,    33,    33,
+    38,    38,    38,    91,    33,    74,    74,    74,    74,    74,
+    74,    74,    74,    15,    42,    15,    42,    74,    63,    65,
+    66,    80,    15,    42,     0,     0,   nil,    63,    65,    66,
+    80,   nil,     0,    12,    12,    28,    28,    30,    30,   nil,
+    12,    12,   nil,    28,   nil,    30,    37,    37,    40,    40,
+    64,    64,    72,    72,    37,   nil,    40,   nil,    64,   nil,
+    72,    85,    85,    87,    87,   nil,   nil,   nil,    85,    85,
+    87,    87,    54,    54,    54,    54,    54,    54,    54,    54 ]
 
 racc_action_pointer = [
-    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 ]
+    94,     3,    -2,     4,   nil,   nil,   nil,   nil,   nil,     5,
+   nil,   nil,   103,   nil,     7,    83,   nil,    36,   nil,    14,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   105,   nil,
+   107,   nil,    -6,    70,    16,   nil,   nil,   116,    78,   nil,
+   118,     6,    84,    53,    17,    32,   nil,   nil,   nil,    21,
+    25,    29,    32,   nil,   150,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    42,    88,   120,    89,    90,   nil,   nil,   nil,
+   nil,    56,   122,   nil,    83,   nil,   nil,   nil,   nil,    38,
+    91,    17,    30,   nil,    55,   131,   nil,   133,   nil,   nil,
+    57,    70,   nil,   nil ]
 
 racc_action_default = [
    -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 ]
+   -39,   -40,   -41,    -4,    -5,   -62,    94,    -8,   -32,   -33,
+   -34,   -10,   -63,   -22,   -54,   -56,   -23,   -37,   -64,   -57,
+   -35,   -12,   -13,   -63,   -64,   -57,   -30,   -18,   -20,   -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,     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 ]
+    17,    17,     2,    23,    24,     3,    25,     1,    54,    47,
+    31,     4,    85,    87,    75,    41,    32,    36,    54,    68,
+    38,    67,    37,    42,    73,    66,    48,   nil,    52,   nil,
+    43,    25,    63,    62,   nil,    40,    69,   nil,    52,   nil,
+    25,    33,    67,    25,    73,   nil,   nil,   nil,    37,    54,
+    83,   nil,   nil,   nil,   nil,   nil,   nil,    80,    45,    67,
+    61,   nil,   nil,    79,   nil,   nil,   nil,    65,    45,    37,
+   nil,    65,   nil,   nil,    82,   nil,   nil,    81,   nil,    17,
+    17,    23,    24,     4,    25,    89,    90,   nil,    91,    65,
+   nil,    65,    65,   nil,   nil,   nil,   nil,    61,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    65 ]
 
 racc_goto_check = [
-    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 ]
+    18,    18,     2,     5,     6,     3,    24,     1,    10,    17,
+     9,     4,     7,     7,    22,    13,    12,     5,    10,    17,
+    12,    20,     3,    14,    20,    13,    19,   nil,    15,   nil,
+    18,    24,    14,    15,   nil,     3,    19,   nil,    15,   nil,
+    24,    16,    20,    24,    20,   nil,   nil,   nil,     3,    10,
+    17,   nil,   nil,   nil,   nil,   nil,   nil,    14,    16,    20,
+    16,   nil,   nil,    12,   nil,   nil,   nil,    16,    16,     3,
+   nil,    16,   nil,   nil,     2,   nil,   nil,     3,   nil,    18,
+    18,     5,     6,     4,    24,    12,    12,   nil,    12,    16,
+   nil,    16,    16,   nil,   nil,   nil,   nil,    16,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    16 ]
 
 racc_goto_pointer = [
-   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 ]
+   nil,     7,     2,     5,    11,     0,     1,   -69,   nil,    -4,
+   -25,   nil,     1,   -17,    -9,    -5,    26,   -24,    -2,    -7,
+   -21,   nil,   -40,   nil,     3 ]
 
 racc_goto_default = [
-   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 ]
+   nil,   nil,   nil,    28,    35,    10,    11,    12,    27,    13,
+    14,    15,    44,    70,   nil,    16,    39,   nil,    64,   nil,
+    46,    29,    53,    57,     8 ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
@@ -161,15 +161,15 @@ racc_reduce_table = [
   1, 28, :_reduce_none,
   1, 41, :_reduce_none,
   2, 41, :_reduce_none,
-  1, 37, :_reduce_none,
-  2, 37, :_reduce_none,
+  1, 38, :_reduce_none,
+  2, 38, :_reduce_none,
   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_44,
+  3, 39, :_reduce_42,
+  1, 37, :_reduce_none,
+  2, 37, :_reduce_44,
   1, 42, :_reduce_45,
   1, 42, :_reduce_46,
   1, 42, :_reduce_47,
@@ -179,10 +179,10 @@ racc_reduce_table = [
   1, 42, :_reduce_51,
   1, 43, :_reduce_52,
   1, 43, :_reduce_53,
+  1, 36, :_reduce_none,
+  2, 36, :_reduce_none,
+  1, 32, :_reduce_none,
   1, 32, :_reduce_none,
-  2, 32, :_reduce_none,
-  1, 39, :_reduce_none,
-  1, 39, :_reduce_none,
   1, 44, :_reduce_none,
   1, 44, :_reduce_none,
   1, 44, :_reduce_none,
@@ -192,7 +192,7 @@ racc_reduce_table = [
 
 racc_reduce_n = 64
 
-racc_shift_n = 93
+racc_shift_n = 94
 
 racc_token_table = {
   false => 0,
@@ -270,14 +270,14 @@ Racc_token_to_s_table = [
   "untyped_node",
   "type",
   "node_decl",
-  "ws_plus",
+  "ws_star",
   "node_children",
   "empty_childrens",
   "identifier",
+  "ws_plus",
   "value",
   "slashdash",
   "property",
-  "ws_star",
   "empty_children",
   "semicolon_term",
   "untyped_value",

data/lib/kdl/kdl.yy

@@ -22,16 +22,16 @@ rule
   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 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 ws_star node_children                                 { val[0].tap { |x| x.children = val[2] } }
+                 | node_decl ws_star empty_childrens                               { val[0].tap { |x| x.children = [] } }
+                 | node_decl ws_star empty_childrens node_children                 { val[0].tap { |x| x.children = val[3] } }
+                 | node_decl ws_star node_children empty_childrens                 { val[0].tap { |x| x.children = val[2] } }
+                 | node_decl ws_star 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] }
+                 | node_decl ws_star slashdash value    { val[0] }
                  | node_decl ws_plus property           { val[0].tap { |x| x.properties[val[2][0]] = val[2][1] } }
-                 | node_decl ws_plus slashdash property { val[0] }
+                 | node_decl ws_star slashdash property { val[0] }
                  | node_decl ws_plus                    { val[0] }
   empty_node     : slashdash node
   node_children  : ws_star LBRACE nodes RBRACE                          { val[2] }
@@ -86,8 +86,8 @@ rule
     2
   end
 
-  def parse(str)
-    @tokenizer = ::KDL::Tokenizer.new(str)
+  def parse(str, filename: nil)
+    @tokenizer = ::KDL::Tokenizer.new(str, filename:)
     check_version
     do_parse
   end

data/lib/kdl/node.rb

@@ -48,6 +48,10 @@ module KDL
       end
     end
 
+    def <<(node)
+      children << node
+    end
+
     def child(key)
       case key
       when Integer

data/lib/kdl/parser_common.rb

@@ -21,8 +21,12 @@ module KDL
     def check_version
       return unless doc_version = @tokenizer.version_directive
       if doc_version != parser_version
-        raise VersionMismatchError.new("Version mismatch, document specified v#{doc_version}, but this is a v#{parser_version} parser", doc_version, parser_version)
+        raise VersionMismatchError.new("version mismatch, document specified v#{doc_version}, but this is a v#{parser_version} parser", doc_version, parser_version)
       end
     end
+
+    def on_error(t, val, vstack)
+      raise KDL::ParseError.new("unexpected #{token_to_str(t)} #{val&.value.inspect}", @tokenizer.filename, val&.line, val&.column)
+    end
   end
 end

data/lib/kdl/tokenizer.rb

@@ -4,12 +4,6 @@ require 'bigdecimal'
 
 module KDL
   class Tokenizer
-    class Error < ::KDL::Error
-      def initialize(message, line, column)
-        super("#{message} (#{line}:#{column})")
-      end
-    end
-
     class Token
       attr_reader :type, :value, :line, :column, :meta
 
@@ -30,10 +24,9 @@ module KDL
       def to_s
         "#{value.inspect} (#{line}:#{column})"
       end
-      alias inspect to_s
     end
 
-    attr_reader :index
+    attr_reader :index, :filename
 
     SYMBOLS = {
       '{' => :LBRACE,
@@ -72,13 +65,14 @@ module KDL
 
     VERSION_PATTERN = /\A\/-[#{WHITESPACE.join}]*kdl-version[#{WHITESPACE.join}]+(\d+)[#{WHITESPACE.join}]*[#{NEWLINES.join}]/
 
-    def initialize(str, start = 0)
+    def initialize(str, start = 0, filename: nil)
       @str = debom(str)
-      @context = nil
-      @rawstring_hashes = nil
       @start = start
       @index = start
       @buffer = +""
+      @filename = filename
+      @context = nil
+      @rawstring_hashes = nil
       @done = false
       @previous_context = nil
       @line = 1
@@ -201,7 +195,7 @@ module KDL
               traverse(1)
             end
           when '\\'
-            t = Tokenizer.new(@str, @index + 1)
+            t = Tokenizer.new(@str, @index + 1, filename:)
             la = t.next_token
             if la[0] == :NEWLINE || la[0] == :EOF || (la[0] == :WS && (lan = t.next_token[0]) == :NEWLINE || lan == :EOF)
               traverse_to(t.index)
@@ -433,7 +427,7 @@ module KDL
             @comment_nesting = 1
             traverse(2)
           elsif c == "\\"
-            t = Tokenizer.new(@str, @index + 1)
+            t = Tokenizer.new(@str, @index + 1, filename:)
             la = t.next_token
             if la[0] == :NEWLINE || la[0] == :EOF || (la[0] == :WS && (lan = t.next_token[0]) == :NEWLINE || lan == :EOF)
               traverse_to(t.index)
@@ -446,7 +440,7 @@ module KDL
             return token(:WS, -@buffer)
           end
         when :equals
-          t = Tokenizer.new(@str, @index)
+          t = Tokenizer.new(@str, @index, filename:)
           la = t.next_token
           if la[0] == :WS
             @buffer << la[1].value
@@ -488,9 +482,9 @@ module KDL
 
     def raise_error(error)
       case error
-      when String then raise Error.new(error, @line, @column)
+      when String then raise ParseError.new(error, @filename, @line, @column)
       when Error then raise error
-      else raise Error.new(error.message, @line, @column)
+      else raise ParseError.new(error.message, @filename, @line, @column)
       end
     end
 
@@ -611,8 +605,10 @@ module KDL
     def unescape(string, rgx = UNESCAPE)
       string
         .gsub(rgx) { |m| replace_esc(m) }
-        .gsub(/\\u\{[0-9a-fA-F]{0,6}\}/) do |m|
-          i = Integer(m[3..-2], 16)
+        .gsub(/\\u\{[0-9a-fA-F]+\}/) do |m|
+          digits = m[3..-2]
+          raise_error "Invalid code point #{m}" if digits.length > 6
+          i = Integer(digits, 16)
           if i < 0 || i > 0x10FFFF || (0xD800..0xDFFF).include?(i)
             raise_error "Invalid code point #{m}"
           end
@@ -637,6 +633,8 @@ module KDL
 
     def dedent(string)
       split = string.split(NEWLINES_PATTERN)
+      return "" if split.empty?
+
       lines = split.partition.with_index { |_, i| i.even? }.first
       if split.last.match?(NEWLINES_PATTERN)
         indent = ""

data/lib/kdl/v1/kdl.yy

@@ -81,9 +81,9 @@ rule
     1
   end
 
-  def parse(str, **options)
+  def parse(str, filename: nil, **options)
     init(**options)
-    @tokenizer = ::KDL::V1::Tokenizer.new(str)
+    @tokenizer = ::KDL::V1::Tokenizer.new(str, filename:)
     check_version
     do_parse
   end

data/lib/kdl/v1/value.rb

@@ -83,7 +83,7 @@ module KDL
         when ::Float then Float.new(value)
         when TrueClass, FalseClass then Boolean.new(value)
         when NilClass then Null
-        else raise Error("Unsupported value type: #{value.class}")
+        else raise Error("unsupported value type: #{value.class}")
         end
       end
     end

data/lib/kdl/value.rb

@@ -167,7 +167,7 @@ module KDL
       when ::Float then Float.new(value)
       when TrueClass, FalseClass then Boolean.new(value)
       when NilClass then Null
-      else raise Error("Unsupported value type: #{value.class}")
+      else raise Error, "unsupported value type: #{value.class}"
       end
     end
   end

data/lib/kdl/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module KDL
-  VERSION = "2.0.1"
+  VERSION = "2.1.0"
 end

data/lib/kdl.rb

@@ -10,6 +10,7 @@ require "kdl/string_dumper"
 require "kdl/types"
 require "kdl/parser_common"
 require "kdl/kdl.tab"
+require "kdl/builder"
 require "kdl/v1"
 
 module KDL
@@ -23,28 +24,30 @@ module KDL
     parse(input, **options)
   end
 
-  def self.parse(input, version: default_version, output_version: default_output_version, **options)
+  def self.parse(input, version: default_version, output_version: default_output_version, filename: nil, **options)
     case version
     when 2
-      Parser.new(output_module: output_module(output_version || 2), **options).parse(input)
+      Parser.new(output_module: output_module(output_version || 2), **options).parse(input, filename:)
     when 1
-      V1::Parser.new.parse(input, output_module: output_module(output_version || 1), **options)
+      V1::Parser.new.parse(input, output_module: output_module(output_version || 1), filename:, **options)
     when nil
       auto_parse(input, output_version:, **options)
     else
-      raise UnsupportedVersionError.new("Unsupported version '#{version}'", version)
+      raise UnsupportedVersionError.new("unsupported version '#{version}'", version)
     end
   end
 
   def self.load_file(filespec, **options)
-    parse(File.read(filespec, encoding: Encoding::UTF_8), **options)
+    File.open(filespec, 'r:BOM|UTF-8') do |file|
+      parse(file.read, **options, filename: file.to_path)
+    end
   end
 
   def self.auto_parse(input, output_version: default_output_version, **options)
     parse(input, version: 2, output_version: output_version || 2, **options)
   rescue VersionMismatchError => e
     parse(input, version: e.version, output_version: output_version || e.version, **options)
-  rescue Tokenizer::Error, Racc::ParseError => e
+  rescue ParseError => e
     parse(input, version: 1, output_version: output_version || 1, **options) rescue raise e
   end
 
@@ -53,8 +56,20 @@ module KDL
     when 1 then KDL::V1
     when 2 then KDL
     else
-      warn "Unknown output_version `#{version}', defaulting to v2"
+      warn "[WARNING] Unknown output_version '#{version}', defaulting to v2"
       KDL
     end
   end
+
+  def self.build(&block)
+    builder = Builder.new
+    if block.arity >= 1
+      builder.document do
+        yield builder
+      end
+    else
+      builder.instance_exec(&block)
+      builder.document
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: kdl
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Danielle Smith
 bindir: exe
 cert_chain: []
-date: 2025-01-15 00:00:00.000000000 Z
+date: 2025-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: racc
@@ -87,6 +87,7 @@ files:
 - bin/setup
 - kdl.gemspec
 - lib/kdl.rb
+- lib/kdl/builder.rb
 - lib/kdl/document.rb
 - lib/kdl/error.rb
 - lib/kdl/kdl.tab.rb