Refactoring: by lit.assert

dist/lin.lua

@@ -6718,16 +6718,13 @@ ERROR:
   end
 end
 
--- TODO
-function lit.assert(e, status)
-  if status == false then
-    lit.puts("aborted")
-    os.exit(1)
-  end
-  return e
+function lit.insert(code)
+  return code
 end
 
-function lit.getblock(codeblock)
+function lit.parse(blocks)
+
+	local function parse(codeblock, islast)
 
 	  local function checkextra(meta)
 		  for key, val in pairs(meta) do
@@ -6766,7 +6763,7 @@ function lit.getblock(codeblock)
 			    return key
 		    end
 
-      local val = meta[key]
+		    local val = tostring(meta[key])
 	  	  local err = checkmatch(table, val, key)
   		  if not(err:isempty()) then
     			lit.puts("invalid_value", val, err)
@@ -6819,40 +6816,36 @@ function lit.getblock(codeblock)
 
 	  local parsed = lpeg.match(lit.g("block"), codeblock.text)
 	  parsed = (parsed ~= nil and inspect(parsed) or parsed)
-  return codeblock, lit.status
+    if islast and not(lit.status) then
+      lit.puts("aborted")
+      os.exit(1)
+    end
+    return codeblock
 	end
 
-function lit.getinsert(code)
-  return code, lit.status
+  local function lastblockindex()
+    local last = 0
+    blocks:walk { CodeBlock = function(_) last = last + 1 end }
+    return last
+  end
+
+  local curr = 0
+  return blocks:walk {
+    CodeBlock = function(codeblock)
+      curr = curr + 1
+      return parse(codeblock, curr == lastblockindex())
+    end
+  }
 end
 
 ------------------------------------ PANDOC -----------------------------------
 
-local litstatus = true
-
 return {
-  {
   -- Parses and evals literate blocks
-    CodeBlock = function(codeblock)
-      codeblock, litstatus = lit.getblock(codeblock)
-      return codeblock
-    end,
-    -- Asserts literate
-    Pandoc = function(pandoc)
-      return lit.assert(pandoc, litstatus) 
-    end,
-  },
+  { Blocks = function(blocks) return lit.parse(blocks) end },
+  -- Parses and inserts literate evals
+  { Code = function(code) return lit.insert(code) end },
   {
-    -- Parses literate inserts
-    Code = function(code)
-      code, litstatus = lit.getinsert(code)
-      return code
-    end,
-    -- Asserts literate
-    Pandoc = function(pandoc)
-      return lit.assert(pandoc, litstatus) 
-    end,
-  }, {
     -- Parses and evals natural programming
     -- TODO
     Inlines = function(inlines)

src/literate.lua

@@ -165,16 +165,13 @@ function lit.puts(key, ...)
   end
 end
 
--- TODO
-function lit.assert(e, status)
-  if status == false then
-    lit.puts("aborted")
-    os.exit(1)
-  end
-  return e
+function lit.insert(code)
+  return code
 end
 
-function lit.getblock(codeblock)
+function lit.parse(blocks)
+
+	local function parse(codeblock, islast)
 
 	  local function checkextra(meta)
 		  for key, val in pairs(meta) do
@@ -213,7 +210,7 @@ function lit.getblock(codeblock)
 			    return key
 		    end
 
-      local val = meta[key]
+		    local val = tostring(meta[key])
 	  	  local err = checkmatch(table, val, key)
   		  if not(err:isempty()) then
     			lit.puts("invalid_value", val, err)
@@ -266,11 +263,26 @@ function lit.getblock(codeblock)
 
 	  local parsed = lpeg.match(lit.g("block"), codeblock.text)
 	  parsed = (parsed ~= nil and inspect(parsed) or parsed)
-  return codeblock, lit.status
+    if islast and not(lit.status) then
+      lit.puts("aborted")
+      os.exit(1)
+    end
+    return codeblock
 	end
 
-function lit.getinsert(code)
-  return code, lit.status
+  local function lastblockindex()
+    local last = 0
+    blocks:walk { CodeBlock = function(_) last = last + 1 end }
+    return last
+  end
+
+  local curr = 0
+  return blocks:walk {
+    CodeBlock = function(codeblock)
+      curr = curr + 1
+      return parse(codeblock, curr == lastblockindex())
+    end
+  }
 end
 
 return lit

src/pandoc.lua

@@ -1,30 +1,11 @@
 ------------------------------------ PANDOC -----------------------------------
 
-local litstatus = true
-
 return {
-  {
   -- Parses and evals literate blocks
-    CodeBlock = function(codeblock)
-      codeblock, litstatus = lit.getblock(codeblock)
-      return codeblock
-    end,
-    -- Asserts literate
-    Pandoc = function(pandoc)
-      return lit.assert(pandoc, litstatus) 
-    end,
-  },
+  { Blocks = function(blocks) return lit.parse(blocks) end },
+  -- Parses and inserts literate evals
+  { Code = function(code) return lit.insert(code) end },
   {
-    -- Parses literate inserts
-    Code = function(code)
-      code, litstatus = lit.getinsert(code)
-      return code
-    end,
-    -- Asserts literate
-    Pandoc = function(pandoc)
-      return lit.assert(pandoc, litstatus) 
-    end,
-  }, {
     -- Parses and evals natural programming
     -- TODO
     Inlines = function(inlines)