elparser 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c391d3c3b15b4a4fdceb3e25866aadce77cde8c
-  data.tar.gz: ec18d9c6a518d140df97f54b4c7a352483ba303e
+  metadata.gz: c46cda5b6979d0d53eb8871d00f31c8fd00488e2
+  data.tar.gz: a25c9a3a14e70d18fa006a99ac26be7bb0830dd9
 SHA512:
-  metadata.gz: 7765f3e41cf5d867464a93328e5d9c3e4de947d17c3e4411f40447eceae16793dbd99edc0e56b738928f5c18f3dcde4c261e2dad6eb2a9f3f73e4684e534191f
-  data.tar.gz: 556107b0ce54435da3b0c7bc1dee040cb9eec94fa2d8b35241802e9a4384341a787fed346bae29b8d4e52c64c93f836ce20aa635d621b79de7632e8040ab6e96
+  metadata.gz: ef81f3be2cfd6d718ea7274f8455a9d819afca7d3368a3821bef185747e6f7c7f12452d724831888af3ae8599913afb2ac17d8662445e0f8c1a6d996dd220cae
+  data.tar.gz: c55ee9e094eb10d004514167a1a3ebb361d60bdf754eb0bc9fe9cbf8a8915b5adfdc08c33aa6e8101193d96d142c092b624ca1df618eb98165c52cef78fa586c

data/README.md

@@ -12,7 +12,7 @@ require 'elparser'
 parser = Elparser::Parser.new
 
  # list and literals
-obj1 = parser.parse("(1 2.3 a \"b\" () (c 'd))")
+obj1 = parser.parse1("(1 2.3 a \"b\" () (c 'd))")
 
 p obj1.to_ruby
  # => [1, 2.3, :a, "b", nil, [:c, [:d]]]
@@ -61,11 +61,13 @@ Or install it yourself as:
 
 The class `Elparser::Parser` is parser for emacs-lisp S-expression.
 The user program creates an instance of the class and parses the S-exp
-string with `parse` method.
+string with `parse1` method. If the source string has multiple
+S-expressions, one can use `parse` method.
 
-If the `parse` method succeed in parsing the given S-exp string, it
-returns a `SExp` object which is AST of S-exp. Invoking `to_ruby`
-method of the `SExp` object, one can obtain a ruby object.
+If the `Parser#parse1` method succeed in parsing the given S-exp
+string, it returns a `SExp` object which is AST of S-exp. Invoking
+`to_ruby` method of the `SExp` object, one can obtain a ruby object.
+`Parser#parse` method returns an array of `SExp` objects.
 
 The `SExp` objects are instances of `SExpXXX` classes: `SExpNumber`,
 `SExpString`, `SExpSymbol`, `SExpNil`, `SExpCons`, `SExpList`,
@@ -78,7 +80,9 @@ a `Hash` object can be obtained.
 ### Encoder
 
 The module method `Elparser::encode` encodes the ruby objects into
-elisp S-expressions.
+elisp S-expressions. The another method `Elparser::encode_multi`
+receives an array of ruby objects and returns a S-expression string in
+which multiple S-expressions are concatenated.
 
 If an object which is not defined in serialization rules is given,
 this method raises the exception `StandardError` with some messages.
@@ -129,3 +133,7 @@ such S-expressions with creating instances of `SExpCons` and
 | hash       | `{"a" => "b", "c" => "d"}`               | `(("a" . "b") ("c" . "d"))`  |
 | hash       | `{:a => [1,2,3], :b => {:c => [4,5,6]}}` | `((a 1 2 3) (b (c 4 5 6)))`  |
 
+## License
+
+Copyright (c) 2015 SAKURAI Masashi
+Released under the MIT license

data/lib/elparser/parser.tab.rb

@@ -10,65 +10,67 @@ module Elparser
 ##### State transition tables begin ###
 
 racc_action_table = [
-    10,    21,    11,    12,    16,    13,    14,    15,    10,    26,
-    11,    12,   nil,    13,    14,    15,    10,    19,    11,    12,
-   nil,    13,    14,    15,    10,   nil,    11,    12,   nil,    13,
-    14,    15,    10,    24,    11,    12,    23,    13,    14,    15 ]
+    11,    22,    12,    13,    17,    14,    15,    16,    11,    26,
+    12,    13,   nil,    14,    15,    16,    11,   nil,    12,    13,
+   nil,    14,    15,    16,    11,    20,    12,    13,   nil,    14,
+    15,    16,    11,    24,    12,    13,    23,    14,    15,    16,
+    11,   nil,    12,    13,   nil,    14,    15,    16 ]
 
 racc_action_check = [
-     0,    16,     0,     0,     1,     0,     0,     0,    23,    25,
-    23,    23,   nil,    23,    23,    23,    10,    10,    10,    10,
-   nil,    10,    10,    10,    13,   nil,    13,    13,   nil,    13,
-    13,    13,    18,    18,    18,    18,    18,    18,    18,    18 ]
+     0,    17,     0,     0,     1,     0,     0,     0,    23,    25,
+    23,    23,   nil,    23,    23,    23,     2,   nil,     2,     2,
+   nil,     2,     2,     2,    11,    11,    11,    11,   nil,    11,
+    11,    11,    19,    19,    19,    19,    19,    19,    19,    19,
+    14,   nil,    14,    14,   nil,    14,    14,    14 ]
 
 racc_action_pointer = [
-    -2,     4,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-    14,   nil,   nil,    22,   nil,   nil,     1,   nil,    30,   nil,
+    -2,     4,    14,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,    22,   nil,   nil,    38,   nil,   nil,     1,   nil,    30,
    nil,   nil,   nil,     6,   nil,     6,   nil ]
 
 racc_action_default = [
    -19,   -19,    -1,    -2,    -3,    -4,    -5,    -6,    -7,    -8,
-   -19,   -12,   -13,   -19,   -17,   -18,   -19,    -9,   -19,   -11,
-   -16,    27,   -10,   -19,   -15,   -19,   -14 ]
+    -9,   -19,   -12,   -13,   -19,   -17,   -18,   -19,   -10,   -19,
+   -11,   -16,    27,   -19,   -15,   -19,   -14 ]
 
 racc_goto_table = [
-     2,     1,    18,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-    17,   nil,   nil,    20,   nil,   nil,   nil,   nil,    22,   nil,
-   nil,   nil,   nil,    25 ]
+    18,     1,     2,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    21,    19,   nil,   nil,   nil,    18,   nil,   nil,
+   nil,    25 ]
 
 racc_goto_check = [
-     2,     1,    10,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-     2,   nil,   nil,     2,   nil,   nil,   nil,   nil,     2,   nil,
-   nil,   nil,   nil,     2 ]
+     3,     1,     2,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,     3,     2,   nil,   nil,   nil,     3,   nil,   nil,
+   nil,     3 ]
 
 racc_goto_pointer = [
-   nil,     1,     0,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-    -8 ]
+   nil,     1,     2,    -2,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil ]
 
 racc_goto_default = [
-   nil,   nil,   nil,     3,     4,     5,     6,     7,     8,     9,
-   nil ]
+   nil,   nil,   nil,    10,     3,     4,     5,     6,     7,     8,
+     9 ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
-  1, 11, :_reduce_1,
-  1, 12, :_reduce_none,
-  1, 12, :_reduce_none,
-  1, 12, :_reduce_none,
-  1, 12, :_reduce_none,
-  1, 12, :_reduce_none,
-  1, 12, :_reduce_none,
-  1, 12, :_reduce_none,
-  1, 20, :_reduce_9,
-  2, 20, :_reduce_10,
-  2, 13, :_reduce_11,
-  1, 14, :_reduce_12,
-  1, 14, :_reduce_13,
-  5, 15, :_reduce_14,
-  3, 18, :_reduce_15,
-  2, 19, :_reduce_16,
-  1, 16, :_reduce_17,
-  1, 17, :_reduce_18 ]
+  1, 11, :_reduce_none,
+  1, 13, :_reduce_none,
+  1, 13, :_reduce_none,
+  1, 13, :_reduce_none,
+  1, 13, :_reduce_none,
+  1, 13, :_reduce_none,
+  1, 13, :_reduce_none,
+  1, 13, :_reduce_none,
+  1, 12, :_reduce_9,
+  2, 12, :_reduce_10,
+  2, 14, :_reduce_11,
+  1, 15, :_reduce_12,
+  1, 15, :_reduce_13,
+  5, 16, :_reduce_14,
+  3, 19, :_reduce_15,
+  2, 20, :_reduce_16,
+  1, 17, :_reduce_17,
+  1, 18, :_reduce_18 ]
 
 racc_reduce_n = 19
 
@@ -119,6 +121,7 @@ Racc_token_to_s_table = [
   "STRING",
   "$start",
   "target",
+  "sexp_seq",
   "sexp",
   "nil",
   "val",
@@ -126,8 +129,7 @@ Racc_token_to_s_table = [
   "symbol",
   "string",
   "list",
-  "quoted",
-  "sexp_seq" ]
+  "quoted" ]
 
 Racc_debug_parser = false
 
@@ -135,12 +137,7 @@ Racc_debug_parser = false
 
 # reduce 0 omitted
 
-module_eval(<<'.,.,', 'parser.y', 3)
-  def _reduce_1(val, _values, result)
-    
-    result
-  end
-.,.,
+# reduce 1 omitted
 
 # reduce 2 omitted
 

data/lib/elparser/parser.y

@@ -1,9 +1,9 @@
 class Elparser::Parser
 
 rule
-   target: sexp {}
+   target: sexp_seq
    
-   sexp: nil | val | cons | symbol | string | list | quoted;
+   sexp: nil | val | cons | symbol | string | list | quoted
    
    sexp_seq: sexp { result = [val[0]] }
            | sexp_seq sexp { result << val[1] }

data/lib/elparser/version.rb

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

data/lib/elparser.rb

@@ -219,6 +219,11 @@ module Elparser
   # parser class for 
   class Parser
 
+    # parse s-expression string and return one sexp object.
+    def parse1(str)
+      parse(str)[0]
+    end
+
     # parse s-expression string and return sexp objects.
     def parse(str)
       s = StringScanner.new str
@@ -236,7 +241,9 @@ module Elparser
       end
       @tokens.push [false, '$end']
       
-      normalize do_parse
+      return do_parse.map do |i|
+        normalize(i)
+      end
     end
 
     def next_token
@@ -262,9 +269,15 @@ module Elparser
   end
 
   
-  # translate ruby objects to s-expression string.
-  def self.encode(arg)
-    return _encode(arg).to_s
+  # Translate a ruby object to s-expression string.
+  def self.encode(obj)
+    return _encode(obj).to_s
+  end
+
+  # Translate many ruby objects to s-expression string.
+  # The result s-exps are concatenated into one string.
+  def self.encode_multi(objs, sep = "\n")
+    return objs.map {|obj| _encode(obj).to_s }.join(sep)
   end
 
   private 

data/test/test-elparser.rb

@@ -68,11 +68,17 @@ class TestElparser < Test::Unit::TestCase
            })
       def test_primitive(data)
         src, expected = data
-        assert_equal expected, @parser.parse(src)
+        assert_equal expected, @parser.parse1(src)
       end
     
     end
 
+    test "Multiple S-exp" do
+      src = "(1 2) (3 4)"
+      exp = [_list(_int(1),_int(2)),_list(_int(3),_int(4))]
+      assert_equal exp, @parser.parse(src)
+    end
+
     sub_test_case "List Structure" do
       
       data({
@@ -89,7 +95,7 @@ class TestElparser < Test::Unit::TestCase
            })
       def test_list(data)
         src, expected = data
-        assert_equal expected, @parser.parse(src)
+        assert_equal expected, @parser.parse1(src)
       end
       
     end
@@ -97,13 +103,13 @@ class TestElparser < Test::Unit::TestCase
     sub_test_case "Cons and List operation" do
       
       def test_cons1
-        v = @parser.parse("(1 . 2)")
+        v = @parser.parse1("(1 . 2)")
         assert_equal _int(1), v.car
         assert_equal _int(2), v.cdr
       end
 
       def test_list1
-        v = @parser.parse("(1 2 3)")
+        v = @parser.parse1("(1 2 3)")
         assert_equal _int(1), v.car
         assert_equal _int(2), v.cdr.car
         assert_equal _int(3), v.cdr.cdr.car
@@ -111,14 +117,14 @@ class TestElparser < Test::Unit::TestCase
       end
 
       def test_dotlist
-        v = @parser.parse("(1 2 . 3)")
+        v = @parser.parse1("(1 2 . 3)")
         assert_equal _int(1), v.car
         assert_equal _int(2), v.cdr.car
         assert_equal _int(3), v.cdr.cdr
       end
 
       def test_ruby_object
-        v = @parser.parse("(1 2.1 \"xxx\" www)")
+        v = @parser.parse1("(1 2.1 \"xxx\" www)")
         ro = v.to_ruby
         assert_equal ro.size, 4
         assert_equal ro[0], 1
@@ -126,7 +132,7 @@ class TestElparser < Test::Unit::TestCase
         assert_equal ro[2], "xxx"
         assert_equal ro[3], :www
 
-        v = @parser.parse("(1 (2 3 (4)))")
+        v = @parser.parse1("(1 (2 3 (4)))")
         ro = v.to_ruby
         assert_equal ro.size, 2
         assert_equal ro[0], 1
@@ -136,7 +142,7 @@ class TestElparser < Test::Unit::TestCase
       end
 
       def test_alist
-        v = @parser.parse("( (a . 1) (b . \"xxx\") (c 3 4) (\"d\" . \"e\"))")
+        v = @parser.parse1("( (a . 1) (b . \"xxx\") (c 3 4) (\"d\" . \"e\"))")
         assert_true v.alist?
         hash = v.to_h
         assert_equal hash[:a], 1
@@ -144,9 +150,9 @@ class TestElparser < Test::Unit::TestCase
         assert_equal hash[:c], [3,4]
         assert_equal hash["d"], "e"
 
-        v = @parser.parse("((a . 1) (b))")
+        v = @parser.parse1("((a . 1) (b))")
         assert_true v.alist?
-        v = @parser.parse("((a . 1) b)")
+        v = @parser.parse1("((a . 1) b)")
         assert_false v.alist?
       end
 
@@ -169,6 +175,19 @@ class TestElparser < Test::Unit::TestCase
       assert_equal(expected, Elparser.encode(src))
     end
 
+    def test_multiple_lines
+      src = [
+             [:defvar, :abc, 1, "var doc"],
+             [:defun, :cdef, [:'&optional', :a, :b],
+              [:interactive],
+              [:message, "hello world"],
+             ],
+            ]
+      exp = "(defvar abc 1 \"var doc\")
+(defun cdef (&optional a b) (interactive) (message \"hello world\"))"
+      assert_equal(exp, Elparser.encode_multi(src))
+    end
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elparser
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - SAKURAI Masashi