eye-of-newt 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a87891dfebdd9714906ffb7c01a29dde8fde509b
-  data.tar.gz: 4e45fca82f3238bdcdaea08abbdcb592adcbbc00
+  metadata.gz: fa8794a5cef2066049431c1e0e171421b9f5fcca
+  data.tar.gz: 378020227175a0472e55f4ecb111c403b53549d2
 SHA512:
-  metadata.gz: d99d9efe31f68381ef46217d076c9cb1dc8c757e2abeb8df6265e7700a4d6144e28744ff13cff2e578f23344a68cb70e9fafde517e46d888b16d570584325db3
-  data.tar.gz: fe3c7f03519771454efaa7ad716fcdaeab9ff63362d6925da6810d19591d016a34ee88ef9af4a112222628299734783ad068a3f19971be355895d7ce8c8d3df4
+  metadata.gz: d9284a0c28614d6a8ef5a20c040879ed0a5db9f162ea6065556e3a25e68a91fb80d99ec2929cc4425b3d7ab1fbb0c8cf54981fccb322f8a3027ec033691d9bc0
+  data.tar.gz: f7b2184eb2a7bf627e7e6f9324a00c9f0a4ee453b9ecee3e452968b47c99ad5814aef31ace40fb2aa72a0b515b038fb8d6f8579768aff68794de95d6c8c1d7b8

data/lib/eye_of_newt/parser.rb

@@ -32,69 +32,75 @@ module EyeOfNewt
 ##### State transition tables begin ###
 
 racc_action_table = [
-     9,     9,    10,    17,    18,    17,    24,     9,    20,    11,
-    23,    14,    14,     9,    17,    28,     9,    30,    31 ]
+   -19,    11,    15,    25,    14,    13,    11,   -19,    11,    14,
+    13,    14,    13,    11,    23,    14,    14,    13,    27,    28,
+    20,    29,    20,    16,    14,    27,    33,    34 ]
 
 racc_action_check = [
-     8,     0,     0,     8,     5,     5,    11,     2,     6,     1,
-    10,     3,    12,    14,    15,    20,    21,    23,    28 ]
+     9,     0,     0,     6,     0,     0,     2,     9,    20,     2,
+     2,    20,    20,    10,     5,     5,    10,    10,    15,    15,
+     3,    16,    17,     1,    21,    25,    27,    28 ]
 
 racc_action_pointer = [
-    -1,     9,     5,     5,   nil,     0,     5,   nil,    -2,   nil,
-     2,     6,     6,   nil,    11,     9,   nil,   nil,   nil,   nil,
-     8,    14,   nil,    14,   nil,   nil,   nil,   nil,    15,   nil,
-   nil,   nil ]
+    -1,    23,     4,    13,   nil,    10,     0,   nil,   nil,     0,
+    11,   nil,   nil,   nil,   nil,    10,    21,    15,   nil,   nil,
+     6,    19,   nil,   nil,   nil,    17,   nil,    23,    24,   nil,
+   nil,   nil,   nil,   nil,   nil ]
 
 racc_action_default = [
-   -23,   -23,   -23,    -4,    -5,    -9,   -10,   -12,   -16,   -18,
-   -20,   -23,    -2,    -3,   -23,    -7,    -8,   -17,   -19,   -11,
-   -23,   -23,   -15,   -23,    32,    -1,   -13,    -6,   -23,   -14,
-   -22,   -21 ]
+   -27,   -27,   -27,    -4,    -5,    -9,   -10,   -12,   -13,   -14,
+   -17,   -18,   -20,   -21,   -22,   -24,   -27,    -2,   -19,    -3,
+   -27,    -7,    -8,   -23,   -11,   -27,   -16,   -27,   -27,    35,
+    -1,   -15,    -6,   -25,   -26 ]
 
 racc_goto_table = [
-    22,    16,     5,    13,    21,     3,    26,    12,     1,    15,
-     2,    27,    25,    29,     6,    19,     7 ]
+    22,    19,    26,     7,     3,    21,    17,     5,     1,    24,
+     6,     2,    31,     8,     9,    30,    32 ]
 
 racc_goto_check = [
-     5,     8,     6,     4,     8,     3,     5,     3,     1,     7,
-     2,     8,     4,     5,     9,    10,    11 ]
+     8,     4,     5,    10,     3,     7,     3,     6,     1,    10,
+     9,     2,     5,    11,    12,     4,     8 ]
 
 racc_goto_pointer = [
-   nil,     8,    10,     5,     0,    -8,     2,     4,    -4,    14,
-     9,    16,   nil ]
+   nil,     8,    11,     4,    -2,    -8,     7,     0,    -5,    10,
+     3,    13,    14,   nil ]
 
 racc_goto_default = [
-   nil,   nil,   nil,   nil,   nil,     4,   nil,   nil,   nil,   nil,
-   nil,   nil,     8 ]
+   nil,   nil,   nil,   nil,   nil,     4,   nil,   nil,    12,   nil,
+   nil,   nil,    18,    10 ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
-  3, 10, :_reduce_none,
-  2, 10, :_reduce_none,
-  2, 10, :_reduce_none,
-  1, 10, :_reduce_none,
-  1, 12, :_reduce_5,
   3, 11, :_reduce_none,
   2, 11, :_reduce_none,
   2, 11, :_reduce_none,
   1, 11, :_reduce_none,
-  1, 15, :_reduce_10,
-  2, 15, :_reduce_11,
-  1, 15, :_reduce_12,
-  2, 13, :_reduce_13,
-  3, 14, :_reduce_14,
+  1, 13, :_reduce_5,
+  3, 12, :_reduce_none,
+  2, 12, :_reduce_none,
+  2, 12, :_reduce_none,
+  1, 12, :_reduce_none,
+  1, 16, :_reduce_10,
+  2, 16, :_reduce_11,
+  1, 16, :_reduce_12,
+  1, 16, :_reduce_13,
+  1, 16, :_reduce_14,
   2, 14, :_reduce_15,
-  1, 14, :_reduce_none,
-  1, 17, :_reduce_none,
-  1, 21, :_reduce_none,
-  1, 16, :_reduce_19,
-  1, 18, :_reduce_20,
-  3, 19, :_reduce_21,
-  3, 20, :_reduce_22 ]
-
-racc_reduce_n = 23
-
-racc_shift_n = 32
+  2, 15, :_reduce_16,
+  1, 15, :_reduce_none,
+  1, 23, :_reduce_none,
+  1, 23, :_reduce_none,
+  1, 23, :_reduce_none,
+  1, 22, :_reduce_none,
+  1, 18, :_reduce_none,
+  1, 17, :_reduce_23,
+  1, 19, :_reduce_24,
+  3, 20, :_reduce_25,
+  3, 21, :_reduce_26 ]
+
+racc_reduce_n = 27
+
+racc_shift_n = 35
 
 racc_token_table = {
   false => 0,
@@ -103,11 +109,12 @@ racc_token_table = {
   :NUMBER => 3,
   :UNIT => 4,
   :OF => 5,
-  "," => 6,
-  "/" => 7,
-  "." => 8 }
+  :A => 6,
+  "," => 7,
+  "/" => 8,
+  "." => 9 }
 
-racc_nt_base = 9
+racc_nt_base = 10
 
 racc_use_result_var = true
 
@@ -134,6 +141,7 @@ Racc_token_to_s_table = [
   "NUMBER",
   "UNIT",
   "OF",
+  "A",
   "\",\"",
   "\"/\"",
   "\".\"",
@@ -149,6 +157,7 @@ Racc_token_to_s_table = [
   "number",
   "fraction",
   "decimal",
+  "a",
   "word" ]
 
 Racc_debug_parser = false
@@ -194,42 +203,53 @@ def _reduce_12(val, _values, result)
 end
 
 def _reduce_13(val, _values, result)
- @ingredient.style = val[1] 
+ @ingredient.quantity = result 
     result
 end
 
 def _reduce_14(val, _values, result)
- result = val.join(' ') 
+ @ingredient.quantity = 1 
     result
 end
 
 def _reduce_15(val, _values, result)
- result = val.join(' ') 
+ @ingredient.style = val[1] 
     result
 end
 
-# reduce 16 omitted
+def _reduce_16(val, _values, result)
+ result = val.join(' ') 
+    result
+end
 
 # reduce 17 omitted
 
 # reduce 18 omitted
 
-def _reduce_19(val, _values, result)
+# reduce 19 omitted
+
+# reduce 20 omitted
+
+# reduce 21 omitted
+
+# reduce 22 omitted
+
+def _reduce_23(val, _values, result)
  @ingredient.unit = to_unit(result) 
     result
 end
 
-def _reduce_20(val, _values, result)
+def _reduce_24(val, _values, result)
  result = val[0].to_i 
     result
 end
 
-def _reduce_21(val, _values, result)
+def _reduce_25(val, _values, result)
  result = val[0].to_f / val[2].to_f 
     result
 end
 
-def _reduce_22(val, _values, result)
+def _reduce_26(val, _values, result)
  result = val.join.to_f 
     result
 end

data/lib/eye_of_newt/parser.y

@@ -1,5 +1,5 @@
 class EyeOfNewt::Parser
-token WORD NUMBER UNIT OF
+token WORD NUMBER UNIT OF A
 rule
   ingredient
     : quantity ingredient_name style
@@ -19,16 +19,18 @@ rule
   amount
     : number { @ingredient.quantity = result }
     | number fraction { @ingredient.quantity = val[0] + val[1] }
+    | fraction { @ingredient.quantity = result }
     | decimal { @ingredient.quantity = result }
+    | a { @ingredient.quantity = 1 }
     ;
   style : ',' words { @ingredient.style = val[1] } ;
   words
-    : word of words { result = val.join(' ') }
-    | word words { result = val.join(' ') }
+    : word words { result = val.join(' ') }
     | word
     ;
+  word : WORD | a | of ;
+  a : A ;
   of : OF ;
-  word : WORD ;
   unit : UNIT { @ingredient.unit = to_unit(result) } ;
   number : NUMBER { result = val[0].to_i } ;
   fraction : NUMBER '/' NUMBER { result = val[0].to_f / val[2].to_f } ;

data/lib/eye_of_newt/tokenizer.rb

@@ -9,6 +9,7 @@ module EyeOfNewt
     WORD = /[\w-]+/
     NUMBER = /\d+/
     OF = /of/
+    A = /an?/
 
     def initialize(string, units=Unit.all)
       @units = units
@@ -25,6 +26,8 @@ module EyeOfNewt
         [:NUMBER, text]
       when text = @ss.scan(/#{OF}\b/)
         [:OF, text]
+      when text = @ss.scan(/#{A}\b/)
+        [:A, text]
       when text = @ss.scan(/#{unit_matcher}\b/)
         [:UNIT, text]
       when text = @ss.scan(/#{WORD}\b/)

data/lib/eye_of_newt/version.rb

@@ -1,3 +1,3 @@
 module EyeOfNewt
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/script/console

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+irb -Ilib -reye_of_newt

data/test/examples.txt

@@ -5,11 +5,13 @@ tomatoes | tomatoes | 1 | units
 2 cups flour | flour | 2 | cups
 1 cup all-purpose flour | all-purpose flour | 1 | cups
 1 1/2 cups all-purpose flour | all-purpose flour | 1.5 | cups
+1/2 cups all-purpose flour | all-purpose flour | .5 | cups
 1.5 cups tomatoes | tomatoes | 1.5 | cups
 1 tomato, diced | tomato | 1 | units | diced
 1 onion, finely chopped | onion | 1 | units | finely chopped
 1 cup of flour | flour | 1 | cups
 1 teaspoon of cream of tartar | cream of tartar | 1 | teaspoons
+a pinch of salt | salt | 1 | pinches
 
 #1 (46 fluid ounce) can tomato juice' => ["1 (46 fluid ounce) can", "tomato juice"],
 #1 (29 ounce) can tomato sauce' => ["1 (29 ounce) can", "tomato sauce"],

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eye-of-newt
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Peter McCracken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-22 00:00:00.000000000 Z
+date: 2014-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -131,6 +131,7 @@ files:
 - lib/eye_of_newt/tokenizer.rb
 - lib/eye_of_newt/unit.rb
 - lib/eye_of_newt/version.rb
+- script/console
 - test/examples.txt
 - test/eye_of_newt/tokenizer_test.rb
 - test/eye_of_newt_test.rb