jiffy 1.0.4 → 1.1.0

data/lib/jiffy/outputters/json.rb

@@ -0,0 +1,35 @@
+class Jiffy
+  module Outputters
+    class Json < Outputter
+      rule :begin_object, :payload => "{", :indent => 1, :break_after => true
+      rule :end_object, :payload => "}", :indent => -1, :break_before => true
+      rule :begin_array, :payload => "[", :indent => 1, :break_after => true
+      rule :end_array, :payload => "]", :indent => -1, :break_before => true
+      rule :value_separator, :payload => ",", :break_after => true
+      rule :name_separator, :payload => ": "
+      rule :begin_name, :payload => "\"", :color => :purple
+      rule :end_name, :payload => "\"", :color => :purple
+      rule :begin_string, :payload => "\"", :color => :purple
+      rule :end_string, :payload => "\"", :color => :purple
+      rule :null, :payload => "null", :color => :gray
+      rule :true, :payload => "true", :color => :blue
+      rule :false, :payload => "false", :color => :blue
+      rule :char, :color => :purple
+      rule :number, :color => :cyan
+      rule :exponent, :payload => "e", :color => :cyan
+      rule :minus, :payload => "-", :color => :cyan
+      rule :plus, :payload => "+", :color => :cyan
+      rule :escaped_quotation_mark, :payload => "\""
+      rule :escaped_reverse_solidus, :payload => "\\"
+      rule :escaped_solidus, :payload => "/"
+      rule :escaped_backspace, :payload => "\\b"
+      rule :escaped_formfeed, :payload => "\\f"
+      rule :escaped_newline, :payload => "\\n"
+      rule :escaped_carriage_return, :payload => "\\r"
+      rule :escaped_horizontal_tab, :payload => "\\t"
+      rule :escaped_unicode do |sequence|
+        "\\u#{sequence}"
+      end
+    end
+  end
+end

data/lib/jiffy/outputters/ruby.rb

@@ -0,0 +1,35 @@
+class Jiffy
+  module Outputters
+    class Ruby < Outputter
+      rule :begin_object, :payload => "{", :indent => 1, :break_after => true
+      rule :end_object, :payload => "}", :indent => -1, :break_before => true
+      rule :begin_array, :payload => "[", :indent => 1, :break_after => true
+      rule :end_array, :payload => "]", :indent => -1, :break_before => true
+      rule :value_separator, :payload => ",", :break_after => true
+      rule :name_separator, :payload => " => "
+      rule :begin_name, :payload => "\"", :color => :light_purple
+      rule :end_name, :payload => "\"", :color => :light_purple
+      rule :begin_string, :payload => "\"", :color => :light_purple
+      rule :end_string, :payload => "\"", :color => :light_purple
+      rule :null, :payload => "nil", :color => :purple
+      rule :true, :payload => "true", :color => :purple
+      rule :false, :payload => "false", :color => :purple
+      rule :char, :color => :purple
+      rule :number, :color => :purple
+      rule :exponent, :payload => "e", :color => :purple
+      rule :minus, :payload => "-", :color => :purple
+      rule :plus, :payload => "+", :color => :purple
+      rule :escaped_quotation_mark, :payload => "\""
+      rule :escaped_reverse_solidus, :payload => "\\"
+      rule :escaped_solidus, :payload => "/"
+      rule :escaped_backspace, :payload => "\\b"
+      rule :escaped_formfeed, :payload => "\\f"
+      rule :escaped_newline, :payload => "\\n"
+      rule :escaped_carriage_return, :payload => "\\r"
+      rule :escaped_horizontal_tab, :payload => "\\t"
+      rule :escaped_unicode do |sequence|
+        "\\u#{sequence}"
+      end
+    end
+  end
+end

data/lib/jiffy/parser.rb

@@ -0,0 +1,17 @@
+class Jiffy
+  class Parser
+    attr_accessor :p, :data, :yielder
+
+    alias_method :y, :yielder
+
+    def initialize(options = {})
+      self.p = options[:p]
+      self.data = options[:data]
+      self.yielder = options[:yielder]
+    end
+
+    def raise_unparseable(p)
+      raise UnparseableError, "Unexpected token at position #{p}"
+    end
+  end
+end

data/lib/jiffy/parsers/json.rb

@@ -1,12 +1,12 @@
 
 # line 1 "json.rl"
 
-# line 27 "json.rl"
+# line 17 "json.rl"
 
 
 class Jiffy
   module Parsers
-    module Json
+    class Json < Parser
       def initialize(*args)
         
 # line 13 "json.rb"
@@ -114,26 +114,27 @@ end
 self.json_en_main = 1;
 
 
-# line 34 "json.rl"
+# line 24 "json.rl"
+
         super
       end
 
-      def parse_json
+      def parse
         pe = :ignored
         eof = :ignored
+        p = self.p
 
-        begin
-          
-# line 128 "json.rb"
+        
+# line 129 "json.rb"
 begin
 	p ||= 0
 	pe ||= data.length
 	cs = json_start
 end
 
-# line 43 "json.rl"
-          
-# line 137 "json.rb"
+# line 34 "json.rl"
+        
+# line 138 "json.rb"
 begin
 	_klen, _trans, _keys, _acts, _nacts = nil
 	_goto_level = 0
@@ -218,39 +219,17 @@ when 0 then
 # line 5 "json.rl"
 		begin
 
-      if np = parse_json_object(p, pe)
-         begin p = (( np))-1; end
+       begin p = (( JsonObject.new(p: p, data: data, yielder: yielder).parse))-1; end
 
-      else
-        p = p - 1;
-        	begin
-		p += 1
-		_trigger_goto = true
-		_goto_level = _out
-		break
-	end
-
-      end
     		end
 when 1 then
-# line 14 "json.rl"
+# line 9 "json.rl"
 		begin
 
-      if np = parse_json_array(p, pe)
-         begin p = (( np))-1; end
+       begin p = (( JsonArray.new(p: p, data: data, yielder: yielder).parse))-1; end
 
-      else
-        p = p - 1;
-        	begin
-		p += 1
-		_trigger_goto = true
-		_goto_level = _out
-		break
-	end
-
-      end
     		end
-# line 254 "json.rb"
+# line 233 "json.rb"
 			end # action switch
 		end
 	end
@@ -277,14 +256,11 @@ when 1 then
 	end
 	end
 
-# line 44 "json.rl"
-        rescue EOFError
-          if p < data.bytes_read || data.bytes_read == 0
-            raise UnexpectedEndError, 'Unexpected end of input'
-          end
-        end
+# line 35 "json.rl"
 
         raise_unparseable p unless p == data.bytes_read
+      ensure
+        self.p = p
       end
     end
   end

data/lib/jiffy/parsers/json.rl

@@ -3,21 +3,11 @@
     include json_common "json_common.rl";
 
     action parse_object {
-      if np = parse_json_object(fpc, pe)
-        fexec np;
-      else
-        fhold;
-        fbreak;
-      end
+      fexec JsonObject.new(p: p, data: data, yielder: yielder).parse;
     }
 
     action parse_array {
-      if np = parse_json_array(fpc, pe)
-        fexec np;
-      else
-        fhold;
-        fbreak;
-      end
+      fexec JsonArray.new(p: p, data: data, yielder: yielder).parse;
     }
 
     main := ignore* (
@@ -28,26 +18,24 @@
 
 class Jiffy
   module Parsers
-    module Json
+    class Json < Parser
       def initialize(*args)
         %% write data;
+
         super
       end
 
-      def parse_json
+      def parse
         pe = :ignored
         eof = :ignored
+        p = self.p
 
-        begin
-          %% write init;
-          %% write exec;
-        rescue EOFError
-          if p < data.bytes_read || data.bytes_read == 0
-            raise UnexpectedEndError, 'Unexpected end of input'
-          end
-        end
+        %% write init;
+        %% write exec;
 
         raise_unparseable p unless p == data.bytes_read
+      ensure
+        self.p = p
       end
     end
   end

data/lib/jiffy/parsers/json_array.rb

@@ -1,12 +1,12 @@
 
 # line 1 "json_array.rl"
 
-# line 23 "json_array.rl"
+# line 17 "json_array.rl"
 
 
 class Jiffy
   module Parsers
-    module JsonArray
+    class JsonArray < Parser
       def initialize(*args)
         
 # line 13 "json_array.rb"
@@ -129,22 +129,27 @@ end
 self.json_array_en_main = 1;
 
 
-# line 30 "json_array.rl"
+# line 24 "json_array.rl"
+
         super
       end
 
-      def parse_json_array(p, pe)
+      def parse
+        pe = :ignored
+        eof = :ignored
+        p = self.p
+
         
-# line 139 "json_array.rb"
+# line 144 "json_array.rb"
 begin
 	p ||= 0
 	pe ||= data.length
 	cs = json_array_start
 end
 
-# line 35 "json_array.rl"
+# line 34 "json_array.rl"
         
-# line 148 "json_array.rb"
+# line 153 "json_array.rb"
 begin
 	_klen, _trans, _keys, _acts, _nacts = nil
 	_goto_level = 0
@@ -229,23 +234,11 @@ when 0 then
 # line 5 "json_array.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_array.rl"
+# line 9 "json_array.rl"
 		begin
  p = p - 1; 	begin
 		p += 1
@@ -255,18 +248,18 @@ when 1 then
 	end
  		end
 when 2 then
-# line 17 "json_array.rl"
+# line 11 "json_array.rl"
 		begin
- o.t :value_separator 		end
+ y << :value_separator 		end
 when 3 then
-# line 19 "json_array.rl"
+# line 13 "json_array.rl"
 		begin
- o.t :begin_array 		end
+ y << :begin_array 		end
 when 4 then
-# line 22 "json_array.rl"
+# line 16 "json_array.rl"
 		begin
- o.t :end_array 		end
-# line 270 "json_array.rb"
+ y << :end_array 		end
+# line 263 "json_array.rb"
 			end # action switch
 		end
 	end
@@ -293,7 +286,7 @@ when 4 then
 	end
 	end
 
-# line 36 "json_array.rl"
+# line 35 "json_array.rl"
 
         if cs >= json_array_first_final
           p + 1

data/lib/jiffy/parsers/json_array.rl

@@ -3,34 +3,33 @@
     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 exit { fhold; fbreak; }
 
-    next_element  = value_separator >{ o.t :value_separator } ignore* begin_value >parse_value;
+    next_element  = value_separator >{ y << :value_separator } ignore* begin_value >parse_value;
 
-    main := begin_array >{ o.t :begin_array } ignore*
+    main := begin_array >{ y << :begin_array } ignore*
           ((begin_value >parse_value ignore*)
            (ignore* next_element ignore*)*)?
-          end_array >{ o.t :end_array } @exit;
+          end_array >{ y << :end_array } @exit;
 }%%
 
 class Jiffy
   module Parsers
-    module JsonArray
+    class JsonArray < Parser
       def initialize(*args)
         %% write data;
+
         super
       end
 
-      def parse_json_array(p, pe)
+      def parse
+        pe = :ignored
+        eof = :ignored
+        p = self.p
+
         %% write init;
         %% write exec;
 

data/lib/jiffy/parsers/json_float.rb

@@ -1,12 +1,12 @@
 
 # line 1 "json_float.rl"
 
-# line 15 "json_float.rl"
+# line 18 "json_float.rl"
 
 
 class Jiffy
   module Parsers
-    module JsonFloat
+    class JsonFloat < Parser
       def initialize(*args)
         
 # line 13 "json_float.rb"
@@ -15,7 +15,8 @@ class << self
 	private :_json_float_actions, :_json_float_actions=
 end
 self._json_float_actions = [
-	0, 1, 0, 1, 1, 1, 2
+	0, 1, 0, 1, 1, 1, 2, 1, 
+	3, 1, 4, 1, 5
 ]
 
 class << self
@@ -72,10 +73,10 @@ class << self
 end
 self._json_float_indicies = [
 	0, 2, 3, 1, 2, 3, 1, 4, 
-	1, 5, 5, 6, 1, 6, 1, 1, 
-	8, 9, 9, 1, 7, 1, 9, 9, 
-	1, 4, 7, 1, 1, 1, 6, 7, 
-	1, 8, 9, 9, 10, 7, 0
+	1, 5, 6, 7, 1, 7, 1, 1, 
+	9, 10, 10, 1, 8, 1, 10, 10, 
+	1, 4, 8, 1, 1, 1, 7, 8, 
+	1, 9, 10, 10, 3, 8, 0
 ]
 
 class << self
@@ -83,8 +84,8 @@ class << self
 	private :_json_float_trans_targs, :_json_float_trans_targs=
 end
 self._json_float_trans_targs = [
-	2, 0, 6, 10, 8, 5, 9, 7, 
-	3, 4, 10
+	2, 0, 6, 10, 8, 5, 5, 9, 
+	7, 3, 4
 ]
 
 class << self
@@ -92,8 +93,8 @@ class << self
 	private :_json_float_trans_actions, :_json_float_trans_actions=
 end
 self._json_float_trans_actions = [
-	3, 0, 5, 3, 5, 3, 5, 1, 
-	3, 3, 5
+	9, 0, 5, 5, 5, 11, 9, 5, 
+	1, 3, 7
 ]
 
 class << self
@@ -115,24 +116,27 @@ end
 self.json_float_en_main = 1;
 
 
-# line 22 "json_float.rl"
+# line 25 "json_float.rl"
+
         super
       end
 
-      def parse_json_float(p, pe)
-        t_p = p
+      def parse
+        pe = :ignored
+        eof = :ignored
+        p = self.p
 
         
-# line 127 "json_float.rb"
+# line 131 "json_float.rb"
 begin
 	p ||= 0
 	pe ||= data.length
 	cs = json_float_start
 end
 
-# line 29 "json_float.rl"
+# line 35 "json_float.rl"
         
-# line 136 "json_float.rb"
+# line 140 "json_float.rb"
 begin
 	_klen, _trans, _keys, _acts, _nacts = nil
 	_goto_level = 0
@@ -226,12 +230,24 @@ when 0 then
 when 1 then
 # line 7 "json_float.rl"
 		begin
- o.t :char, [data[p]].pack("c*") 		end
+ y << [:char, [data[p]].pack("c*")] 		end
 when 2 then
 # line 8 "json_float.rl"
 		begin
- o.t :number, [data[p]].pack("c*").to_i 		end
-# line 235 "json_float.rb"
+ y << [:number, [data[p]].pack("c*").to_i] 		end
+when 3 then
+# line 9 "json_float.rl"
+		begin
+ y << :exponent 		end
+when 4 then
+# line 10 "json_float.rl"
+		begin
+ y << :minus 		end
+when 5 then
+# line 11 "json_float.rl"
+		begin
+ y << :plus 		end
+# line 251 "json_float.rb"
 			end # action switch
 		end
 	end
@@ -258,10 +274,12 @@ when 2 then
 	end
 	end
 
-# line 30 "json_float.rl"
+# line 36 "json_float.rl"
 
         if cs >= json_float_first_final
           p
+        else
+          raise_unparseable p
         end
       end
     end