tomlrb 2.0.0 → 2.0.3

data/lib/tomlrb/handler.rb

@@ -13,6 +13,10 @@ module Tomlrb
     end
 
     def set_context(identifiers, is_array_of_tables: false)
+      if identifiers.empty?
+        raise ParseError, 'Array needs a name'
+      end
+
       @current_table = identifiers.dup
       @keys.add_table_key identifiers, is_array_of_tables
       @current = @output
@@ -21,7 +25,6 @@ module Tomlrb
         identifierz.each do |k|
           k = k.to_sym if @symbolize_keys
           if @current[k].is_a?(Array)
-            @current[k] << {} if @current[k].empty?
             @current = @current[k].last
           else
             @current[k] ||= {}
@@ -32,7 +35,6 @@ module Tomlrb
     end
 
     def deal_with_array_of_tables(identifiers, is_array_of_tables)
-      identifiers.map!{|n| n.gsub("\"", '')}
       stringified_identifier = identifiers.join('.')
 
       if is_array_of_tables
@@ -66,6 +68,32 @@ module Tomlrb
       @stack << o
     end
 
+    def push_inline(inline_arrays)
+      merged_inline = {}
+
+      inline_arrays.each do |inline_array|
+        current = merged_inline
+        value = inline_array.pop
+        inline_array.each_with_index do |inline_key, inline_index|
+          inline_key = inline_key.to_sym if @symbolize_keys
+          last_key = inline_index == inline_array.size - 1
+
+          if last_key
+            if current[inline_key].nil?
+              current[inline_key] = value
+            else
+              raise Key::KeyConflict, "Inline key #{inline_key} is already used"
+            end
+          else
+            current[inline_key] ||= {}
+            current = current[inline_key]
+          end
+        end
+      end
+
+      push(merged_inline)
+    end
+
     def start_(type)
       push([type])
     end
@@ -73,16 +101,23 @@ module Tomlrb
     def end_(type)
       array = []
       while (value = @stack.pop) != [type]
-        raise ParseError, 'Unclosed table' if value.nil?
+        raise ParseError, 'Unclosed table' if @stack.empty?
         array.unshift(value)
       end
       array
     end
 
+    def validate_value(value)
+      if value.nil?
+        raise ParseError, 'Value must be present'
+      end
+    end
+
     private
 
     def assign_key_path(current, key, key_emptied)
       if key_emptied
+
         raise ParseError, "Cannot overwrite value with key #{key}" unless current.kind_of?(Hash)
         current[key] = @stack.pop
         return current
@@ -125,6 +160,7 @@ module Tomlrb
         end
       end
 
+      current.clear_children if is_array_of_tables
       current
     end
 
@@ -155,7 +191,7 @@ module Tomlrb
 
     def find_or_create_first_pair_key(current, key, declared, table_keys_empty)
       existed = current[key]
-      if existed && existed.declared? && (existed.type == :pair) && declared && table_keys_empty
+      if existed && (existed.type == :pair) && declared && table_keys_empty
         raise Key::KeyConflict, "Key #{key} is already used"
       end
       k = Key.new(key, :pair, declared)
@@ -191,10 +227,14 @@ module Tomlrb
       @children[key] = existed || self.class.new(key, type, declared)
     end
 
+    def clear_children
+      @children.clear
+    end
+
     private
 
     def validate_already_declared_as_different_key(type, declared, existed)
-      if declared && existed && existed.declared? && existed.type != type
+      if existed && existed.declared? && existed.type != type
         raise KeyConflict, "Key #{existed.key} is already used as #{existed.type} key"
       end
     end

data/lib/tomlrb/local_date.rb

@@ -22,7 +22,7 @@ module Tomlrb
     end
 
     def ==(other)
-      other.respond_to?(:to_time) &&
+      other.kind_of?(self.class) &&
         to_time == other.to_time
     end
 

data/lib/tomlrb/local_date_time.rb

@@ -29,7 +29,7 @@ module Tomlrb
     end
 
     def ==(other)
-      other.respond_to?(:to_time) &&
+      other.kind_of?(self.class) &&
         to_time == other.to_time
     end
 

data/lib/tomlrb/local_time.rb

@@ -27,7 +27,7 @@ module Tomlrb
     end
 
     def ==(other)
-      other.respond_to?(:to_time) &&
+      other.kind_of?(self.class) &&
         @time == other.to_time(0, 1, 1)
     end
 

data/lib/tomlrb/parser.y

@@ -1,5 +1,5 @@
 class Tomlrb::GeneratedParser
-token IDENTIFIER STRING_MULTI STRING_BASIC STRING_LITERAL_MULTI STRING_LITERAL DATETIME LOCAL_DATETIME LOCAL_DATE LOCAL_TIME INTEGER HEX_INTEGER OCT_INTEGER BIN_INTEGER FLOAT FLOAT_INF FLOAT_NAN TRUE FALSE NEWLINE EOS
+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
@@ -12,7 +12,8 @@ rule
     | NEWLINE
     ;
   table
-    : table_start table_continued
+    : table_start table_continued NEWLINE
+    | table_start table_continued EOS
     ;
   table_start
     : '[' '[' { @handler.start_(:array_of_tables) }
@@ -40,16 +41,12 @@ rule
     ;
   table_identifier_component
     : IDENTIFIER
-    | STRING_BASIC
+    | STRING_BASIC { result = StringUtils.replace_escaped_chars(val[0]) }
     | STRING_LITERAL
     | INTEGER
-    | HEX_INTEGER
-    | OCT_INTEGER
-    | BIN_INTEGER
-    | FLOAT_INF
-    | FLOAT_NAN
-    | TRUE
-    | FALSE
+    | NON_DEC_INTEGER
+    | FLOAT_KEYWORD
+    | BOOLEAN
     ;
   inline_table
     : inline_table_start inline_table_end
@@ -61,38 +58,50 @@ rule
   inline_table_end
     : '}' {
       array = @handler.end_(:inline)
-      array.map!.with_index{ |n,i| i.even? ? n.to_sym : n } if @handler.symbolize_keys
-      @handler.push(Hash[*array])
+      @handler.push_inline(array)
     }
     ;
   inline_continued
-    : inline_assignment_key inline_assignment_value
-    | inline_assignment_key inline_assignment_value inline_next
+    : inline_assignment
+    | inline_assignment inline_next
     ;
   inline_next
     : ',' inline_continued
     ;
-  inline_assignment_key
-    : inline_assignment_key '.' IDENTIFIER {
-      array = @handler.end_(:inline)
-      array.each { |key| @handler.push(key) }
-      @handler.start_(:inline)
-      @handler.push(val[2])
+  inline_assignment
+    : inline_assignment_key '=' value {
+      keys = @handler.end_(:inline_keys)
+      @handler.push(keys)
     }
-    | IDENTIFIER { @handler.push(val[0]) }
     ;
-  inline_assignment_value
-    : '=' value
+  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)
-      @handler.push(keys.pop)
+      value = keys.pop
+      @handler.validate_value(value)
+      @handler.push(value)
       @handler.assign(keys)
     }
     | assignment_key '=' value NEWLINE {
       keys = @handler.end_(:keys)
-      @handler.push(keys.pop)
+      value = keys.pop
+      @handler.validate_value(value)
+      @handler.push(value)
       @handler.assign(keys)
     }
     ;
@@ -108,30 +117,25 @@ rule
     ;
   assignment_key_component
     : IDENTIFIER
-    | STRING_BASIC
+    | STRING_BASIC { result = StringUtils.replace_escaped_chars(val[0]) }
     | STRING_LITERAL
     | INTEGER
-    | HEX_INTEGER
-    | OCT_INTEGER
-    | BIN_INTEGER
-    | FLOAT_INF
-    | FLOAT_NAN
-    | TRUE
-    | FALSE
+    | NON_DEC_INTEGER
+    | FLOAT_KEYWORD
+    | BOOLEAN
     ;
   array
     : start_array array_continued
     ;
   array_continued
-    : ']' { array = @handler.end_(:array); @handler.push(array) }
+    : ']' { array = @handler.end_(:array); @handler.push(array.compact) }
     | value array_next
     | NEWLINE array_continued
     ;
   array_next
-    : ']' { array = @handler.end_(:array); @handler.push(array) }
+    : ']' { array = @handler.end_(:array); @handler.push(array.compact) }
     | ',' array_continued
     | NEWLINE array_continued
-    | ',' NEWLINE array_continued
     ;
   start_array
     : '[' { @handler.start_(:array) }
@@ -147,17 +151,41 @@ rule
     ;
   literal
     | FLOAT { result = val[0].to_f }
-    | FLOAT_INF { result = (val[0][0] == '-' ? -1 : 1) * Float::INFINITY }
-    | FLOAT_NAN { result = Float::NAN }
+    | 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 }
-    | HEX_INTEGER { result = val[0].to_i(16) }
-    | OCT_INTEGER { result = val[0].to_i(8) }
-    | BIN_INTEGER { result = val[0].to_i(2) }
-    | TRUE   { result = true }
-    | FALSE  { result = false }
-    | DATETIME { result = Time.new(*val[0])}
-    | LOCAL_DATETIME { result = LocalDateTime.new(*val[0]) }
-    | LOCAL_DATE { result = LocalDate.new(*val[0]) }
+    | 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 {
+      v = val[0]
+      result = if v[6].nil?
+                 if v[4].nil?
+                   LocalDate.new(v[0], v[1], v[2])
+                 else
+                   LocalDateTime.new(v[0], v[1], v[2], v[3] || 0, v[4] || 0, v[5].to_f)
+                 end
+               else
+                 # Patch for 24:00:00 which Ruby parses
+                 if v[3].to_i == 24 && v[4].to_i == 0 && v[5].to_i == 0
+                   v[3] = (v[3].to_i + 1).to_s
+                 end
+
+                 Time.new(v[0], v[1], v[2], v[3] || 0, v[4] || 0, v[5].to_f, v[6])
+               end
+    }
     | LOCAL_TIME { result = LocalTime.new(*val[0]) }
     ;
   string

data/lib/tomlrb/scanner.rb

@@ -5,24 +5,21 @@ module Tomlrb
     COMMENT = /#[^\u0000-\u0008\u000A-\u001F\u007F]*/
     IDENTIFIER = /[A-Za-z0-9_-]+/
     SPACE = /[ \t]/
-    NEWLINE = /(\r?\n)/
+    NEWLINE = /(?:[ \t]*(?:\r?\n)[ \t]*)+/
     STRING_BASIC = /(["])(?:\\?[^\u0000-\u0008\u000A-\u001F\u007F])*?\1/
     STRING_MULTI = /"{3}([^\u0000-\u0008\u000B\u000C\u000E-\u001F\u007F]*?(?<!\\)"{3,5})/m
     STRING_LITERAL = /(['])(?:\\?[^\u0000-\u0008\u000A-\u001F\u007F])*?\1/
     STRING_LITERAL_MULTI = /'{3}([^\u0000-\u0008\u000B\u000C\u000E-\u001F\u007F]*?'{3,5})/m
-    DATETIME = /(-?\d{4})-(\d{2})-(\d{2})(?:(?:t|\s)(\d{2}):(\d{2}):(\d{2}(?:\.\d+)?))?(z|[-+]\d{2}:\d{2})/i
-    LOCAL_DATETIME = /(-?\d{4})-(\d{2})-(\d{2})(?:t|\s)(\d{2}):(\d{2}):(\d{2}(?:\.\d+)?)/i
-    LOCAL_DATE = /(-?\d{4})-(\d{2})-(\d{2})/
+    DATETIME = /(-?\d{4})-(\d{2})-(\d{2})(?:(?:t|\s)(\d{2}):(\d{2}):(\d{2}(?:\.\d+)?))?(z|[-+]\d{2}:\d{2})?/i
     LOCAL_TIME = /(\d{2}):(\d{2}):(\d{2}(?:\.\d+)?)/
-    FLOAT = /[+-]?(?:(?:\d|[1-9](?:_?\d)*)\.\d(?:_?\d)*|\d+(?=[eE]))(?:[eE][+-]?[0-9_]+)?(?!\w)/
-    FLOAT_INF = /[+-]?inf\b/
-    FLOAT_NAN = /[+-]?nan\b/
+    FLOAT = /[+-]?(?:(?:\d|[1-9](?:_?\d)*)\.\d(?:_?\d)*|\d+(?=[eE]))(?:[eE][+-]?[0-9]+(_[0-9])*[0-9]*)?(?!\w)/
+    FLOAT_KEYWORD = /[+-]?(?:inf|nan)\b/
     INTEGER = /[+-]?([1-9](_?\d)*|0)(?![A-Za-z0-9_-]+)/
-    HEX_INTEGER = /0x[0-9A-Fa-f][0-9A-Fa-f_]*/
-    OCT_INTEGER = /0o[0-7][0-7_]*/
-    BIN_INTEGER = /0b[01][01_]*/
-    TRUE   = /true/
-    FALSE  = /false/
+    NON_DEC_INTEGER = /0(?:x[0-9A-Fa-f]+(?:_[0-9A-Fa-f])*[0-9A-Fa-f]*|o[0-7]+(?:_[0-7])*[0-7]*|b[01]+(?:_[01])*[01]*)/
+    BOOLEAN = /true|false/
+    SPACED_ARRAY_OF_TABLES_START = /^\[[ \t]+\[(#{IDENTIFIER}|#{STRING_BASIC}|#{STRING_LITERAL}|#{INTEGER}|#{NON_DEC_INTEGER}|#{FLOAT_KEYWORD}|#{BOOLEAN})\]\]$/
+    SPACED_ARRAY_OF_TABLES_END = /^\[\[(#{IDENTIFIER}|#{STRING_BASIC}|#{STRING_LITERAL}|#{INTEGER}|#{NON_DEC_INTEGER}|#{FLOAT_KEYWORD}|#{BOOLEAN})\][ \t]+\]$/
+    SPACED_ARRAY_OF_TABLES_BOTH = /^\[[ \t]+\[(#{IDENTIFIER}|#{STRING_BASIC}|#{STRING_LITERAL}|#{INTEGER}|#{NON_DEC_INTEGER}|#{FLOAT_KEYWORD}|#{BOOLEAN})\][ \t]+\]$/
 
     def initialize(io)
       @ss = StringScanner.new(io.read)
@@ -31,52 +28,37 @@ module Tomlrb
 
     def next_token
       case
-      when @ss.eos? then process_eos
+      when @ss.scan(NEWLINE) then [:NEWLINE, nil]
+      when @ss.scan(SPACED_ARRAY_OF_TABLES_START) then raise ParseError.new("Array of tables has spaces in starting brackets")
+      when @ss.scan(SPACED_ARRAY_OF_TABLES_END) then raise ParseError.new("Array of tables has spaces in ending brackets")
+      when @ss.scan(SPACED_ARRAY_OF_TABLES_BOTH) then raise ParseError.new("Array of tables has spaces in starting and ending brackets")
       when @ss.scan(SPACE) then next_token
       when @ss.scan(COMMENT) then next_token
       when @ss.scan(DATETIME) then process_datetime
-      when @ss.scan(LOCAL_DATETIME) then process_local_datetime
-      when @ss.scan(LOCAL_DATE) then process_local_date
       when @ss.scan(LOCAL_TIME) then process_local_time
       when text = @ss.scan(STRING_MULTI) then [:STRING_MULTI, text[3..-4]]
       when text = @ss.scan(STRING_BASIC) then [:STRING_BASIC, text[1..-2]]
       when text = @ss.scan(STRING_LITERAL_MULTI) then [:STRING_LITERAL_MULTI, text[3..-4]]
       when text = @ss.scan(STRING_LITERAL) then [:STRING_LITERAL, text[1..-2]]
       when text = @ss.scan(FLOAT) then [:FLOAT, text]
-      when text = @ss.scan(FLOAT_INF) then [:FLOAT_INF, text]
-      when text = @ss.scan(FLOAT_NAN) then [:FLOAT_NAN, text]
+      when text = @ss.scan(FLOAT_KEYWORD) then [:FLOAT_KEYWORD, text]
       when text = @ss.scan(INTEGER) then [:INTEGER, text]
-      when text = @ss.scan(HEX_INTEGER) then [:HEX_INTEGER, text]
-      when text = @ss.scan(OCT_INTEGER) then [:OCT_INTEGER, text]
-      when text = @ss.scan(BIN_INTEGER) then [:BIN_INTEGER, text]
-      when text = @ss.scan(TRUE)   then [:TRUE, text]
-      when text = @ss.scan(FALSE)  then [:FALSE, text]
-      when text = @ss.scan(NEWLINE) then [:NEWLINE, text]
+      when text = @ss.scan(NON_DEC_INTEGER) then [:NON_DEC_INTEGER, text]
+      when text = @ss.scan(BOOLEAN) then [:BOOLEAN, text]
       when text = @ss.scan(IDENTIFIER) then [:IDENTIFIER, text]
+      when @ss.eos? then process_eos
       else x = @ss.getch; [x, x]
       end
     end
 
     def process_datetime
-      if @ss[7].nil?
-        offset = '+00:00'
-      else
-        offset = @ss[7].gsub('Z', '+00:00')
+      if @ss[7]
+        offset = @ss[7].gsub(/[zZ]/, '+00:00')
       end
-      args = [@ss[1], @ss[2], @ss[3], @ss[4] || 0, @ss[5] || 0, @ss[6].to_f, offset]
+      args = [@ss[1], @ss[2], @ss[3], @ss[4], @ss[5], @ss[6], offset]
       [:DATETIME, args]
     end
 
-    def process_local_datetime
-      args = [@ss[1], @ss[2], @ss[3], @ss[4] || 0, @ss[5] || 0, @ss[6].to_f]
-      [:LOCAL_DATETIME, args]
-    end
-
-    def process_local_date
-      args = [@ss[1], @ss[2], @ss[3]]
-      [:LOCAL_DATE, args]
-    end
-
     def process_local_time
       args = [@ss[1], @ss[2], @ss[3].to_f]
       [:LOCAL_TIME, args]

data/lib/tomlrb/version.rb

@@ -1,3 +1,3 @@
 module Tomlrb
-  VERSION = '2.0.0'.freeze
+  VERSION = '2.0.3'.freeze
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: tomlrb
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.3
 platform: ruby
 authors:
 - Francois Bernier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-25 00:00:00.000000000 Z
-dependencies: []
+date: 2022-05-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: psych
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4'
 description: A racc based toml parser
 email:
 - frankbernier@gmail.com
@@ -48,7 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: A racc based toml parser