jiffy 1.0.4 → 1.1.0

data/lib/jiffy/parsers/json_float.rl

@@ -4,32 +4,40 @@
 
     action exit { fhold; fbreak; }
 
-    action char { o.t :char, [data[p]].pack("c*") }
-    action number { o.t :number, [data[p]].pack("c*").to_i }
+    action char { y << [:char, [data[p]].pack("c*")] }
+    action number { y << [:number, [data[p]].pack("c*").to_i] }
+    action exponent { y << :exponent }
+    action minus { y << :minus }
+    action plus { y << :plus }
 
-    significand = '-'? @char ('0' >number | [1-9] >char [0-9]* $number) ('.' >char [0-9]+ $number)?;
+    significand = '-'? @minus ('0' >number | [1-9] >number [0-9]* $number) ('.' >char [0-9]+ $number)?;
 
-    exponent = [Ee] >char [+\-]? @char [0-9]+ $number;
+    exponent = [Ee] >exponent ( '-' >minus | '+' >plus )? [0-9]+ $number;
 
     main := (significand exponent?) (^[0-9Ee.\-]? @exit );
 }%%
 
 class Jiffy
   module Parsers
-    module JsonFloat
+    class JsonFloat < Parser
       def initialize(*args)
         %% write data;
+
         super
       end
 
-      def parse_json_float(p, pe)
-        t_p = p
+      def parse
+        pe = :ignored
+        eof = :ignored
+        p = self.p
 
         %% write init;
         %% write exec;
 
         if cs >= json_float_first_final
           p
+        else
+          raise_unparseable p
         end
       end
     end

data/lib/jiffy/parsers/json_object.rb

@@ -1,12 +1,12 @@
 
 # line 1 "json_object.rl"
 
-# line 36 "json_object.rl"
+# line 24 "json_object.rl"
 
 
 class Jiffy
   module Parsers
-    module JsonObject
+    class JsonObject < Parser
       def initialize(*args)
         
 # line 13 "json_object.rb"
@@ -140,22 +140,27 @@ end
 self.json_object_en_main = 1;
 
 
-# line 43 "json_object.rl"
+# line 31 "json_object.rl"
+
         super
       end
 
-      def parse_json_object(p, pe)
+      def parse
+        pe = :ignored
+        eof = :ignored
+        p = self.p
+
         
-# line 150 "json_object.rb"
+# line 155 "json_object.rb"
 begin
 	p ||= 0
 	pe ||= data.length
 	cs = json_object_start
 end
 
-# line 48 "json_object.rl"
+# line 41 "json_object.rl"
         
-# line 159 "json_object.rb"
+# line 164 "json_object.rb"
 begin
 	_klen, _trans, _keys, _acts, _nacts = nil
 	_goto_level = 0
@@ -240,42 +245,18 @@ when 0 then
 # line 5 "json_object.rl"
 		begin
 
-        np = parse_json_value(p, pe)
-
-        if np
-             begin p = (( np))-1; end
-
-        else
-            p = p - 1; 	begin
-		p += 1
-		_trigger_goto = true
-		_goto_level = _out
-		break
-	end
+       begin p = (( JsonValue.new(p: p, data: data, yielder: yielder).parse))-1; end
 
-        end
     		end
 when 1 then
-# line 15 "json_object.rl"
+# line 9 "json_object.rl"
 		begin
 
-        np = parse_json_string(p, pe)
+       begin p = (( JsonString.new(p: p, data: data, yielder: yielder).parse))-1; end
 
-        if np
-             begin p = (( np))-1; end
-
-        else
-            p = p - 1; 	begin
-		p += 1
-		_trigger_goto = true
-		_goto_level = _out
-		break
-	end
-
-        end
     		end
 when 2 then
-# line 25 "json_object.rl"
+# line 13 "json_object.rl"
 		begin
  p = p - 1; 	begin
 		p += 1
@@ -285,30 +266,30 @@ when 2 then
 	end
  		end
 when 3 then
-# line 27 "json_object.rl"
+# line 15 "json_object.rl"
 		begin
- o.t :begin_string 		end
+ y << :begin_name 		end
 when 4 then
-# line 27 "json_object.rl"
+# line 15 "json_object.rl"
 		begin
- o.t :end_string 		end
+ y << :end_name 		end
 when 5 then
-# line 27 "json_object.rl"
+# line 15 "json_object.rl"
 		begin
- o.t :name_separator 		end
+ y << :name_separator 		end
 when 6 then
-# line 29 "json_object.rl"
+# line 17 "json_object.rl"
 		begin
- o.t :value_separator 		end
+ y << :value_separator 		end
 when 7 then
-# line 32 "json_object.rl"
+# line 20 "json_object.rl"
 		begin
- o.t :begin_object 		end
+ y << :begin_object 		end
 when 8 then
-# line 34 "json_object.rl"
+# line 22 "json_object.rl"
 		begin
- o.t :end_object 		end
-# line 312 "json_object.rb"
+ y << :end_object 		end
+# line 293 "json_object.rb"
 			end # action switch
 		end
 	end
@@ -335,7 +316,7 @@ when 8 then
 	end
 	end
 
-# line 49 "json_object.rl"
+# line 42 "json_object.rl"
 
         if cs >= json_object_first_final
           p + 1

data/lib/jiffy/parsers/json_object.rl

@@ -3,47 +3,40 @@
     include json_common "json_common.rl";
 
     action parse_value {
-        np = parse_json_value(fpc, pe)
-
-        if np
-            fexec np;
-        else
-            fhold; fbreak;
-        end
+      fexec JsonValue.new(p: p, data: data, yielder: yielder).parse;
     }
 
     action parse_name {
-        np = parse_json_string(fpc, pe)
-
-        if np
-            fexec np;
-        else
-            fhold; fbreak;
-        end
+      fexec JsonString.new(p: p, data: data, yielder: yielder).parse;
     }
 
     action exit { fhold; fbreak; }
 
-    pair = ignore* begin_name >{ o.t :begin_string } >parse_name @{ o.t :end_string } ignore* name_separator >{ o.t :name_separator } ignore* begin_value >parse_value;
+    pair = ignore* begin_name >{ y << :begin_name } >parse_name @{ y << :end_name } ignore* name_separator >{ y << :name_separator } ignore* begin_value >parse_value;
 
-    next_pair = ignore* value_separator >{ o.t :value_separator } pair;
+    next_pair = ignore* value_separator >{ y << :value_separator } pair;
 
     main := (
-        begin_object >{ o.t :begin_object }
+        begin_object >{ y << :begin_object }
         (pair (next_pair)*)? ignore*
-        end_object >{ o.t :end_object }
+        end_object >{ y << :end_object }
     ) @exit;
 }%%
 
 class Jiffy
   module Parsers
-    module JsonObject
+    class JsonObject < Parser
       def initialize(*args)
         %% write data;
+
         super
       end
 
-      def parse_json_object(p, pe)
+      def parse
+        pe = :ignored
+        eof = :ignored
+        p = self.p
+
         %% write init;
         %% write exec;
 

data/lib/jiffy/parsers/json_string.rb

@@ -1,12 +1,12 @@
 
 # line 1 "json_string.rl"
 
-# line 17 "json_string.rl"
+# line 29 "json_string.rl"
 
 
 class Jiffy
   module Parsers
-    module JsonString
+    class JsonString < Parser
       def initialize(*args)
         
 # line 13 "json_string.rb"
@@ -15,7 +15,10 @@ class << self
 	private :_json_string_actions, :_json_string_actions=
 end
 self._json_string_actions = [
-	0, 1, 0, 1, 1
+	0, 1, 0, 1, 1, 1, 2, 1, 
+	3, 1, 4, 1, 5, 1, 6, 1, 
+	7, 1, 8, 1, 9, 1, 10, 1, 
+	11, 2, 11, 12
 ]
 
 class << self
@@ -66,25 +69,16 @@ self._json_string_index_offsets = [
 	32
 ]
 
-class << self
-	attr_accessor :_json_string_indicies
-	private :_json_string_indicies, :_json_string_indicies=
-end
-self._json_string_indicies = [
-	0, 1, 3, 4, 1, 2, 2, 2, 
-	2, 2, 2, 2, 2, 2, 5, 1, 
-	6, 6, 6, 1, 7, 7, 7, 1, 
-	8, 8, 8, 1, 2, 2, 2, 1, 
-	1, 0
-]
-
 class << self
 	attr_accessor :_json_string_trans_targs
 	private :_json_string_trans_targs, :_json_string_trans_targs=
 end
 self._json_string_trans_targs = [
-	2, 0, 2, 8, 3, 4, 5, 6, 
-	7
+	2, 0, 8, 3, 0, 2, 2, 2, 
+	2, 2, 2, 2, 2, 2, 4, 0, 
+	5, 5, 5, 0, 6, 6, 6, 0, 
+	7, 7, 7, 0, 2, 2, 2, 0, 
+	0, 0
 ]
 
 class << self
@@ -92,8 +86,11 @@ class << self
 	private :_json_string_trans_actions, :_json_string_trans_actions=
 end
 self._json_string_trans_actions = [
-	0, 0, 3, 1, 3, 3, 3, 3, 
-	3
+	0, 0, 1, 21, 0, 3, 5, 9, 
+	7, 11, 13, 15, 17, 19, 0, 0, 
+	23, 23, 23, 0, 23, 23, 23, 0, 
+	23, 23, 23, 0, 25, 25, 25, 0, 
+	0, 0
 ]
 
 class << self
@@ -115,12 +112,15 @@ end
 self.json_string_en_main = 1;
 
 
-# line 24 "json_string.rl"
+# line 36 "json_string.rl"
+
         super
       end
 
-      def parse_json_string(p, pe)
-        t_p = p + 1
+      def parse
+        pe = :ignored
+        eof = :ignored
+        p = self.p
 
         
 # line 127 "json_string.rb"
@@ -130,7 +130,7 @@ begin
 	cs = json_string_start
 end
 
-# line 31 "json_string.rl"
+# line 46 "json_string.rl"
         
 # line 136 "json_string.rb"
 begin
@@ -203,7 +203,6 @@ begin
 	     _trans += _klen
 	  end
 	end while false
-	_trans = _json_string_indicies[_trans]
 	cs = _json_string_trans_targs[_trans]
 	if _json_string_trans_actions[_trans] != 0
 		_acts = _json_string_trans_actions[_trans]
@@ -226,8 +225,52 @@ when 0 then
 when 1 then
 # line 7 "json_string.rl"
 		begin
- o.t :char, [data[p]].pack("c*") 		end
-# line 231 "json_string.rb"
+ y << [:char, [data[p]].pack("c*")] 		end
+when 2 then
+# line 13 "json_string.rl"
+		begin
+ y << :escaped_quotation_mark 		end
+when 3 then
+# line 14 "json_string.rl"
+		begin
+ y << :escaped_reverse_solidus 		end
+when 4 then
+# line 15 "json_string.rl"
+		begin
+ y << :escaped_solidus 		end
+when 5 then
+# line 16 "json_string.rl"
+		begin
+ y << :escaped_backspace 		end
+when 6 then
+# line 17 "json_string.rl"
+		begin
+ y << :escaped_formfeed 		end
+when 7 then
+# line 18 "json_string.rl"
+		begin
+ y << :escaped_newline 		end
+when 8 then
+# line 19 "json_string.rl"
+		begin
+ y << :escaped_carriage_return 		end
+when 9 then
+# line 20 "json_string.rl"
+		begin
+ y << :escaped_horizontal_tab 		end
+when 10 then
+# line 23 "json_string.rl"
+		begin
+ unicode_sequence = "" 		end
+when 11 then
+# line 23 "json_string.rl"
+		begin
+ unicode_sequence << [data[p]].pack("c*") 		end
+when 12 then
+# line 23 "json_string.rl"
+		begin
+ y << [:escaped_unicode, unicode_sequence.to_s] 		end
+# line 274 "json_string.rb"
 			end # action switch
 		end
 	end
@@ -254,7 +297,7 @@ when 1 then
 	end
 	end
 
-# line 32 "json_string.rl"
+# line 47 "json_string.rl"
 
         if cs >= json_string_first_final
           p + 1

data/lib/jiffy/parsers/json_string.rl

@@ -4,11 +4,23 @@
 
     action exit { fhold; fbreak; }
 
-    action char { o.t :char, [data[p]].pack("c*") }
+    action char { y << [:char, [data[p]].pack("c*")] }
+    action unicode { y << [:unicode, data[(p-4)..p].pack("c*")] }
 
     character = ^([\"\\] | 0..0x1f) >char;
-    sequence = '\\' >char [\"\\/bfnrt] >char;
-    unicode = '\\' >char 'u' >char [0-9a-fA-F]{4} $char;
+
+    sequence = '\\' (
+      '"' >{ y << :escaped_quotation_mark } |
+      '\\' >{ y << :escaped_reverse_solidus } |
+      '/' >{ y << :escaped_solidus } |
+      'b' >{ y << :escaped_backspace } |
+      'f' >{ y << :escaped_formfeed } |
+      'n' >{ y << :escaped_newline } |
+      'r' >{ y << :escaped_carriage_return } |
+      't' >{ y << :escaped_horizontal_tab }
+    );
+
+    unicode = '\\u' >{ unicode_sequence = "" } [0-9a-fA-F]{4} ${ unicode_sequence << [data[p]].pack("c*") } @{ y << [:escaped_unicode, unicode_sequence.to_s] };
 
     main := '"' (
                   character | sequence | unicode
@@ -18,14 +30,17 @@
 
 class Jiffy
   module Parsers
-    module JsonString
+    class JsonString < Parser
       def initialize(*args)
         %% write data;
+
         super
       end
 
-      def parse_json_string(p, pe)
-        t_p = p + 1
+      def parse
+        pe = :ignored
+        eof = :ignored
+        p = self.p
 
         %% write init;
         %% write exec;