pseudohikiparser 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7908f80b410e064b7380cee7982c351257e578cd
-  data.tar.gz: 193bb4b76c97e2936a87f1f6da83cbc42ee788db
+  metadata.gz: b6aeacee81ab200ae29767f62343c2c8c3b6383b
+  data.tar.gz: 29c8d6ef7d5546530c0836173b503346c1270f97
 SHA512:
-  metadata.gz: 02659c1d1e708819e9b1ed50cf65a89c348ff2c92a840daee52bb8e32d70dd0c6b4af2ab8a090ecce06557811274a9f763fec897da174193603421de3e736ff8
-  data.tar.gz: 24e068590d29996d995de41bac263451a4eb994d1241a61d27626934914ad59de3286466b0c135ac7cf634ac220c984800574efa59124d712a7beb4f9bbf717d
+  metadata.gz: b9e0df31b3ca4d2e347f9ef841f0c86c13bb8398f477f2d2b85fc6185ab9ce54c7ba0420bfa09ebb7e30d12baa26da76f3d8557e90c0df2fda7ed62114efd53c
+  data.tar.gz: abf97289e38d87b669af8ee08a7076fd72f684bab2115be9aef9dbf7512b076fe90c95d0392408cf255c3e1482abe08bc952b8d6ce7af96da21fc4557e97dc23

data/lib/pseudohiki/blockparser.rb

@@ -293,28 +293,30 @@ module PseudoHiki
 
     def self.assign_head_re
       irregular_leafs = [BlockNodeEnd, VerbatimLeaf, HrLeaf]
-      head_pats, leaf_types = [], [:entire_matched_part]
+      irregular_head_pats, regular_leaf_types, head_to_leaf = [], [], {}
       [['\r?\n?$', BlockNodeEnd],
-       [':', DescLeaf],
        ['\s', VerbatimLeaf],
+       ['*', ListLeaf],
+       ['#', EnumLeaf],
+       [':', DescLeaf],
+       ['!', HeadingLeaf],
        ['""', QuoteLeaf],
        ['||', TableLeaf],
        ['//', CommentOutLeaf],
-       ['!', HeadingLeaf],
-       ['*', ListLeaf],
-       ['#', EnumLeaf],
        ['----\s*$', HrLeaf]
       ].each do |head, leaf|
         escaped_head = irregular_leafs.include?(leaf) ? head : Regexp.escape(head)
         head_pat = leaf.with_depth? ? "#{escaped_head}+" : "#{escaped_head}"
         leaf.head_re = Regexp.new('\\A'+head_pat)
-        head_pats.push "(#{escaped_head})"
-        leaf_types.push leaf
+        head_to_leaf[head] = leaf
+        irregular_head_pats.push "(#{escaped_head})" if irregular_leafs.include?(leaf)
+        regular_leaf_types.push head unless irregular_leafs.include?(leaf)
       end
-      return Regexp.new('\\A(?:'+head_pats.join('|')+')'), leaf_types, leaf_types.length - 1
+      irregular_leaf_types = [:entire_matched_part].concat(irregular_leafs)
+      return Regexp.new('\\A(?:'+irregular_head_pats.join('|')+')'), regular_leaf_types, head_to_leaf, irregular_leaf_types, irregular_leafs.length
     end
 
-    LEAF_HEAD_PAT, NOT_PARAGRAPH_LEAF_TYPES, NUMBER_OF_NOT_PARAGRAPH_LEAF_TYPES = assign_head_re
+    IRREGULAR_HEAD_PAT, REGULAR_LEAF_TYPES, HEAD_TO_LEAF, IRREGULAR_LEAF_TYPES, NUMBER_OF_IRREGULAR_LEAF_TYPES = assign_head_re
 
     def initialize
       root_node = BlockNode.new
@@ -329,9 +331,10 @@ module PseudoHiki
     end
 
     def select_leaf_type(line)
-      matched = LEAF_HEAD_PAT.match(line)
-      return ParagraphLeaf unless matched
-      1.upto(NUMBER_OF_NOT_PARAGRAPH_LEAF_TYPES) {|i| return NOT_PARAGRAPH_LEAF_TYPES[i] if matched[i] }
+      matched = IRREGULAR_HEAD_PAT.match(line)
+      1.upto(NUMBER_OF_IRREGULAR_LEAF_TYPES) {|i| return IRREGULAR_LEAF_TYPES[i] if matched[i] } if matched
+      REGULAR_LEAF_TYPES.each {|head| return HEAD_TO_LEAF[head] if line.start_with?(head) }
+      ParagraphLeaf
     end
 
     def read_lines(lines)

data/lib/pseudohiki/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pseudohikiparser
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - HASHIMOTO, Naoki