kdl 0.1.2 → 1.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfb8d87e0f543090b994347f56085b076d82ce8050f52e49e112a2e723aafc09
-  data.tar.gz: 33443ec26405e8cd235275ab262378d2afc6bfebf4bf186a22580d6c62d8db07
+  metadata.gz: 1da5c7ecdbb21b75f621fbb6876fd46270c525311d9b34443ebbda8e715f6b0d
+  data.tar.gz: c8317287f0573c91b256d28ff902e3a38bd3275b009016ce0d41c631e7321303
 SHA512:
-  metadata.gz: '0396991421855a4b2c9b40263a50b255c8ab78b493604254437a6fe2cae9a05d8ac967c6fa19893e8712f210d5e882d6f98338331d56fa2b80e01c24c33b980e'
-  data.tar.gz: 9a3af62eae607011f76a1b154cf4604afd9d6cb38dacdaccc28f735720b8caec9789d6d75766904d395a4969a44b903e890363b7df17533349b8d8c2186a790e
+  metadata.gz: 549b4b676a95b83146647aca4dbbccf44463fbaa5cc0192dc7e0e1e8977e194bdc505c29edde3c71f5f225a22eb23ea2ba484d4a26c24cdbae152015dde99b77
+  data.tar.gz: 13520a974cb5e28658bebd7b09fa79bb13e40cf2c12f50e0a51408fef74ab756e314f7e6758a357b0ef82afdda3cfa7604197184dad45607296ffb7469507df3

data/.github/workflows/ruby.yml

@@ -17,18 +17,19 @@ jobs:
   test:
     strategy:
       matrix:
-        ruby: [2.3, 2.4, 2.5, 2.6, 2.7, 3.0.0-preview1]
+        ruby: [2.3, 2.4, 2.5, 2.6, 2.7, 3.0, head]
 
     runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v2
+      with:
+        submodules: true
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
-    - name: Install dependencies
-      run: gem install bundler && bundle install
+        bundler-cache: true # install and cache dependencies
     - name: Build parser
       run: bundle exec racc lib/kdl/kdl.yy
     - name: Run tests

data/.gitmodules

@@ -0,0 +1,3 @@
+[submodule "test/kdl-org"]
+	path = test/kdl-org
+	url = git@github.com:kdl-org/kdl

data/Rakefile

@@ -1,10 +1,15 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
+require 'bundler/gem_tasks'
+require 'rake/testtask'
 
-Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
-  t.test_files = FileList["test/**/*_test.rb"]
+file 'lib/kdl/kdl.tab.rb' => ['lib/kdl/kdl.yy'] do
+  raise "racc command failed" unless system 'bin/racc lib/kdl/kdl.yy'
+end
+task :racc => 'lib/kdl/kdl.tab.rb'
+
+Rake::TestTask.new(:test => :racc) do |t|
+  t.libs << 'test'
+  t.libs << 'lib'
+  t.test_files = FileList['test/**/*_test.rb']
   t.options = '--pride'
 end
 

data/bin/console

@@ -10,5 +10,7 @@ require "kdl"
 # require "pry"
 # Pry.start
 
+system 'bin/rake racc'
+
 require "irb"
 IRB.start(__FILE__)

data/bin/racc

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'racc' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("racc", "racc")

data/bin/rake

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rake' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rake", "rake")

data/bin/setup

@@ -6,3 +6,4 @@ set -vx
 bundle install
 
 # Do any other automated setup that you need to do here
+bin/rake racc

data/kdl.gemspec

@@ -3,7 +3,7 @@ require_relative 'lib/kdl/version'
 Gem::Specification.new do |spec|
   spec.name          = "kdl"
   spec.version       = KDL::VERSION
-  spec.authors       = ["Daniel Smith"]
+  spec.authors       = ["Danielle Smith"]
   spec.email         = ["danini@hey.com"]
 
   spec.summary       = %q{KDL Document Language}
@@ -13,8 +13,8 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
 
   spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = "https://github.com/jellymann/kdl-rb"
-  spec.metadata["changelog_uri"] = "https://github.com/jellymann/kdl-rb/releases"
+  spec.metadata["source_code_uri"] = "https://github.com/danini-the-panini/kdl-rb"
+  spec.metadata["changelog_uri"] = "https://github.com/danini-the-panini/kdl-rb/releases"
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
@@ -22,7 +22,6 @@ Gem::Specification.new do |spec|
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end + ['lib/kdl/kdl.tab.rb']
   spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency 'racc', '~> 1.5'

data/lib/kdl/document.rb

@@ -7,9 +7,8 @@ module KDL
     end
 
     def to_s
-      @nodes.map(&:to_s).join("\n")
+      @nodes.map(&:to_s).join("\n") + "\n"
     end
-    alias inspect to_s
 
     def ==(other)
       return false unless other.is_a?(Document)

data/lib/kdl/kdl.tab.rb

@@ -8,7 +8,7 @@ require 'racc/parser.rb'
 module KDL
   class Parser < Racc::Parser
 
-module_eval(<<'...end kdl.yy/module_eval...', 'kdl.yy', 59)
+module_eval(<<'...end kdl.yy/module_eval...', 'kdl.yy', 68)
   def parse(str)
     @tokenizer = ::KDL::Tokenizer.new(str)
     do_parse
@@ -23,119 +23,139 @@ module_eval(<<'...end kdl.yy/module_eval...', 'kdl.yy', 59)
 ##### State transition tables begin ###
 
 racc_action_table = [
-    -2,    10,    16,    17,    16,    17,    21,    25,     7,    33,
-     6,     7,    30,     8,    27,    50,     8,    15,    33,    15,
-    16,    41,    43,    44,    45,    48,    49,    47,    39,    39,
-   -36,    16,    17,     6,     7,    37,    27,     6,     7,     8,
-    16,    17,    62,     8,    33,   -25,    15,    16,    41,    43,
-    44,    45,    48,    49,    47,     6,     7,    50,     6,     7,
-    30,     8,    55,    30,     8,     6,     7,     6,     7,     6,
-     7,     8,   nil,     8,   nil,     8,    61,    43,    44,    45,
-    48,    49,    47,     6,     7,   nil,   nil,   nil,   nil,     8 ]
+    -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,
+     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 ]
 
 racc_action_check = [
-     3,     1,     2,     2,     5,     5,    10,    13,    13,    15,
-     3,     3,    13,    13,    13,    26,     3,     2,    27,     5,
-    25,    25,    25,    25,    25,    25,    25,    25,    25,    39,
-    25,    56,    56,     0,     0,    25,    39,    28,    28,     0,
-    32,    32,    56,    28,    37,    41,    56,    54,    54,    54,
-    54,    54,    54,    54,    54,    23,    23,    54,    24,    24,
-    23,    23,    42,    24,    24,    30,    30,    50,    50,    52,
-    52,    30,   nil,    50,   nil,    52,    55,    55,    55,    55,
-    55,    55,    55,    57,    57,   nil,   nil,   nil,   nil,    57 ]
+     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 ]
 
 racc_action_pointer = [
-    23,     1,     0,     0,   nil,     2,   nil,   nil,   nil,   nil,
-     6,   nil,   nil,    -3,   nil,    -1,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    45,    48,    18,     3,     8,    27,   nil,
-    55,   nil,    38,   nil,   nil,   nil,   nil,    34,   nil,    19,
-   nil,    31,    48,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-    57,   nil,    59,   nil,    45,    73,    29,    73,   nil,   nil,
-   nil,   nil,   nil ]
+    -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 ]
 
 racc_action_default = [
-   -44,   -45,    -1,   -43,    -3,   -45,   -37,   -38,   -39,   -40,
-   -45,    -6,    -7,   -44,   -11,   -44,   -24,   -25,   -41,    -4,
-    -5,    63,    -8,   -45,   -45,   -37,   -45,   -44,   -20,   -21,
-   -22,   -35,   -45,   -36,    -9,   -10,   -12,   -44,   -14,   -45,
-   -19,   -27,   -45,   -28,   -29,   -30,   -31,   -32,   -33,   -34,
-   -44,   -18,   -23,   -16,   -45,   -45,   -45,   -43,   -13,   -15,
-   -26,   -27,   -17 ]
+   -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 ]
 
 racc_goto_table = [
-    18,     2,     3,     4,    36,    32,    42,    38,    22,     1,
-    19,    20,    23,    24,   nil,   nil,   nil,   nil,    34,    35,
-   nil,   nil,   nil,   nil,   nil,    18,   nil,    54,   nil,   nil,
-   nil,   nil,    52,    58,    60,    42,    59,    53,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    18,
-   nil,    56,    57,     4,    18 ]
+    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 ]
 
 racc_goto_check = [
-    18,     2,     3,     4,    13,    14,    12,    15,     9,     1,
-     6,     7,    10,    11,   nil,   nil,   nil,   nil,     9,     9,
-   nil,   nil,   nil,   nil,   nil,    18,   nil,    14,   nil,   nil,
-   nil,   nil,     3,    13,    13,    12,    15,     6,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    18,
-   nil,     2,     3,     4,    18 ]
+    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 ]
 
 racc_goto_pointer = [
-   nil,     9,     1,     2,     3,   nil,     5,     6,   nil,    -5,
-    -1,     0,   -19,   -21,   -10,   -18,   nil,   nil,    -3 ]
+   nil,    14,     3,     4,     5,     8,    -4,    -3,   nil,    -2,
+     2,     3,    -8,   -22,   -18,    -3,   -16,   nil,   -33,   nil,
+    -3 ]
 
 racc_goto_default = [
-   nil,   nil,   nil,    28,    31,     5,    11,    12,    13,   nil,
-    51,    40,    14,   nil,    26,   nil,    29,    46,     9 ]
+   nil,   nil,   nil,    31,    34,   nil,    11,    12,    13,   nil,
+    58,    45,    14,    15,   nil,    29,   nil,    32,    49,    53,
+     9 ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
-  1, 19, :_reduce_1,
-  1, 19, :_reduce_2,
-  1, 20, :_reduce_3,
-  2, 20, :_reduce_4,
-  2, 20, :_reduce_5,
-  2, 20, :_reduce_6,
-  2, 20, :_reduce_7,
-  2, 24, :_reduce_8,
-  3, 24, :_reduce_9,
-  3, 24, :_reduce_10,
-  1, 26, :_reduce_11,
-  3, 26, :_reduce_12,
-  5, 26, :_reduce_13,
-  3, 26, :_reduce_14,
-  5, 26, :_reduce_15,
-  3, 25, :_reduce_none,
-  4, 28, :_reduce_17,
-  2, 29, :_reduce_none,
-  2, 29, :_reduce_none,
-  1, 27, :_reduce_none,
-  1, 27, :_reduce_none,
-  1, 34, :_reduce_none,
-  2, 34, :_reduce_none,
-  1, 30, :_reduce_24,
-  1, 30, :_reduce_25,
+  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,
+  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,
+  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, 31, :_reduce_27,
-  1, 31, :_reduce_28,
-  1, 31, :_reduce_29,
-  1, 31, :_reduce_30,
-  1, 31, :_reduce_31,
-  1, 31, :_reduce_32,
-  1, 35, :_reduce_33,
-  1, 35, :_reduce_34,
-  1, 32, :_reduce_none,
-  1, 32, :_reduce_none,
-  1, 36, :_reduce_none,
-  1, 36, :_reduce_none,
-  1, 36, :_reduce_none,
-  1, 21, :_reduce_none,
-  2, 21, :_reduce_none,
-  1, 23, :_reduce_none,
+  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,
+  1, 35, :_reduce_none,
+  1, 40, :_reduce_none,
+  1, 40, :_reduce_none,
+  1, 40, :_reduce_none,
   1, 23, :_reduce_none,
-  0, 22, :_reduce_44 ]
+  2, 23, :_reduce_none,
+  1, 25, :_reduce_none,
+  1, 25, :_reduce_none,
+  0, 24, :_reduce_50 ]
 
-racc_reduce_n = 45
+racc_reduce_n = 51
 
-racc_shift_n = 63
+racc_shift_n = 75
 
 racc_token_table = {
   false => 0,
@@ -150,14 +170,16 @@ racc_token_table = {
   :NULL => 9,
   :WS => 10,
   :NEWLINE => 11,
-  :LPAREN => 12,
-  :RPAREN => 13,
-  :EQUALS => 14,
-  :SEMICOLON => 15,
-  :EOF => 16,
-  :SLASHDASH => 17 }
+  :LBRACE => 12,
+  :RBRACE => 13,
+  :LPAREN => 14,
+  :RPAREN => 15,
+  :EQUALS => 16,
+  :SEMICOLON => 17,
+  :EOF => 18,
+  :SLASHDASH => 19 }
 
-racc_nt_base = 18
+racc_nt_base = 20
 
 racc_use_result_var = false
 
@@ -190,6 +212,8 @@ Racc_token_to_s_table = [
   "NULL",
   "WS",
   "NEWLINE",
+  "LBRACE",
+  "RBRACE",
   "LPAREN",
   "RPAREN",
   "EQUALS",
@@ -209,10 +233,12 @@ Racc_token_to_s_table = [
   "node_children",
   "empty_children",
   "identifier",
+  "type",
   "value",
   "ws_star",
   "property",
   "semicolon_term",
+  "untyped_value",
   "boolean",
   "linespace" ]
 
@@ -222,107 +248,115 @@ Racc_debug_parser = false
 
 # reduce 0 omitted
 
-module_eval(<<'.,.,', 'kdl.yy', 12)
+module_eval(<<'.,.,', 'kdl.yy', 13)
   def _reduce_1(val, _values)
      KDL::Document.new(val[0])
   end
 .,.,
 
-module_eval(<<'.,.,', 'kdl.yy', 13)
+module_eval(<<'.,.,', 'kdl.yy', 14)
   def _reduce_2(val, _values)
      KDL::Document.new([])
   end
 .,.,
 
-module_eval(<<'.,.,', 'kdl.yy', 15)
+module_eval(<<'.,.,', 'kdl.yy', 16)
   def _reduce_3(val, _values)
      []
   end
 .,.,
 
-module_eval(<<'.,.,', 'kdl.yy', 16)
+module_eval(<<'.,.,', 'kdl.yy', 17)
   def _reduce_4(val, _values)
      [val[1]]
   end
 .,.,
 
-module_eval(<<'.,.,', 'kdl.yy', 17)
+module_eval(<<'.,.,', 'kdl.yy', 18)
   def _reduce_5(val, _values)
      []
   end
 .,.,
 
-module_eval(<<'.,.,', 'kdl.yy', 18)
+module_eval(<<'.,.,', 'kdl.yy', 19)
   def _reduce_6(val, _values)
      [*val[0], val[1]]
   end
 .,.,
 
-module_eval(<<'.,.,', 'kdl.yy', 19)
+module_eval(<<'.,.,', 'kdl.yy', 20)
   def _reduce_7(val, _values)
      val[0]
   end
 .,.,
 
-module_eval(<<'.,.,', 'kdl.yy', 20)
+module_eval(<<'.,.,', 'kdl.yy', 21)
   def _reduce_8(val, _values)
-     val[0]
+     val[0].tap { |x| x.children = nil }
   end
 .,.,
 
-module_eval(<<'.,.,', 'kdl.yy', 21)
+module_eval(<<'.,.,', 'kdl.yy', 22)
   def _reduce_9(val, _values)
      val[0].tap { |x| x.children = val[1] }
   end
 .,.,
 
-module_eval(<<'.,.,', 'kdl.yy', 22)
+module_eval(<<'.,.,', 'kdl.yy', 23)
   def _reduce_10(val, _values)
-     val[0]
+     val[0].tap { |x| x.children = nil }
   end
 .,.,
 
-module_eval(<<'.,.,', 'kdl.yy', 23)
+module_eval(<<'.,.,', 'kdl.yy', 24)
   def _reduce_11(val, _values)
      KDL::Node.new(val[0])
   end
 .,.,
 
-module_eval(<<'.,.,', 'kdl.yy', 24)
+module_eval(<<'.,.,', 'kdl.yy', 25)
   def _reduce_12(val, _values)
-     val[0].tap { |x| x.arguments << val[2] }
+     KDL::Node.new(val[1], type: val[0])
   end
 .,.,
 
-module_eval(<<'.,.,', 'kdl.yy', 25)
+module_eval(<<'.,.,', 'kdl.yy', 26)
   def _reduce_13(val, _values)
-     val[0]
+     val[0].tap { |x| x.arguments << val[2] }
   end
 .,.,
 
-module_eval(<<'.,.,', 'kdl.yy', 26)
+module_eval(<<'.,.,', 'kdl.yy', 27)
   def _reduce_14(val, _values)
-     val[0].tap { |x| x.properties[val[2][0]] = val[2][1] }
+     val[0]
   end
 .,.,
 
-module_eval(<<'.,.,', 'kdl.yy', 27)
+module_eval(<<'.,.,', 'kdl.yy', 28)
   def _reduce_15(val, _values)
+     val[0].tap { |x| x.properties[val[2][0]] = val[2][1] }
+  end
+.,.,
+
+module_eval(<<'.,.,', 'kdl.yy', 29)
+  def _reduce_16(val, _values)
      val[0]
   end
 .,.,
 
-# reduce 16 omitted
+# reduce 17 omitted
 
-module_eval(<<'.,.,', 'kdl.yy', 29)
-  def _reduce_17(val, _values)
+module_eval(<<'.,.,', 'kdl.yy', 31)
+  def _reduce_18(val, _values)
      val[2]
   end
 .,.,
 
-# reduce 18 omitted
-
-# reduce 19 omitted
+module_eval(<<'.,.,', 'kdl.yy', 32)
+  def _reduce_19(val, _values)
+     []
+  end
+.,.,
 
 # reduce 20 omitted
 
@@ -332,92 +366,116 @@ module_eval(<<'.,.,', 'kdl.yy', 29)
 
 # reduce 23 omitted
 
-module_eval(<<'.,.,', 'kdl.yy', 35)
-  def _reduce_24(val, _values)
+# reduce 24 omitted
+
+# reduce 25 omitted
+
+module_eval(<<'.,.,', 'kdl.yy', 38)
+  def _reduce_26(val, _values)
+     val[1]
+  end
+.,.,
+
+module_eval(<<'.,.,', 'kdl.yy', 40)
+  def _reduce_27(val, _values)
      val[0].value
   end
 .,.,
 
-module_eval(<<'.,.,', 'kdl.yy', 36)
-  def _reduce_25(val, _values)
+module_eval(<<'.,.,', 'kdl.yy', 41)
+  def _reduce_28(val, _values)
      val[0].value
   end
 .,.,
 
-module_eval(<<'.,.,', 'kdl.yy', 38)
-  def _reduce_26(val, _values)
+module_eval(<<'.,.,', 'kdl.yy', 42)
+  def _reduce_29(val, _values)
+     val[0].value
+  end
+.,.,
+
+module_eval(<<'.,.,', 'kdl.yy', 44)
+  def _reduce_30(val, _values)
      [val[0], val[2]]
   end
 .,.,
 
-module_eval(<<'.,.,', 'kdl.yy', 40)
-  def _reduce_27(val, _values)
+# reduce 31 omitted
+
+module_eval(<<'.,.,', 'kdl.yy', 47)
+  def _reduce_32(val, _values)
+     val[1].as_type(val[0])
+  end
+.,.,
+
+module_eval(<<'.,.,', 'kdl.yy', 49)
+  def _reduce_33(val, _values)
      KDL::Value::String.new(val[0].value)
   end
 .,.,
 
-module_eval(<<'.,.,', 'kdl.yy', 41)
-  def _reduce_28(val, _values)
+module_eval(<<'.,.,', 'kdl.yy', 50)
+  def _reduce_34(val, _values)
      KDL::Value::String.new(val[0].value)
   end
 .,.,
 
-module_eval(<<'.,.,', 'kdl.yy', 42)
-  def _reduce_29(val, _values)
+module_eval(<<'.,.,', 'kdl.yy', 51)
+  def _reduce_35(val, _values)
      KDL::Value::Int.new(val[0].value)
   end
 .,.,
 
-module_eval(<<'.,.,', 'kdl.yy', 43)
-  def _reduce_30(val, _values)
-     KDL::Value::Float.new(val[0].value)
+module_eval(<<'.,.,', 'kdl.yy', 52)
+  def _reduce_36(val, _values)
+     KDL::Value::Float.new(val[0].value, format: val[0].meta[:format])
   end
 .,.,
 
-module_eval(<<'.,.,', 'kdl.yy', 44)
-  def _reduce_31(val, _values)
+module_eval(<<'.,.,', 'kdl.yy', 53)
+  def _reduce_37(val, _values)
      KDL::Value::Boolean.new(val[0])
   end
 .,.,
 
-module_eval(<<'.,.,', 'kdl.yy', 45)
-  def _reduce_32(val, _values)
+module_eval(<<'.,.,', 'kdl.yy', 54)
+  def _reduce_38(val, _values)
      KDL::Value::Null
   end
 .,.,
 
-module_eval(<<'.,.,', 'kdl.yy', 47)
-  def _reduce_33(val, _values)
+module_eval(<<'.,.,', 'kdl.yy', 56)
+  def _reduce_39(val, _values)
      true
   end
 .,.,
 
-module_eval(<<'.,.,', 'kdl.yy', 48)
-  def _reduce_34(val, _values)
+module_eval(<<'.,.,', 'kdl.yy', 57)
+  def _reduce_40(val, _values)
      false
   end
 .,.,
 
-# reduce 35 omitted
+# reduce 41 omitted
 
-# reduce 36 omitted
+# reduce 42 omitted
 
-# reduce 37 omitted
+# reduce 43 omitted
 
-# reduce 38 omitted
+# reduce 44 omitted
 
-# reduce 39 omitted
+# reduce 45 omitted
 
-# reduce 40 omitted
+# reduce 46 omitted
 
-# reduce 41 omitted
+# reduce 47 omitted
 
-# reduce 42 omitted
+# reduce 48 omitted
 
-# reduce 43 omitted
+# reduce 49 omitted
 
-module_eval(<<'.,.,', 'kdl.yy', 55)
-  def _reduce_44(val, _values)
+module_eval(<<'.,.,', 'kdl.yy', 64)
+  def _reduce_50(val, _values)
      nil
   end
 .,.,

data/lib/kdl/kdl.yy

@@ -4,6 +4,7 @@ class KDL::Parser
         STRING RAWSTRING
         INTEGER FLOAT TRUE FALSE NULL
         WS NEWLINE
+        LBRACE RBRACE
         LPAREN RPAREN
         EQUALS
         SEMICOLON
@@ -18,32 +19,40 @@ rule
             | linespace_star empty_node { [] }
             | nodes node                { [*val[0], val[1]] }
             | nodes empty_node          { val[0] }
-  node      : node_decl node_term                                 { 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] }
+            | 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 LPAREN nodes RPAREN { val[2] }
+  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
   semicolon_term: SEMICOLON | SEMICOLON linespaces
 
-  identifier: IDENT  { val[0].value }
-            | STRING { val[0].value }
+  type : LPAREN identifier RPAREN { val[1] }
+
+  identifier: IDENT     { val[0].value }
+            | STRING    { val[0].value }
+            | RAWSTRING { val[0].value }
 
   property: identifier EQUALS value { [val[0], val[2]] }
 
-  value : STRING     { KDL::Value::String.new(val[0].value) }
-        | RAWSTRING  { KDL::Value::String.new(val[0].value) }
-        | INTEGER    { KDL::Value::Int.new(val[0].value) }
-        | FLOAT      { KDL::Value::Float.new(val[0].value) }
-        | boolean    { KDL::Value::Boolean.new(val[0]) }
-        | NULL       { KDL::Value::Null }
+  value : untyped_value
+        | type untyped_value { val[1].as_type(val[0]) }
+
+  untyped_value : STRING     { KDL::Value::String.new(val[0].value) }
+                | RAWSTRING  { KDL::Value::String.new(val[0].value) }
+                | INTEGER    { KDL::Value::Int.new(val[0].value) }
+                | FLOAT      { KDL::Value::Float.new(val[0].value, format: val[0].meta[:format]) }
+                | boolean    { KDL::Value::Boolean.new(val[0]) }
+                | NULL       { KDL::Value::Null }
 
   boolean : TRUE  { true }
           | FALSE { false }

data/lib/kdl/node.rb

@@ -1,31 +1,33 @@
 module KDL
   class Node
-    attr_accessor :name, :arguments, :properties, :children
+    attr_accessor :name, :arguments, :properties, :children, :type
 
-    def initialize(name, arguments = [], properties = {}, children = [])
+    def initialize(name, arguments = [], properties = {}, children = nil, type: nil)
       @name = name
       @arguments = arguments
       @properties = properties
       @children = children
+      @type = type
     end
 
     def to_s(level = 0)
       indent = '    ' * level
-      s = "#{indent}#{name}"
+      s = "#{indent}#{type ? "(#{id_to_s type})" : ''}#{id_to_s name}"
       unless arguments.empty?
         s += " #{arguments.map(&:to_s).join(' ')}"
       end
       unless properties.empty?
-        s += " #{properties.map { |k, v| "#{k}=#{v}" }.join(' ')}"
+        s += " #{properties.map { |k, v| "#{id_to_s k}=#{v}" }.join(' ')}"
       end
-      unless children.empty?
+      unless children.nil?
         s += " {\n"
-        s += children.map { |c| c.to_s(level + 1) }.join("\n")
-        s += "\n#{indent}}"
+        unless children.empty?
+          s += children.map { |c| "#{c.to_s(level + 1)}\n" }.join("\n")
+        end
+        s += "#{indent}}"
       end
       s
     end
-    alias inspect to_s
 
     def ==(other)
       return false unless other.is_a?(Node)
@@ -35,5 +37,11 @@ module KDL
       properties == other.properties &&
       children   == other.children
     end
+
+    private
+
+    def id_to_s(id)
+      StringDumper.stringify_identifier(id)
+    end
   end
 end

data/lib/kdl/string_dumper.rb

@@ -0,0 +1,45 @@
+module KDL
+  module StringDumper
+    class << self
+      def call(string)
+        %("#{string.each_char.map { |char| escape(char) }.join}")
+      end
+
+      def stringify_identifier(ident)
+        if bare_identifier?(ident)
+          ident
+        else
+          call(ident)
+        end
+      end
+
+      private
+
+      def print?(char)
+        ' ' <= char && char <= '\x7e'
+      end
+
+      def escape(char)
+        case char
+        when "\n" then '\n'
+        when "\r" then '\r'
+        when "\t" then '\t'
+        when '\\' then '\\\\'
+        when '"' then '\"'
+        when "\b" then '\b'
+        when "\f" then '\f'
+        else char
+        end
+      end
+
+      def unicode_escape(char)
+        "\\u{#{char.codepoints.first.to_s(16)}}"
+      end
+
+      def bare_identifier?(name)
+        escape_chars = '\\\/(){}<>;\[\]=,"'
+        name =~ /^([^0-9\-+\s#{escape_chars}][^\s#{escape_chars}]*|[\-+](?!true|false|null)[^0-9\s#{escape_chars}][^\s#{escape_chars}]*)$/
+      end
+    end
+  end
+end

data/lib/kdl/tokenizer.rb

@@ -1,3 +1,5 @@
+require 'bigdecimal'
+
 module KDL
   class Tokenizer
     class Error < StandardError
@@ -7,13 +9,14 @@ module KDL
     end
 
     class Token
-      attr_reader :type, :value, :line, :column
+      attr_reader :type, :value, :line, :column, :meta
 
-      def initialize(type, value, line, column)
+      def initialize(type, value, line, column, meta = {})
         @type = type
         @value = value
         @line = line
         @column = column
+        @meta = meta
       end
 
       def ==(other)
@@ -31,8 +34,8 @@ module KDL
     attr_reader :index
 
     SYMBOLS = {
-      '{' => :LPAREN,
-      '}' => :RPAREN,
+      '{' => :LBRACE,
+      '}' => :RBRACE,
       '=' => :EQUALS,
       '＝' => :EQUALS,
       ';' => :SEMICOLON
@@ -46,10 +49,13 @@ module KDL
 
     NEWLINES = ["\u000A", "\u0085", "\u000C", "\u2028", "\u2029"]
 
-    NON_IDENTIFIER_CHARS = Regexp.escape "#{SYMBOLS.keys.join('')}\\<>[]\","
+    NON_IDENTIFIER_CHARS = Regexp.escape "#{SYMBOLS.keys.join('')}()/\\<>[]\","
     IDENTIFIER_CHARS = /[^#{NON_IDENTIFIER_CHARS}\x0-\x20]/
     INITIAL_IDENTIFIER_CHARS = /[^#{NON_IDENTIFIER_CHARS}0-9\x0-\x20]/
 
+    ALLOWED_IN_TYPE = [:ident, :string, :rawstring]
+    NOT_ALLOWED_AFTER_TYPE = [:single_line_comment, :multi_line_comment]
+
     def initialize(str, start = 0)
       @str = str
       @context = nil
@@ -60,6 +66,7 @@ module KDL
       @previous_context = nil
       @line = 1
       @column = 1
+      @type_context = false
     end
 
     def next_token
@@ -174,6 +181,12 @@ module KDL
             self.context = :ident
             @buffer = c
             traverse(1)
+          when '('
+            @type_context = true
+            return token(:LPAREN, c).tap { traverse(1) }
+          when ')'
+            @type_context = false
+            return token(:RPAREN, c).tap { traverse(1) }
           else
             raise_error "Unexpected character #{c.inspect}"
           end
@@ -304,8 +317,8 @@ module KDL
 
     private
 
-    def token(type, value)
-      [type, Token.new(type, value, @line_at_start, @column_at_start)]
+    def token(type, value, **meta)
+      @last_token = [type, Token.new(type, value, @line_at_start, @column_at_start, meta)]
     end
 
     def traverse(n = 1)
@@ -323,6 +336,11 @@ module KDL
     end
 
     def context=(val)
+      if @type_context && !ALLOWED_IN_TYPE.include?(val)
+        raise_error "#{val} context not allowed in type declaration"
+      elsif @last_token && @last_token[0] == :RPAREN && NOT_ALLOWED_AFTER_TYPE.include?(val)
+        raise_error 'Comments are not allowed after a type declaration'
+      end
       @previous_context = @context
       @context = val
     end
@@ -333,18 +351,35 @@ module KDL
     end
 
     def parse_decimal(s)
-      return token(:FLOAT, Float(munch_underscores(s))) if s =~ /[.eE]/
-      token(:INTEGER, Integer(munch_underscores(s), 10))
+      return parse_float(s) if s =~ /[.E]/i
+
+      token(:INTEGER, Integer(munch_underscores(s), 10), format: '%d')
+    end
+
+    def parse_float(s)
+      match, whole, fraction, exponent = *s.match(/^([-+]?[\d_]+)(?:\.(\d+))?(?:[eE]([-+]?[\d_]+))?$/)
+      raise_error "Invalid floating point value #{s}" if match.nil?
+
+      s = munch_underscores(s)
+
+      decimals = fraction.nil? ? 0 : fraction.size
+      value = Float(s)
+      scientific = value.abs >= 100 || (exponent && exponent.to_i.abs >= 2)
+      if value.infinite? || (value.zero? && exponent.to_i < 0)
+        token(:FLOAT, BigDecimal(s))
+      else
+        token(:FLOAT, value, format: scientific ? "%.#{decimals}E" : nil)
+      end
     end
-    
+
     def parse_hexadecimal(s)
       token(:INTEGER, Integer(munch_underscores(s), 16))
     end
-    
+
     def parse_octal(s)
       token(:INTEGER, Integer(munch_underscores(s), 8))
     end
-    
+
     def parse_binary(s)
       token(:INTEGER, Integer(munch_underscores(s), 2))
     end

data/lib/kdl/value.rb

@@ -1,15 +1,28 @@
 module KDL
   class Value
-    attr_reader :value
+    attr_reader :value, :format, :type
 
-    def initialize(value)
+    def initialize(value, format: nil, type: nil)
       @value = value
+      @format = format
+      @type = type
+    end
+
+    def as_type(type)
+      self.class.new(value, format: format, type: type)
     end
 
     def to_s
+      return stringify_value unless type
+
+      "(#{StringDumper.stringify_identifier type})#{stringify_value}"
+    end
+
+    def stringify_value
+      return format % value if format
+
       value.to_s
     end
-    alias inspect to_s
 
     class Int < Value
       def ==(other)
@@ -21,6 +34,16 @@ module KDL
       def ==(other)
         other.is_a?(Float) && value == other.value
       end
+
+      def stringify_value
+        return super.upcase unless value.is_a?(BigDecimal)
+
+        sign, digits, _, exponent = value.split
+        s = sign.negative? ? '-' : ''
+        s += "#{digits[0]}.#{digits[1..-1]}"
+        s += "E#{exponent.negative? ? '' : '+'}#{exponent - 1}"
+        s
+      end
     end
 
     class Boolean < Value
@@ -30,10 +53,9 @@ module KDL
     end
 
     class String < Value
-      def to_s
-        value.inspect
+      def stringify_value
+        StringDumper.call(value)
       end
-      alias inspect to_s
 
       def ==(other)
         other.is_a?(String) && value == other.value
@@ -41,14 +63,13 @@ module KDL
     end
 
     class NullImpl < Value
-      def initialize
-        super(nil)
+      def initialize(_=nil, format: nil, type: nil)
+        super(nil, type: type)
       end
 
-      def to_s
+      def stringify_value
         "null"
       end
-      alias inspect to_s
 
       def ==(other)
         other.is_a?(NullImpl)

data/lib/kdl/version.rb

@@ -1,3 +1,3 @@
 module KDL
-  VERSION = "0.1.2"
+  VERSION = "1.0.0.rc1"
 end

data/lib/kdl.rb

@@ -3,6 +3,7 @@ require "kdl/tokenizer"
 require "kdl/document"
 require "kdl/value"
 require "kdl/node"
+require "kdl/string_dumper"
 require "kdl/kdl.tab"
 
 module KDL

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kdl
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 1.0.0.rc1
 platform: ruby
 authors:
-- Daniel Smith
+- Danielle Smith
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-02 00:00:00.000000000 Z
+date: 2021-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: racc
@@ -33,12 +33,15 @@ extra_rdoc_files: []
 files:
 - ".github/workflows/ruby.yml"
 - ".gitignore"
+- ".gitmodules"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
+- bin/racc
+- bin/rake
 - bin/setup
 - kdl.gemspec
 - lib/kdl.rb
@@ -46,6 +49,7 @@ files:
 - lib/kdl/kdl.tab.rb
 - lib/kdl/kdl.yy
 - lib/kdl/node.rb
+- lib/kdl/string_dumper.rb
 - lib/kdl/tokenizer.rb
 - lib/kdl/value.rb
 - lib/kdl/version.rb
@@ -54,8 +58,8 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://kdl.dev
-  source_code_uri: https://github.com/jellymann/kdl-rb
-  changelog_uri: https://github.com/jellymann/kdl-rb/releases
+  source_code_uri: https://github.com/danini-the-panini/kdl-rb
+  changelog_uri: https://github.com/danini-the-panini/kdl-rb/releases
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -67,11 +71,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: KDL Document Language