tomlrb 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79334a64c6114d7a83fd6446645fa3f83f5995fc92bb6e51c12579ea20846c8a
-  data.tar.gz: 007e015700fe6a9e739ba29d3840125c1ab859ed9039329843444cf5f4a735a1
+  metadata.gz: aec8269e8038829c92db82e6e8c07d46f59ddf59e8b8f5efc71f32194d51ebe9
+  data.tar.gz: 935417690ae25dac4908969541c04104d6cf6f038158031e0990889c48401485
 SHA512:
-  metadata.gz: 6b5090126db023bb2182a4dfd724d56c8f6cf9db33f775de2dedb14aaf4dca5844a4b00211bda3c8cecf68296e778dbe18be4e68486f112113f4dd2a4720df05
-  data.tar.gz: 5816f7c67269a251e71c37a4202f549b0356dcbfd5746ead8203638be1bbc9984a5847b167c225582ada7025f62d51bde71fce5742fa20d6f3762a1d7393730f
+  metadata.gz: ef69a2e4e0fecc696b3a32f9ead5189d95d5a189f7fae3bd882d61686a4b9379af88289a4466174a850b5ec92c7ad5e0fb5cd394e1659356dbfe461e399a1613
+  data.tar.gz: df31d0060e144acf8c62d11e6af76d014042b50d29ee5e2d874bd15670e8151821a3b37fa2f95f3ad6e527dcbf33da638f4dc7a4e99a6377f1bdd1e94b919449

data/lib/tomlrb/scanner.rb

@@ -9,15 +9,15 @@ module Tomlrb
     IDENTIFIER =
       /[A-Za-z0-9_-]+/.freeze
     SPACE =
-      /[ \t]/.freeze
+      /[ \t]+/.freeze
     NEWLINE =
       /(?:[ \t]*(?:\r?\n)[ \t]*)+/.freeze
     STRING_BASIC =
-      /(")(?:\\?[^\u0000-\u0008\u000A-\u001F\u007F\\]|(?:\\[^\u0000-\u0008\u000A-\u001F\u007F]))*?\1/.freeze
+      /"(?:[^\u0000-\u0008\u000A-\u001F\u007F"\\]|\\[^\u0000-\u0008\u000A-\u001F\u007F])*"/.freeze
     STRING_MULTI =
       /"{3}([^\u0000-\u0008\u000B\u000C\u000E-\u001F\u007F]*?(?<!\\)"{3,5})/m.freeze
     STRING_LITERAL =
-      /(')(?:\\?[^\u0000-\u0008\u000A-\u001F\u007F])*?\1/.freeze
+      /'[^\u0000-\u0008\u000A-\u001F\u007F']*'/.freeze
     STRING_LITERAL_MULTI =
       /'{3}([^\u0000-\u0008\u000B\u000C\u000E-\u001F\u007F]*?'{3,5})/m.freeze
     DATETIME =

data/lib/tomlrb/version.rb

@@ -1,5 +1,5 @@
 # frozen-string-literal: true
 
 module Tomlrb
-  VERSION = '2.0.4'
+  VERSION = '2.0.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tomlrb
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Francois Bernier
@@ -10,19 +10,19 @@ cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: psych
+  name: racc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
-  type: :development
+        version: '1.4'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '1.4'
 description: A racc based toml parser
 email:
 - frankbernier@gmail.com
@@ -38,7 +38,6 @@ files:
 - lib/tomlrb/local_date_time.rb
 - lib/tomlrb/local_time.rb
 - lib/tomlrb/parser.rb
-- lib/tomlrb/parser.y
 - lib/tomlrb/scanner.rb
 - lib/tomlrb/string_utils.rb
 - lib/tomlrb/version.rb
@@ -60,7 +59,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.20
 specification_version: 4
 summary: A racc based toml parser
 test_files: []

data/lib/tomlrb/parser.y

@@ -1,230 +0,0 @@
-class Tomlrb::GeneratedParser
-token IDENTIFIER STRING_MULTI STRING_BASIC STRING_LITERAL_MULTI STRING_LITERAL DATETIME LOCAL_TIME INTEGER NON_DEC_INTEGER FLOAT FLOAT_KEYWORD BOOLEAN NEWLINE EOS
-rule
-  expressions
-    | expressions expression
-    | expressions EOS
-    ;
-  expression
-    : table
-    | assignment
-    | inline_table
-    | NEWLINE
-    ;
-  table
-    : table_start table_identifier table_end newlines
-    | table_start table_identifier table_end EOS
-    | table_start table_end newlines
-    | table_start table_end EOS
-    ;
-  table_start
-    : '[' '[' { @handler.start_(:array_of_tables) }
-    | '[' { @handler.start_(:table) }
-    ;
-    ;
-  table_end
-    : ']' ']' { array = @handler.end_(:array_of_tables); @handler.set_context(array, is_array_of_tables: true) }
-    | ']' { array = @handler.end_(:table); @handler.set_context(array) }
-    ;
-  table_identifier
-    : table_identifier '.' table_identifier_component { @handler.push(val[2]) }
-    | table_identifier '.' FLOAT { val[2].split('.').each { |k| @handler.push(k) } }
-    | FLOAT {
-      keys = val[0].split('.')
-      @handler.start_(:table)
-      keys.each { |key| @handler.push(key) }
-    }
-    | table_identifier_component { @handler.push(val[0]) }
-    ;
-  table_identifier_component
-    : IDENTIFIER
-    | STRING_BASIC { result = StringUtils.replace_escaped_chars(val[0]) }
-    | STRING_LITERAL
-    | INTEGER
-    | NON_DEC_INTEGER
-    | FLOAT_KEYWORD
-    | BOOLEAN
-    | DATETIME { result = val[0][0] }
-    | LOCAL_TIME { result = val[0][0] }
-    ;
-  inline_table
-    : inline_table_start inline_table_end
-    | inline_table_start inline_continued inline_table_end
-    ;
-  inline_table_start
-    : '{' { @handler.start_(:inline) }
-    ;
-  inline_table_end
-    : '}' {
-      array = @handler.end_(:inline)
-      @handler.push_inline(array)
-    }
-    ;
-  inline_continued
-    : inline_assignment
-    | inline_assignment inline_next
-    ;
-  inline_next
-    : ',' inline_continued
-    ;
-  inline_assignment
-    : inline_assignment_key '=' value {
-      keys = @handler.end_(:inline_keys)
-      @handler.push(keys)
-    }
-    ;
-  inline_assignment_key
-    : inline_assignment_key '.' assignment_key_component { 
-      @handler.push(val[2]) 
-    }
-    | inline_assignment_key '.' FLOAT { val[2].split('.').each { |k| @handler.push(k) } }
-    | FLOAT {
-      keys = val[0].split('.')
-      @handler.start_(:inline_keys)
-      keys.each { |key| @handler.push(key) }
-    }
-    | assignment_key_component { 
-      @handler.start_(:inline_keys) 
-      @handler.push(val[0]) 
-    }
-    ;
-  assignment
-    : assignment_key '=' value EOS {
-      keys = @handler.end_(:keys)
-      value = keys.pop
-      @handler.validate_value(value)
-      @handler.push(value)
-      @handler.assign(keys)
-    }
-    | assignment_key '=' value NEWLINE {
-      keys = @handler.end_(:keys)
-      value = keys.pop
-      @handler.validate_value(value)
-      @handler.push(value)
-      @handler.assign(keys)
-    }
-    ;
-  assignment_key
-    : assignment_key '.' assignment_key_component { @handler.push(val[2]) }
-    | assignment_key '.' FLOAT { val[2].split('.').each { |k| @handler.push(k) } }
-    | FLOAT {
-      keys = val[0].split('.')
-      @handler.start_(:keys)
-      keys.each { |key| @handler.push(key) }
-    }
-    | assignment_key_component { @handler.start_(:keys); @handler.push(val[0]) }
-    ;
-  assignment_key_component
-    : IDENTIFIER
-    | STRING_BASIC { result = StringUtils.replace_escaped_chars(val[0]) }
-    | STRING_LITERAL
-    | INTEGER
-    | NON_DEC_INTEGER
-    | FLOAT_KEYWORD
-    | BOOLEAN
-    | DATETIME { result = val[0][0] }
-    | LOCAL_TIME { result = val[0][0] }
-    ;
-  array
-    : start_array array_first_value array_values comma end_array
-    | start_array array_first_value array_values end_array
-    | start_array array_first_value comma end_array
-    | start_array array_first_value end_array
-    | start_array end_array
-    ;
-  array_first_value
-    : newlines non_nil_value
-    | non_nil_value
-    ;
-  array_values
-    : array_values array_value
-    | array_value
-    ;
-  array_value
-    : comma newlines non_nil_value
-    | comma non_nil_value
-    ;
-  start_array
-    : '[' { @handler.start_(:array) }
-    ;
-  end_array
-    : newlines ']' { array = @handler.end_(:array); @handler.push(array.compact) }
-    | ']' { array = @handler.end_(:array); @handler.push(array.compact) }
-    ;
-  comma
-    : newlines ','
-    | ','
-    ;
-  newlines
-    : newlines NEWLINE
-    | NEWLINE
-    ;
-  value
-    : scalar { @handler.push(val[0]) }
-    | array
-    | inline_table
-    ;
-  non_nil_value
-    : non_nil_scalar { @handler.push(val[0]) }
-    | array
-    | inline_table
-    ;
-  scalar
-    : string
-    | literal
-    ;
-  non_nil_scalar
-    : string
-    | non_nil_literal
-    ;
-  literal
-    | non_nil_literal
-    ;
-  non_nil_literal
-    : FLOAT { result = val[0].to_f }
-    | FLOAT_KEYWORD {
-      v = val[0]
-      result = if v.end_with?('nan')
-                 Float::NAN
-               else
-                 (v[0] == '-' ? -1 : 1) * Float::INFINITY
-               end
-    }
-    | INTEGER { result = val[0].to_i }
-    | NON_DEC_INTEGER {
-      base = case val[0][1]
-             when 'x' then 16
-             when 'o' then 8
-             when 'b' then 2
-             end
-      result = val[0].to_i(base)
-    }
-    | BOOLEAN { result = val[0] == 'true' ? true : false }
-    | DATETIME {
-      _str, year, month, day, hour, min, sec, offset = val[0]
-      result = if offset.nil?
-                 if hour.nil?
-                   LocalDate.new(year, month, day)
-                 else
-                   LocalDateTime.new(year, month, day, hour, min || 0, sec.to_f)
-                 end
-               else
-                 # Patch for 24:00:00 which Ruby parses
-                 if hour.to_i == 24 && min.to_i == 0 && sec.to_i == 0
-                   hour = (hour.to_i + 1).to_s
-                 end
-
-                 time = Time.new(year, month, day, hour || 0, min || 0, sec.to_f, offset)
-                 # Should be out of parser.y?
-                 raise ArgumentError, "Invalid Offset Date-Time: #{year}-#{month}-#{day}T#{hour}:#{min}:#{sec}#{offset}" unless min.to_i == time.min && hour.to_i == time.hour && day.to_i == time.day && month.to_i == time.month && year.to_i == time.year
-                 time
-               end
-    }
-    | LOCAL_TIME { result = LocalTime.new(*val[0][1..-1]) }
-    ;
-  string
-    : STRING_MULTI { result = StringUtils.replace_escaped_chars(StringUtils.multiline_replacements(val[0])) }
-    | STRING_BASIC { result = StringUtils.replace_escaped_chars(val[0]) }
-    | STRING_LITERAL_MULTI { result = StringUtils.strip_spaces(val[0]) }
-    | STRING_LITERAL { result = val[0] }
-    ;