tomlrb 0.1.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 964937589a25e9d489b243ba7f3edcab01457109
-  data.tar.gz: d08b833542655d0a081ef58d0dc806d1de26d0c8
+  metadata.gz: 0fb32099921d6d4cabb4f18af23ced18a1549769
+  data.tar.gz: 08adb1404068e0d263cfd71e4381306b6c74bbfd
 SHA512:
-  metadata.gz: cfc1badba22d110b9f11d03900bff83b0e65adbba81c8242d714a26649caefdae7719fe10e086f7aa7c96283f493a56675363678c94d278bef8547b3fd23c70a
-  data.tar.gz: 4e8b36708b34f8781aab4d70aab87d4642ae553b6e430b7f35ac193b9cdc2a409e2f83d5bf45e6a99634c0cadfb3c02bb1d5c5c1d1180c2af337fccc7436ef14
+  metadata.gz: 8241b67862dac85836e6b4502c5acc143bc735ae0a4bc8921c51f77817494a9f62e2bba5b2b9be564d0a3dcca29e2099062fbd03b36a3148aa661e127c6dbdc9
+  data.tar.gz: 1aa537c52381ee9bdca4ccfa7b4be8ec364e2483b8f1c355cc73b7eccabb75e14547b4e1b95d51e268c0c9c9cc84e7d435093bc7d10dfca59c67087cf934f9ec

data/.travis.yml

@@ -1,3 +1,5 @@
 language: ruby
+before_install:
+  - gem install bundler
 rvm:
   - 2.2.1

data/README.md

@@ -1,6 +1,14 @@
 # Tomlrb
 
-A racc based [toml](https://github.com/toml-lang/toml) parser. It's still a work in progress so it doesn't support the full spec yet.
+[![Code Climate](https://codeclimate.com/github/fbernier/tomlrb/badges/gpa.svg)](https://codeclimate.com/github/fbernier/tomlrb) [![Build Status](https://travis-ci.org/fbernier/tomlrb.svg)](https://travis-ci.org/fbernier/tomlrb)
+
+A Racc based [TOML](https://github.com/toml-lang/toml) parser supporting the 0.4.0 version of the spec.
+
+
+## TODO
+
+* Better tests
+* Dumper
 
 ## Installation
 
@@ -24,6 +32,12 @@ Or install it yourself as:
 Tomlrb.parse("[toml]\na = [\"array\", 123]")
 ```
 
+or
+
+```ruby
+Tomlrb.load_file('my_file')
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/console` for an interactive prompt that will allow you to experiment.
@@ -37,3 +51,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create a new Pull Request
+
+### Thanks
+
+Thanks to [@jpbougie](https://github.com/jpbougie) for the crash course on  the Chomsky hierarchy and general tips.

data/lib/tomlrb/generated_parser.rb

@@ -10,91 +10,148 @@ module Tomlrb
 ##### State transition tables begin ###
 
 racc_action_table = [
-     8,     7,     7,    30,    31,     7,    11,     5,     5,    25,
-    24,    21,    22,    23,    15,    27,    25,    24,    21,    22,
-    23,    15,    27,    25,    24,    21,    22,    23,    15,    12,
-    13 ]
+    12,    19,    10,    23,    11,    23,    29,    30,    10,    17,
+    11,    18,     7,    54,    55,     9,    24,    21,     7,    21,
+    15,     9,    46,    47,    48,    49,    45,    42,    41,    43,
+    44,    35,    25,    26,     9,    46,    47,    48,    49,    45,
+    42,    41,    43,    44,    35,    27,    32,     9,    46,    47,
+    48,    49,    45,    42,    41,    43,    44,    35,    51,   nil,
+     9,    46,    47,    48,    49,    45,    42,    41,    43,    44,
+    35,    58,   nil,     9,    46,    47,    48,    49,    45,    42,
+    41,    43,    44,    35,    58,    17,     9,    18,    62,   nil,
+   nil,   nil,    63,   nil,   nil,   nil,    15 ]
 
 racc_action_check = [
-     1,     0,     1,    28,    28,     5,     6,     0,     1,    14,
-    14,    14,    14,    14,    14,    14,    31,    31,    31,    31,
-    31,    31,    31,    11,    11,    11,    11,    11,    11,     8,
-    10 ]
+     1,     7,     1,     8,     1,    55,    16,    16,     0,     6,
+     0,     6,     1,    31,    31,     1,    10,     8,     0,    55,
+     6,     0,    24,    24,    24,    24,    24,    24,    24,    24,
+    24,    24,    11,    12,    24,    25,    25,    25,    25,    25,
+    25,    25,    25,    25,    25,    15,    22,    25,    32,    32,
+    32,    32,    32,    32,    32,    32,    32,    32,    29,   nil,
+    32,    34,    34,    34,    34,    34,    34,    34,    34,    34,
+    34,    34,   nil,    34,    63,    63,    63,    63,    63,    63,
+    63,    63,    63,    63,    63,    30,    63,    30,    59,   nil,
+   nil,   nil,    59,   nil,   nil,   nil,    30 ]
 
 racc_action_pointer = [
-    -1,     0,   nil,   nil,   nil,     3,    -5,   nil,    29,   nil,
-    21,    20,   nil,   nil,     6,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    -6,   nil,
-   nil,    13,   nil ]
+     6,     0,   nil,   nil,   nil,   nil,     7,   -11,     1,   nil,
+    -2,    14,    33,   nil,   nil,    32,    -7,   nil,   nil,   nil,
+   nil,   nil,    28,   nil,    19,    32,   nil,   nil,   nil,    45,
+    83,    -3,    45,   nil,    58,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,     3,   nil,   nil,   nil,    75,
+   nil,   nil,   nil,    71,   nil ]
 
 racc_action_default = [
-   -25,   -25,    -2,    -3,    -4,   -25,   -25,   -24,   -25,    -1,
-   -25,   -18,    33,    -5,   -18,   -11,   -13,   -14,   -15,   -16,
-   -17,   -19,   -20,   -21,   -22,   -23,    -6,    -7,   -25,    -8,
-    -9,   -18,   -10 ]
+   -49,   -49,    -2,    -3,    -4,    -5,   -49,    -8,   -49,   -18,
+   -49,   -49,   -49,    -1,    -6,   -10,   -49,   -15,   -16,    -7,
+   -17,   -19,   -49,   -23,   -39,   -39,    65,    -9,   -11,   -13,
+   -49,   -49,   -39,   -25,   -39,   -32,   -34,   -35,   -36,   -37,
+   -38,   -40,   -41,   -42,   -43,   -44,   -45,   -46,   -47,   -48,
+   -26,   -12,   -14,   -20,   -21,   -49,   -24,   -27,   -28,   -49,
+   -22,   -29,   -30,   -39,   -31 ]
 
 racc_goto_table = [
-    26,     2,     9,     1,    10,    16,    29,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,    32 ]
+    20,    57,    14,    33,    50,     2,    13,     5,     5,     1,
+    28,    56,    31,    53,    61,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    52,   nil,   nil,   nil,
+    64,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    60 ]
 
 racc_goto_check = [
-     8,     2,     2,     1,     5,     9,    10,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,     8 ]
+    11,    18,     7,    15,    15,     2,     2,     5,     5,     1,
+     9,    15,    13,    14,    19,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,     7,   nil,   nil,   nil,
+    18,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    11 ]
 
 racc_goto_pointer = [
-   nil,     3,     1,   nil,   nil,    -1,   nil,   nil,   -14,    -6,
-   -22,   nil,   nil,   nil,   nil ]
+   nil,     9,     5,   nil,   nil,     7,   nil,    -4,   nil,    -6,
+   nil,    -8,   nil,   -10,   -18,   -21,   nil,   nil,   -33,   -45,
+   nil,   nil,   nil,   nil ]
 
 racc_goto_default = [
-   nil,   nil,   nil,     3,     4,     6,    18,    14,   nil,    28,
-   nil,   nil,    17,    19,    20 ]
+   nil,   nil,   nil,     3,     4,    38,     6,   nil,    16,   nil,
+     8,   nil,    22,   nil,   nil,    59,    37,    34,   nil,   nil,
+   nil,    36,    39,    40 ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
-  2, 13, :_reduce_none,
-  1, 13, :_reduce_none,
-  1, 14, :_reduce_none,
-  1, 14, :_reduce_none,
-  3, 15, :_reduce_5,
-  2, 18, :_reduce_none,
-  1, 20, :_reduce_7,
   2, 20, :_reduce_none,
-  1, 22, :_reduce_9,
-  2, 22, :_reduce_none,
-  1, 19, :_reduce_11,
-  1, 23, :_reduce_none,
-  3, 16, :_reduce_13,
-  1, 21, :_reduce_14,
+  1, 20, :_reduce_none,
   1, 21, :_reduce_none,
-  1, 24, :_reduce_none,
-  1, 24, :_reduce_none,
-  0, 26, :_reduce_none,
-  1, 26, :_reduce_19,
-  1, 26, :_reduce_20,
-  1, 26, :_reduce_21,
-  1, 26, :_reduce_none,
-  1, 25, :_reduce_none,
-  1, 17, :_reduce_none ]
-
-racc_reduce_n = 25
-
-racc_shift_n = 33
+  1, 21, :_reduce_none,
+  1, 21, :_reduce_none,
+  2, 22, :_reduce_none,
+  2, 25, :_reduce_7,
+  1, 25, :_reduce_8,
+  2, 26, :_reduce_9,
+  1, 26, :_reduce_10,
+  2, 26, :_reduce_none,
+  2, 28, :_reduce_12,
+  1, 28, :_reduce_13,
+  2, 28, :_reduce_none,
+  1, 27, :_reduce_15,
+  1, 27, :_reduce_16,
+  2, 24, :_reduce_none,
+  1, 29, :_reduce_18,
+  1, 30, :_reduce_19,
+  3, 30, :_reduce_none,
+  1, 33, :_reduce_21,
+  2, 33, :_reduce_none,
+  1, 31, :_reduce_23,
+  2, 32, :_reduce_none,
+  3, 23, :_reduce_25,
+  3, 23, :_reduce_26,
+  2, 35, :_reduce_none,
+  1, 37, :_reduce_28,
+  2, 37, :_reduce_none,
+  1, 38, :_reduce_30,
+  2, 38, :_reduce_none,
+  1, 36, :_reduce_32,
+  1, 39, :_reduce_none,
+  1, 34, :_reduce_34,
+  1, 34, :_reduce_none,
+  1, 34, :_reduce_none,
+  1, 40, :_reduce_none,
+  1, 40, :_reduce_none,
+  0, 42, :_reduce_none,
+  1, 42, :_reduce_40,
+  1, 42, :_reduce_41,
+  1, 42, :_reduce_42,
+  1, 42, :_reduce_43,
+  1, 42, :_reduce_44,
+  1, 41, :_reduce_45,
+  1, 41, :_reduce_46,
+  1, 41, :_reduce_47,
+  1, 41, :_reduce_48 ]
+
+racc_reduce_n = 49
+
+racc_shift_n = 65
 
 racc_token_table = {
   false => 0,
   :error => 1,
   :IDENTIFIER => 2,
-  :STRING => 3,
-  :DATETIME => 4,
-  :NUMBER => 5,
-  :TRUE => 6,
-  :FALSE => 7,
-  "[" => 8,
-  "]" => 9,
-  "," => 10,
-  "=" => 11 }
-
-racc_nt_base = 12
+  :STRING_MULTI => 3,
+  :STRING_BASIC => 4,
+  :STRING_LITERAL_MULTI => 5,
+  :STRING_LITERAL => 6,
+  :DATETIME => 7,
+  :INTEGER => 8,
+  :FLOAT => 9,
+  :TRUE => 10,
+  :FALSE => 11,
+  "[" => 12,
+  "]" => 13,
+  "." => 14,
+  "{" => 15,
+  "}" => 16,
+  "," => 17,
+  "=" => 18 }
+
+racc_nt_base = 19
 
 racc_use_result_var = true
 
@@ -118,13 +175,20 @@ Racc_token_to_s_table = [
   "$end",
   "error",
   "IDENTIFIER",
-  "STRING",
+  "STRING_MULTI",
+  "STRING_BASIC",
+  "STRING_LITERAL_MULTI",
+  "STRING_LITERAL",
   "DATETIME",
-  "NUMBER",
+  "INTEGER",
+  "FLOAT",
   "TRUE",
   "FALSE",
   "\"[\"",
   "\"]\"",
+  "\".\"",
+  "\"{\"",
+  "\"}\"",
   "\",\"",
   "\"=\"",
   "$start",
@@ -132,11 +196,20 @@ Racc_token_to_s_table = [
   "expression",
   "table",
   "assignment",
-  "identifier",
+  "inline_table",
+  "table_start",
+  "table_continued",
+  "table_identifier",
+  "table_next",
+  "inline_table_start",
+  "inline_continued",
+  "inline_assignment_key",
+  "inline_assignment_value",
+  "inline_next",
+  "value",
   "array",
   "start_array",
   "array_continued",
-  "value",
   "array_next",
   "end_array",
   "scalar",
@@ -157,90 +230,228 @@ Racc_debug_parser = false
 
 # reduce 4 omitted
 
-module_eval(<<'.,.,', 'parser.y', 14)
-  def _reduce_5(val, _values, result)
-     @handler.set_context(val[1]) 
-    result
-  end
-.,.,
+# reduce 5 omitted
 
 # reduce 6 omitted
 
-module_eval(<<'.,.,', 'parser.y', 21)
+module_eval(<<'.,.,', 'parser.y', 16)
   def _reduce_7(val, _values, result)
-     @handler.end_array 
+     @handler.start_(:array_of_tables) 
     result
   end
 .,.,
 
-# reduce 8 omitted
+module_eval(<<'.,.,', 'parser.y', 17)
+  def _reduce_8(val, _values, result)
+     @handler.start_(:table) 
+    result
+  end
+.,.,
 
-module_eval(<<'.,.,', 'parser.y', 23)
+module_eval(<<'.,.,', 'parser.y', 20)
   def _reduce_9(val, _values, result)
-     @handler.end_array 
+     array = @handler.end_(:array_of_tables); @handler.set_context(array, is_array_of_tables: true) 
     result
   end
 .,.,
 
-# reduce 10 omitted
+module_eval(<<'.,.,', 'parser.y', 21)
+  def _reduce_10(val, _values, result)
+     array = @handler.end_(:table); @handler.set_context(array) 
+    result
+  end
+.,.,
+
+# reduce 11 omitted
+
+module_eval(<<'.,.,', 'parser.y', 25)
+  def _reduce_12(val, _values, result)
+     array = @handler.end_(:array_of_tables); @handler.set_context(array, is_array_of_tables: true) 
+    result
+  end
+.,.,
 
 module_eval(<<'.,.,', 'parser.y', 26)
-  def _reduce_11(val, _values, result)
-     @handler.start_array 
+  def _reduce_13(val, _values, result)
+     array = @handler.end_(:table); @handler.set_context(array) 
     result
   end
 .,.,
 
-# reduce 12 omitted
+# reduce 14 omitted
 
 module_eval(<<'.,.,', 'parser.y', 30)
-  def _reduce_13(val, _values, result)
-     @handler.assign(val[0]) 
+  def _reduce_15(val, _values, result)
+     @handler.push(val[0]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 34)
-  def _reduce_14(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 31)
+  def _reduce_16(val, _values, result)
      @handler.push(val[0]) 
     result
   end
 .,.,
 
-# reduce 15 omitted
+# reduce 17 omitted
 
-# reduce 16 omitted
+module_eval(<<'.,.,', 'parser.y', 37)
+  def _reduce_18(val, _values, result)
+     @handler.start_(:inline) 
+    result
+  end
+.,.,
 
-# reduce 17 omitted
+module_eval(<<'.,.,', 'parser.y', 40)
+  def _reduce_19(val, _values, result)
+     array = @handler.end_(:inline); @handler.push(Hash[*array]) 
+    result
+  end
+.,.,
 
-# reduce 18 omitted
+# reduce 20 omitted
 
 module_eval(<<'.,.,', 'parser.y', 44)
-  def _reduce_19(val, _values, result)
-     n = val[0]; result = n.count('.') > 0 ? n.to_f : n.to_i 
+  def _reduce_21(val, _values, result)
+     array = @handler.end_(:inline); @handler.push(Hash[*array]) 
+    result
+  end
+.,.,
+
+# reduce 22 omitted
+
+module_eval(<<'.,.,', 'parser.y', 48)
+  def _reduce_23(val, _values, result)
+     @handler.push(val[0]) 
+    result
+  end
+.,.,
+
+# reduce 24 omitted
+
+module_eval(<<'.,.,', 'parser.y', 54)
+  def _reduce_25(val, _values, result)
+     @handler.assign(val[0]) 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 55)
+  def _reduce_26(val, _values, result)
+     @handler.assign(val[0]) 
+    result
+  end
+.,.,
+
+# reduce 27 omitted
+
+module_eval(<<'.,.,', 'parser.y', 61)
+  def _reduce_28(val, _values, result)
+     array = @handler.end_(:array); @handler.push(array) 
+    result
+  end
+.,.,
+
+# reduce 29 omitted
+
+module_eval(<<'.,.,', 'parser.y', 65)
+  def _reduce_30(val, _values, result)
+     array = @handler.end_(:array); @handler.push(array) 
+    result
+  end
+.,.,
+
+# reduce 31 omitted
+
+module_eval(<<'.,.,', 'parser.y', 69)
+  def _reduce_32(val, _values, result)
+     @handler.start_(:array) 
+    result
+  end
+.,.,
+
+# reduce 33 omitted
+
+module_eval(<<'.,.,', 'parser.y', 75)
+  def _reduce_34(val, _values, result)
+     @handler.push(val[0]) 
+    result
+  end
+.,.,
+
+# reduce 35 omitted
+
+# reduce 36 omitted
+
+# reduce 37 omitted
+
+# reduce 38 omitted
+
+# reduce 39 omitted
+
+module_eval(<<'.,.,', 'parser.y', 84)
+  def _reduce_40(val, _values, result)
+     result = val[0].to_f 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 85)
+  def _reduce_41(val, _values, result)
+     result = val[0].to_i 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 45)
-  def _reduce_20(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 86)
+  def _reduce_42(val, _values, result)
      result = true 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 46)
-  def _reduce_21(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 87)
+  def _reduce_43(val, _values, result)
      result = false 
     result
   end
 .,.,
 
-# reduce 22 omitted
+module_eval(<<'.,.,', 'parser.y', 88)
+  def _reduce_44(val, _values, result)
+     result = Time.parse(val[0]) 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 91)
+  def _reduce_45(val, _values, result)
+     result = StringUtils.replace_escaped_chars(StringUtils.multiline_replacements(val[0])) 
+    result
+  end
+.,.,
 
-# reduce 23 omitted
+module_eval(<<'.,.,', 'parser.y', 92)
+  def _reduce_46(val, _values, result)
+     result = StringUtils.replace_escaped_chars(val[0]) 
+    result
+  end
+.,.,
 
-# reduce 24 omitted
+module_eval(<<'.,.,', 'parser.y', 93)
+  def _reduce_47(val, _values, result)
+     result = StringUtils.replace_escaped_chars(StringUtils.strip_spaces(val[0])) 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 94)
+  def _reduce_48(val, _values, result)
+     result = StringUtils.strip_spaces(val[0]) 
+    result
+  end
+.,.,
 
 def _reduce_none(val, _values, result)
   val[0]

data/lib/tomlrb/handler.rb

@@ -1,42 +1,61 @@
 module Tomlrb
   class Handler
-    attr_reader :stack
+    attr_reader :output
 
     def initialize
-      @output = Hash.new {|h, k| h[k] = {} }
+      @output = {}
       @current = @output
       @stack = []
     end
 
-    def set_context(name)
-      @current = @output[name]
-      @context = name
-    end
+    def set_context(identifierz, is_array_of_tables: false)
+      @current = @output
 
-    def assign(k)
-      @current[k] = @stack.pop
+      deal_with_array_of_table(identifierz, is_array_of_tables) do |identifiers|
+        identifiers.each do |k|
+          if @current[k].is_a?(Array)
+            @current[k] << {} if @current[k].empty?
+            @current = @current[k].last
+          else
+            @current[k] ||= {}
+            @current = @current[k]
+          end
+        end
+      end
     end
 
-    def start_array
-      push [:array]
-    end
+    def deal_with_array_of_table(identifiers, is_array_of_tables)
+      identifiers.map!{|n| n.gsub("\"", '')}
+      last_identifier = identifiers.pop if is_array_of_tables
 
-    def end_array
-      array = []
-      while (value = @stack.pop) != [:array]
-        raise if value.nil?
-        array.unshift(value)
+      yield(identifiers)
+
+      if is_array_of_tables
+        @current[last_identifier] ||= []
+        @current[last_identifier] << {}
+        @current = @current[last_identifier].last
       end
-      push(array)
+    end
+
+    def assign(k)
+      @current[k] = @stack.pop
     end
 
     def push(o)
       @stack << o
     end
 
-    def result
-      @output
+    def start_(type)
+      push([type])
     end
 
+    def end_(type)
+      array = []
+      while (value = @stack.pop) != [type]
+        raise if value.nil?
+        array.unshift(value)
+      end
+      array
+    end
   end
 end

data/lib/tomlrb/parser.rb

@@ -1,10 +1,10 @@
+require "tomlrb/generated_parser"
+
 class Tomlrb::Parser < Tomlrb::GeneratedParser
-  attr_reader :handler
 
   def initialize(tokenizer, handler = Tomlrb::Handler.new)
     @tokenizer = tokenizer
     @handler   = handler
-    @yydebug = true
     super()
   end
 
@@ -14,6 +14,6 @@ class Tomlrb::Parser < Tomlrb::GeneratedParser
 
   def parse
     do_parse
-    handler
+    @handler
   end
 end

data/lib/tomlrb/parser.y

@@ -1,57 +1,96 @@
 class Tomlrb::GeneratedParser
-token IDENTIFIER STRING DATETIME NUMBER TRUE FALSE
+token IDENTIFIER STRING_MULTI STRING_BASIC STRING_LITERAL_MULTI STRING_LITERAL DATETIME INTEGER FLOAT TRUE FALSE
 rule
   expressions
     : expressions expression
     | expression
     ;
-
   expression
     : table
     | assignment
+    | inline_table
     ;
-
   table
-    : '[' identifier ']' { @handler.set_context(val[1]) }
+    : table_start table_continued
+    ;
+  table_start
+    : '[' '[' { @handler.start_(:array_of_tables) }
+    | '[' { @handler.start_(:table) }
+    ;
+  table_continued
+    : ']' ']' { 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_next
+    ;
+  table_next
+    : ']' ']' { array = @handler.end_(:array_of_tables); @handler.set_context(array, is_array_of_tables: true) }
+    | ']' { array = @handler.end_(:table); @handler.set_context(array) }
+    | '.' table_continued
+    ;
+  table_identifier
+    : IDENTIFIER { @handler.push(val[0]) }
+    | STRING_BASIC { @handler.push(val[0]) }
+    ;
+  inline_table
+    : inline_table_start inline_continued
+    ;
+  inline_table_start
+    : '{' { @handler.start_(:inline) }
+    ;
+  inline_continued
+    : '}' { array = @handler.end_(:inline); @handler.push(Hash[*array]) }
+    | inline_assignment_key inline_assignment_value inline_next
+    ;
+  inline_next
+    : '}' { array = @handler.end_(:inline); @handler.push(Hash[*array]) }
+    | ',' inline_continued
+    ;
+  inline_assignment_key
+    : IDENTIFIER { @handler.push(val[0]) }
+    ;
+  inline_assignment_value
+    : '=' value
+    ;
+  assignment
+    : IDENTIFIER '=' value { @handler.assign(val[0]) }
+    | STRING_BASIC '=' value { @handler.assign(val[0]) }
     ;
-
   array
     : start_array array_continued
     ;
-
-  array_continued : ']' { @handler.end_array }
-  | value array_next;
-  array_next : ']' { @handler.end_array }
-  | ',' array_continued;
-
-  start_array  : '[' { @handler.start_array }
-  end_array    : ']'
-
-  assignment
-    : identifier '=' value { @handler.assign(val[0]) }
+  array_continued
+    : ']' { array = @handler.end_(:array); @handler.push(array) }
+    | value array_next
+    ;
+  array_next
+    : ']' { array = @handler.end_(:array); @handler.push(array) }
+    | ',' array_continued
+    ;
+  start_array
+    : '[' { @handler.start_(:array) }
+    ;
+  end_array
+    : ']'
     ;
-
   value
     : scalar { @handler.push(val[0]) }
     | array
+    | inline_table
     ;
-
   scalar
     : string
     | literal
     ;
-
   literal
-    | NUMBER { n = val[0]; result = n.count('.') > 0 ? n.to_f : n.to_i }
+    | FLOAT { result = val[0].to_f }
+    | INTEGER { result = val[0].to_i }
     | TRUE   { result = true }
     | FALSE  { result = false }
-    | DATETIME
+    | DATETIME { result = Time.parse(val[0]) }
     ;
-
   string
-    : STRING
-    ;
-
-  identifier:
-    : IDENTIFIER
+    : 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.replace_escaped_chars(StringUtils.strip_spaces(val[0])) }
+    | STRING_LITERAL { result = StringUtils.strip_spaces(val[0]) }
     ;

data/lib/tomlrb/scanner.rb

@@ -2,12 +2,16 @@ require 'strscan'
 
 module Tomlrb
   class Scanner
-    IDENTIFIER = /\w+/
-    SPACES = /\A\s+/
-    STRING_SINGLE = /"[^"]*"/
-    STRING_MULTI = /"[^"]*"/
+    COMMENT = /#.+/
+    IDENTIFIER = /[A-Za-z0-9_-]+/
+    SPACE = /[ \t\r\n]/
+    STRING_BASIC = /(["])(?:\\?.)*?\1/
+    STRING_MULTI = /"{3}([\s\S]*?"{3})/m
+    STRING_LITERAL = /(['])(?:\\?.)*?\1/
+    STRING_LITERAL_MULTI = /'{3}([\s\S]*?'{3})/m
     DATETIME = /(-?\d{4})-(\d{2})-(\d{2})(?:t|\s)(\d{2}):(\d{2}):(\d{2})(?:\.(\d+))?(z|[-+]\d{2}:\d{2})/i
-    NUMBER = /[0-9]+(?:\.[0-9]+)?/
+    FLOAT = /[+-]?(?:[0-9_]+\.[0-9_]*|\.[0-9_]+|\d+(?=[eE]))(?:[eE][+-]?[0-9_]+)?/
+    INTEGER = /[+-]?\d(_?\d)*/
     TRUE   = /true/
     FALSE  = /false/
 
@@ -19,10 +23,15 @@ module Tomlrb
       return if @ss.eos?
 
       case
-      when @ss.scan(SPACES) then next_token
+      when @ss.scan(SPACE) then next_token
+      when @ss.scan(COMMENT) then next_token
       when text = @ss.scan(DATETIME) then [:DATETIME, text]
-      when text = @ss.scan(STRING_SINGLE) then [:STRING, text[1..-2]]
-      when text = @ss.scan(NUMBER) then [:NUMBER, text]
+      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(INTEGER) then [:INTEGER, text]
       when text = @ss.scan(TRUE)   then [:TRUE, text]
       when text = @ss.scan(FALSE)  then [:FALSE, text]
       when text = @ss.scan(IDENTIFIER) then [:IDENTIFIER, text]

data/lib/tomlrb/string_utils.rb

@@ -0,0 +1,23 @@
+module Tomlrb
+  class StringUtils
+
+    def self.multiline_replacements(str)
+      strip_spaces(str).gsub(/\\\n\s+/, '')
+    end
+
+    def self.replace_escaped_chars(str)
+      str
+        .gsub(/\\n/, "\n")
+        .gsub(/\\0/, "\0")
+        .gsub(/\\t/, "\t")
+        .gsub(/\\r/, "\r")
+        .gsub(/\\\"/, '"')
+        .gsub(/\\\\/, '\\')
+    end
+
+    def self.strip_spaces(str)
+      str[0] = '' if str[0] == "\n"
+      str
+    end
+  end
+end

data/lib/tomlrb/version.rb

@@ -1,3 +1,3 @@
 module Tomlrb
-  VERSION = "0.1.0"
+  VERSION = "1.0.1"
 end

data/lib/tomlrb.rb

@@ -1,15 +1,21 @@
+require 'time'
+require 'stringio'
 require "tomlrb/version"
-require "tomlrb/generated_parser"
+require 'tomlrb/string_utils'
 require "tomlrb/scanner"
 require "tomlrb/parser"
 require "tomlrb/handler"
 
 module Tomlrb
-  def self.parse(string_or_io)
+  def self.parse(string_or_io, **options)
     io = string_or_io.is_a?(String) ? StringIO.new(string_or_io) : string_or_io
     scanner = Scanner.new(io)
     parser = Parser.new(scanner)
     handler = parser.parse
-    handler.result
+    handler.output
+  end
+
+  def self.load_file(path, **options)
+    Tomlrb.parse(File.read(path), options)
   end
 end

data/tomlrb.gemspec

@@ -24,4 +24,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry"
   spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "racc"
+  spec.add_development_dependency "minitest"
+  spec.add_development_dependency "minitest-reporters"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tomlrb
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Francois Bernier
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-04-09 00:00:00.000000000 Z
+date: 2015-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A racc based toml parser
 email:
 - frankbernier@gmail.com
@@ -101,8 +129,8 @@ files:
 - lib/tomlrb/parser.rb
 - lib/tomlrb/parser.y
 - lib/tomlrb/scanner.rb
+- lib/tomlrb/string_utils.rb
 - lib/tomlrb/version.rb
-- sample.toml
 - tomlrb.gemspec
 homepage: ''
 licenses:

data/sample.toml

@@ -1,47 +0,0 @@
-# This is a TOML document. Boom.
-
-title = "TOML Example"
-
-[owner]
-name = "Tom Preston-Werner"
-organization = "GitHub"
-bio = "GitHub Cofounder & CEO\nLikes tater tots and beer."
-dob = 1979-05-27T07:32:00Z # First class dates? Why not?
-
-[database]
-server = "192.168.1.1"
-ports = [ 8001, 8001, 8002 ]
-connection_max = 5000
-enabled = true
-
-[servers]
-
-  # You can indent as you please. Tabs or spaces. TOML don't care.
-  [servers.alpha]
-  ip = "10.0.0.1"
-  dc = "eqdc10"
-
-  [servers.beta]
-  ip = "10.0.0.2"
-  dc = "eqdc10"
-  country = "中国" # This should be parsed as UTF-8
-
-[clients]
-data = [ ["gamma", "delta"], [1, 2] ] # just an update to make sure parsers support it
-
-# Line breaks are OK when inside arrays
-hosts = [
-  "alpha",
-  "omega"
-]
-
-# Products
-
-  [[products]]
-  name = "Hammer"
-  sku = 738594937
-
-  [[products]]
-  name = "Nail"
-  sku = 284758393
-  color = "gray"