talked to the comments. still haunted by a bug whenever the first comment of comment block is line comment and there’s no blank succeding it. otherwise they’re behaving rationally.

2 files changed, 17 insertions, 38 deletions

diff --git a/rst_context.lua b/rst_context.lua
index 9112786..6ace513 100644
--- a/rst_context.lua
+++ b/rst_context.lua
@@ -477,7 +477,6 @@ function rst_context.paragraph (data)
     else
         str = data
     end
-    print(str)
     return string.format([[
 
 \\startparagraph
@@ -704,15 +703,16 @@ function rst_context.field (tab)
 end
 
 function rst_context.line_comment (str)
+    print(">>"..str.."<<")
     return "% " .. str
 end
 
 function rst_context.block_comment (str)
+    print(">>"..str.."<<")
     return string.format([[
 
 \iffalse
-%s
-\fi
+%s\fi
 ]], str)
 end
 
diff --git a/rst_parser.lua b/rst_parser.lua
index f09e959..0901de4 100644
--- a/rst_parser.lua
+++ b/rst_parser.lua
@@ -36,8 +36,6 @@ local warn = function(str, ...)
     return 0
 end
 
-local debugme = function(x) print ("HERE >"..x.."<") return x end
-
 local C, Cb, Cc, Cg, Cmt, Cp, Cs, Ct 
     = lpeg.C, lpeg.Cb, lpeg.Cc, lpeg.Cg, lpeg.Cmt, lpeg.Cp, lpeg.Cs, lpeg.Ct
 
@@ -108,7 +106,7 @@ local parser = P{
           + Cs(V"transition")  --/ rst.escape
           + V"literal_block"
           + Cs(V"block_quote") / rst.escape
-          + V"comment"
+          + V"comment_block"
           + Cs(V"paragraph")   / rst.escape
           ,
 
@@ -121,15 +119,8 @@ local parser = P{
     explicit_markup = V"footnote_block"
                     --+ V"directive"
                     + V"substitution_definition"
-                    --+ V"comment block"
                     ,
 
-    --explicit_markup = V"substitution_definition"
-                    ----+ V"directive"
-                    --+ V"footnote_block"
-                    ----+ V"comment block"
-                    --,
-
     explicit_markup_block = V"explicit_markup"^1
                           * V"end_block"
                           ,
@@ -146,7 +137,6 @@ local parser = P{
                             * C((1 - V"colon" - V"space" - V"eol")^1) -- directive
                             * V"double_colon"
                             * Ct(V"data_directive_block")
-                            --* V"blank_line"^-1
                             / rst.substitution_definition
                             ,
 
@@ -1055,33 +1045,34 @@ local parser = P{
 -- Comments
 --------------------------------------------------------------------------------
 
-    --comment_block = V"comment" * (V"blank_line"^-1 * V"comment")^0,
-    comment = (V"double_dot" * V"whitespace"^0) / ""
-            * ((V"block_comment" + V"line_comment") - V"footnote_marker" - V"bar")
+    comment_block = V"comment"^1
+                  * V"end_block"
+                  ,
+
+    comment = V"double_dot" / ""
+            * (V"block_comment" + V"line_comment")
             ,
 
     block_comment = V"eol"
                   * Cs(V"indented_lines")
-                  * V"end_block"
                   / rst.block_comment,
 
-    line_comment = Cs((1 - V"eol")^0 * V"eol")  * V"end_block"^-1
-                / rst.line_comment,
+    line_comment = V"whitespace"^1
+                 * Cs((1 - V"eol")^0 * V"eol")
+                 / rst.line_comment
+                 ,
 
 --------------------------------------------------------------------------------
 -- Generic indented block
 --------------------------------------------------------------------------------
 
     indented_lines = V"indented_first"
-                   * (V"indented_other"
-                    - V"blank_line" - V"field_marker")^0,
+                   * (V"indented_other"^0
+                    * (V"blank_line" * V"indented_other"^1)^0)
+                   ,
 
     indented_first = Cmt(V"space"^1, function (s, i, indent)
                         warn("idt-f", indent, i)
-                        --if not indent    or
-                            --indent == "" then
-                            --return false
-                        --end
                         state.currentindent = indent
                         return true
                     end)
@@ -1310,18 +1301,6 @@ local function main()
     else
         return 1
     end
-
-    --for i,j in next, rst.context_references do
-        --print(i,j[1], j[2])
-    --end
-
-    --print(">>>Last used char>: " ..state.lastbullet.." <<<<")
-    --print(">>>Max list nestin>: "..state.bullets.max .." <<<<")
-
-    --for i,j in next, rst.collected_references do
-        --print (string.format("== %7s => %s <=", i,j))
-    --end
-    --parser:print()
     return 0
 end