mok-parser 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8d9c6ea441f7a52b43f6409470471656918817b
-  data.tar.gz: 5ccf2028ee649ae65ed8b24a3d9abeba5d0227a6
+  metadata.gz: de67b5512a58b3922c5cff99c8ef6684992170b4
+  data.tar.gz: 08559b49ab0865d3a5707f9825c191ef89f6b692
 SHA512:
-  metadata.gz: f1aa94bb504512f5e2d6ecd73fe811b03e8be38ede030a347457dae34bc22b09905b4c9f428c76e30deca025f178e68201e03b04e64340ce9c3bddf32d580cb0
-  data.tar.gz: 01db7cdb5d42e0179d6f19d2b22f1e67aa8336dfeaaa0844778166eed55f8409693d515e393548c000136e3fca1fead56ea24d25e7a8bf0a88f2946f4ec18281
+  metadata.gz: 59c011913a4536fcfb66b784ce6033976d54f90682f5bdbad43aae2eb9f8e3c32a6c884546ffc05447bce332bed026a41d5e0031d5b083d2de188cf2641fbccf
+  data.tar.gz: fe0e0948eb27556e17abb0f55e95634dfd790651b0b48fcacb801f068f09b3e6f822e91190708d961d866bd08ef1e1ca96d767c2482f89cc59aac24996f799ed

data/History.rdoc

@@ -1,3 +1,9 @@
+== 0.3.3 2013-12-31
+* new: インラインのパーサーエラー時に行数と内容を表示
+* new: ドキュメント内プログラムのスイッチオプション(@options[:erb])を追加
+* fix: ドキュメントが空の時に Racc::ParseError の例外が発生しないように修正
+* fix: 変数定義((@a=b@))内でオプション設定が必要な機能(リファレンスの.%など)が動いていなかった問題を修正
+
 == 0.3.2 2013-12-20
 * new: 部分テンプレート(partial)機能を試験的に追加
 * change: _base_directory オプションを *_directory に変更

data/RELEASE

@@ -1 +1 @@
-2013-12-21
+2013-12-31

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/lib/mokblockparser.ry

@@ -47,7 +47,7 @@ class BlockParser
                         @index[:head] << {:title => title, :level => level, :index => @head_index.to_s}
                         HeadLine.new([level, title, @index[:head].size, @head_index.to_s]) }
   # ----- paragraph
-  paragraph : plain_texts { Paragraph.new @inline_parser.parse(val) }
+  paragraph : plain_texts { Paragraph.new @inline_parser.parse(val, @no) }
 
   plain_texts : PLAIN { val[0] }
               | plain_texts PLAIN { val[0] + val[1] }
@@ -57,7 +57,7 @@ class BlockParser
                  if val[1].nil?
                    lines = [Plain.new("")]
                  else
-                   lines = @inline_parser.parse(val[1])
+                   lines = @inline_parser.parse(val[1], @no)
                  end
                  Desc.new([val[0], lines])
                }
@@ -76,7 +76,7 @@ class BlockParser
 
   # ----- preformat end
   # ----- quote
-  quote_block : quotes { qu = val[0].strip  ; Quote.new(@inline_parser.parse(qu)) unless qu.empty? }
+  quote_block : quotes { qu = val[0].strip  ; Quote.new(@inline_parser.parse(qu, @no)) unless qu.empty? }
 
   quotes      : QUOTE { val[0] }
               | quotes QUOTE { val[0] + val[1] }
@@ -91,8 +91,8 @@ class BlockParser
 
   itemlist_indent_blocks : INDENT itemlist_blocks DEDENT { val }
 
-  itemlists : itemlistitems {[PlainTextBlock.new(@inline_parser.parse(val[0]))]}
-            | itemlists itemlistitems { val[0] << PlainTextBlock.new(@inline_parser.parse(val[1])) }
+  itemlists : itemlistitems {[PlainTextBlock.new(@inline_parser.parse(val[0], @no))]}
+            | itemlists itemlistitems { val[0] << PlainTextBlock.new(@inline_parser.parse(val[1],@no)) }
 
   itemlistitems : ITEMLIST { val[0] }
                 | ITEMLIST itemlist_continues { val[0] + val[1] }
@@ -110,8 +110,8 @@ class BlockParser
 
   numlist_indent_blocks : INDENT numlist_blocks DEDENT { val }
 
-  numlists : NUMLIST { [PlainTextBlock.new(@inline_parser.parse(val[0]))] }
-           | numlists NUMLIST { val[0] << PlainTextBlock.new(@inline_parser.parse(val[1])) }
+  numlists : NUMLIST { [PlainTextBlock.new(@inline_parser.parse(val[0],@no))] }
+           | numlists NUMLIST { val[0] << PlainTextBlock.new(@inline_parser.parse(val[1],@no)) }
 
   # ----- numlist end
 
@@ -158,8 +158,14 @@ attr_reader :metadata, :inline_index, :index
 
 def parse(src)
   @no = 0
+
+  # srcが空の時の対応
+  src = ["# No Document"] if src.size == 0
+
   # srcをerbで処理
-  src = ERB.new(src.join,4).result(binding.taint).split("\n").map {|s| "#{s}\n"}
+  if @options[:erb]
+    src = ERB.new(src.join,4).result(binding.taint).split("\n").map {|s| "#{s}\n"}
+  end
 
   # 部分テンプレート(partial)
   src = insert_partial(src)

data/lib/mokblockparser.tab.rb

@@ -49,8 +49,14 @@ attr_reader :metadata, :inline_index, :index
 
 def parse(src)
   @no = 0
+
+  # srcが空の時の対応
+  src = ["# No Document"] if src.size == 0
+
   # srcをerbで処理
-  src = ERB.new(src.join,4).result(binding.taint).split("\n").map {|s| "#{s}\n"}
+  if @options[:erb]
+    src = ERB.new(src.join,4).result(binding.taint).split("\n").map {|s| "#{s}\n"}
+  end
 
   # 部分テンプレート(partial)
   src = insert_partial(src)
@@ -568,7 +574,7 @@ module_eval(<<'.,.,', 'mokblockparser.ry', 36)
 
 module_eval(<<'.,.,', 'mokblockparser.ry', 49)
   def _reduce_16(val, _values)
-     Paragraph.new @inline_parser.parse(val) 
+     Paragraph.new @inline_parser.parse(val, @no) 
   end
 .,.,
 
@@ -589,7 +595,7 @@ module_eval(<<'.,.,', 'mokblockparser.ry', 56)
                      if val[1].nil?
                    lines = [Plain.new("")]
                  else
-                   lines = @inline_parser.parse(val[1])
+                   lines = @inline_parser.parse(val[1], @no)
                  end
                  Desc.new([val[0], lines])
                
@@ -630,7 +636,7 @@ module_eval(<<'.,.,', 'mokblockparser.ry', 74)
 
 module_eval(<<'.,.,', 'mokblockparser.ry', 78)
   def _reduce_26(val, _values)
-     qu = val[0].strip  ; Quote.new(@inline_parser.parse(qu)) unless qu.empty? 
+     qu = val[0].strip  ; Quote.new(@inline_parser.parse(qu, @no)) unless qu.empty? 
   end
 .,.,
 
@@ -678,13 +684,13 @@ module_eval(<<'.,.,', 'mokblockparser.ry', 91)
 
 module_eval(<<'.,.,', 'mokblockparser.ry', 93)
   def _reduce_34(val, _values)
-    [PlainTextBlock.new(@inline_parser.parse(val[0]))]
+    [PlainTextBlock.new(@inline_parser.parse(val[0], @no))]
   end
 .,.,
 
 module_eval(<<'.,.,', 'mokblockparser.ry', 94)
   def _reduce_35(val, _values)
-     val[0] << PlainTextBlock.new(@inline_parser.parse(val[1])) 
+     val[0] << PlainTextBlock.new(@inline_parser.parse(val[1],@no)) 
   end
 .,.,
 
@@ -744,13 +750,13 @@ module_eval(<<'.,.,', 'mokblockparser.ry', 110)
 
 module_eval(<<'.,.,', 'mokblockparser.ry', 112)
   def _reduce_45(val, _values)
-     [PlainTextBlock.new(@inline_parser.parse(val[0]))] 
+     [PlainTextBlock.new(@inline_parser.parse(val[0],@no))] 
   end
 .,.,
 
 module_eval(<<'.,.,', 'mokblockparser.ry', 113)
   def _reduce_46(val, _values)
-     val[0] << PlainTextBlock.new(@inline_parser.parse(val[1])) 
+     val[0] << PlainTextBlock.new(@inline_parser.parse(val[1],@no)) 
   end
 .,.,
 

data/lib/mokinlineparser.ry

@@ -164,7 +164,7 @@ class InlineParser
 		  @variables[base] = text unless text.nil?
 		  value = @variables[base]
 		  unless value.nil?
-		    parser = InlineParser.new
+		    parser = InlineParser.new(@options)
  		    value = parser.parse(value).map do |n| n.apply end
 		  else	# 変数が未定義
 		    value = base
@@ -357,13 +357,20 @@ other_re_mode = Regexp::MULTILINE
 OTHER_RE = Regexp.new(
                       "\\A.+?(?=#{Regexp.quote(EM_OPEN)}|#{Regexp.quote(EM_CLOSE)}|#{Regexp.quote(ITALIC_OPEN)}|#{Regexp.quote(ITALIC_CLOSE)}|#{Regexp.quote(STRIKE_OPEN)}|#{Regexp.quote(STRIKE_CLOSE)}|#{Regexp.quote(CODE_OPEN)}|#{Regexp.quote(CODE_CLOSE)}|#{Regexp.quote(KBD_OPEN)}|#{Regexp.quote(KBD_CLOSE)}|#{Regexp.quote(FOOTNOTE_OPEN)}|#{Regexp.quote(FOOTNOTE_CLOSE)}|#{Regexp.quote(RUBY_OPEN)}|#{Regexp.quote(RUBY_CLOSE)}|#{Regexp.quote(VARIABLE_OPEN)}|#{Regexp.quote(VARIABLE_CLOSE)}|#{Regexp.quote(MEDIA_OPEN)}|#{Regexp.quote(MEDIA_CLOSE)}|#{Regexp.quote(LABEL_OPEN)}|#{Regexp.quote(LABEL_CLOSE)}|#{Regexp.quote(LABEL_LINK_OPEN)}|#{Regexp.quote(LABEL_LINK_CLOSE)}|#{Regexp.quote(LABEL_HTML_OPEN)}|#{Regexp.quote(LABEL_HTML_CLOSE)}|#{Regexp.quote(REFERENCE_OPEN)}|#{Regexp.quote(REFERENCE_CLOSE)}|#{Regexp.quote(REFERENCE_HTML_OPEN)}|#{Regexp.quote(REFERENCE_HTML_CLOSE)}|#{Regexp.quote(MANUEDO_OPEN)}|#{Regexp.quote(MANUEDO_CLOSE)}|#{Regexp.quote(VERB_OPEN)}|#{Regexp.quote(VERB_CLOSE)})", other_re_mode)
 
-def parse(src)
+def on_error(token_id, value, stack)
+  raise Racc::ParseError,
+        "mokinlinepaser: line #{@lineno} in document: syntax error on '#{stack[0][0].contents}#{stack[1]}'"
+end
+
+def parse(src, lineno = "?")
   @src = StringScanner.new(Array(src).join)
+  @lineno = lineno
   @pre = ""
   @@yydebug = false
   @view_token_type = false
   do_parse
 end
+
 def initialize(options = {})
   @options = options
   @variables = options[:variables]

data/lib/mokinlineparser.tab.rb

@@ -107,12 +107,23 @@ other_re_mode = Regexp::MULTILINE
 OTHER_RE = Regexp.new(
                       "\\A.+?(?=#{Regexp.quote(EM_OPEN)}|#{Regexp.quote(EM_CLOSE)}|#{Regexp.quote(ITALIC_OPEN)}|#{Regexp.quote(ITALIC_CLOSE)}|#{Regexp.quote(STRIKE_OPEN)}|#{Regexp.quote(STRIKE_CLOSE)}|#{Regexp.quote(CODE_OPEN)}|#{Regexp.quote(CODE_CLOSE)}|#{Regexp.quote(KBD_OPEN)}|#{Regexp.quote(KBD_CLOSE)}|#{Regexp.quote(FOOTNOTE_OPEN)}|#{Regexp.quote(FOOTNOTE_CLOSE)}|#{Regexp.quote(RUBY_OPEN)}|#{Regexp.quote(RUBY_CLOSE)}|#{Regexp.quote(VARIABLE_OPEN)}|#{Regexp.quote(VARIABLE_CLOSE)}|#{Regexp.quote(MEDIA_OPEN)}|#{Regexp.quote(MEDIA_CLOSE)}|#{Regexp.quote(LABEL_OPEN)}|#{Regexp.quote(LABEL_CLOSE)}|#{Regexp.quote(LABEL_LINK_OPEN)}|#{Regexp.quote(LABEL_LINK_CLOSE)}|#{Regexp.quote(LABEL_HTML_OPEN)}|#{Regexp.quote(LABEL_HTML_CLOSE)}|#{Regexp.quote(REFERENCE_OPEN)}|#{Regexp.quote(REFERENCE_CLOSE)}|#{Regexp.quote(REFERENCE_HTML_OPEN)}|#{Regexp.quote(REFERENCE_HTML_CLOSE)}|#{Regexp.quote(MANUEDO_OPEN)}|#{Regexp.quote(MANUEDO_CLOSE)}|#{Regexp.quote(VERB_OPEN)}|#{Regexp.quote(VERB_CLOSE)})", other_re_mode)
 
-def parse(src)
+def on_error(token_id, value, stack)
+
+  raise Racc::ParseError,
+        "mokinlinepaser: line #{@lineno} in document: syntax error on '#{stack[0][0].contents}#{stack[1]}'"
+end
+
+def parse(src, lineno = "?")
   @src = StringScanner.new(Array(src).join)
+  @lineno = lineno
   @pre = ""
   @@yydebug = false
   @view_token_type = false
-  do_parse
+#  begin
+    do_parse
+#  rescue Racc::ParseError
+#    puts "Racc::ParseError desu"
+#  end
 end
 def initialize(options = {})
   @options = options
@@ -1068,7 +1079,7 @@ module_eval(<<'.,.,', 'mokinlineparser.ry', 161)
 		  @variables[base] = text unless text.nil?
 		  value = @variables[base]
 		  unless value.nil?
-		    parser = InlineParser.new
+		    parser = InlineParser.new(@options)
  		    value = parser.parse(value).map do |n| n.apply end
 		  else	# 変数が未定義
 		    value = base

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mok-parser
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - garin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-21 00:00:00.000000000 Z
+date: 2013-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler