elparser 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c46cda5b6979d0d53eb8871d00f31c8fd00488e2
-  data.tar.gz: a25c9a3a14e70d18fa006a99ac26be7bb0830dd9
+  metadata.gz: ccc0e2ca8395fd31246a39c426d3ecfd5ef3a4e2
+  data.tar.gz: 57825efa952f48a4e33dd31547cee6edcd8b4f13
 SHA512:
-  metadata.gz: ef81f3be2cfd6d718ea7274f8455a9d819afca7d3368a3821bef185747e6f7c7f12452d724831888af3ae8599913afb2ac17d8662445e0f8c1a6d996dd220cae
-  data.tar.gz: c55ee9e094eb10d004514167a1a3ebb361d60bdf754eb0bc9fe9cbf8a8915b5adfdc08c33aa6e8101193d96d142c092b624ca1df618eb98165c52cef78fa586c
+  metadata.gz: 39b69fc3581352fe40065a432f053f1a4c0c26275b625ab1517e712f9e2b86e6a1502a486550bb28df8adcecfee02a533b8d9a5164417b9b987622c8f9be1629
+  data.tar.gz: 99985731bf3b9a5b9aa072629ada53d66a0cd402537f9f719857706c1be535fc5e94ca2b5ef2aaed77433bb22132833e9cbbf398ab29f04c98eb09254b45b6c1

data/lib/elparser.rb

@@ -216,6 +216,15 @@ module Elparser
     end
   end
 
+  class ParserError < StandardError
+    attr_reader :message, :pos, :sample
+    def initialize(message, pos, sample)
+      @message = message
+      @pos = pos
+      @sample = sample
+    end
+  end
+
   # parser class for 
   class Parser
 
@@ -226,6 +235,10 @@ module Elparser
 
     # parse s-expression string and return sexp objects.
     def parse(str)
+      if str.nil? || str == ""
+        raise ParserError.new("Empty input",0,"")
+      end
+
       s = StringScanner.new str
       @tokens = []
 
@@ -237,10 +250,10 @@ module Elparser
           s.scan(/\A[a-z\-.\/_:*+=$][a-z\-.\/_:$*+=0-9]*/i) ? (@tokens << [:SYMBOL, s.matched]) :
           s.scan(/\A"(([^\\"]|\\.)*)"/)        ? (@tokens << [:STRING, s.matched.slice(1...-1)])  :
           s.scan(/\A./)                      ? (a = s.matched; @tokens << [a, a]) :
-          (raise "scanner error")
+          (raise ParserError.new("Scanner error",s.pos,s.peek(5)))
       end
-      @tokens.push [false, '$end']
-      
+      @tokens.push [false, 'END']
+
       return do_parse.map do |i|
         normalize(i)
       end
@@ -280,6 +293,17 @@ module Elparser
     return objs.map {|obj| _encode(obj).to_s }.join(sep)
   end
 
+  class EncodingError < StandardError
+    attr_reader :message, :object
+    def initialize(message, object)
+      @message = message
+      @object = object
+    end
+    def to_s
+      @message
+    end
+  end
+
   private 
 
   def self._encode(arg)
@@ -302,7 +326,7 @@ module Elparser
     elsif c ==  FalseClass then
       return SExpNil.new
     end
-    raise "Can't encode object : #{arg}"
+    raise EncodingError.new("Can't encode object : #{arg}", arg)
   end
 
   def self._encode_array(arg)

data/lib/elparser/version.rb

@@ -1,3 +1,3 @@
 module Elparser
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/test/test-elparser.rb

@@ -190,4 +190,26 @@ class TestElparser < Test::Unit::TestCase
 
   end
 
+  sub_test_case "Error" do
+
+    test "Parser Error" do
+      assert_raise_message "Empty input" do
+        @parser.parse ""
+      end
+      assert_raise_message /\$end/ do
+        @parser.parse "("
+      end
+      assert_raise_message /parse error on value "\)"/ do
+        @parser.parse ")"
+      end
+    end
+
+    test "Encoding Error" do
+      assert_raise_message /Can\'t encode object/ do
+        Elparser.encode Class
+      end
+    end
+
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elparser
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - SAKURAI Masashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-12 00:00:00.000000000 Z
+date: 2015-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: racc