Merge pull request #8 from phi-gamma/master

sync with Context; merge util-jsn

2 files changed, 4 insertions, 11 deletions

diff --git a/lualibs-util-jsn.lua b/lualibs-util-jsn.lua
index 7493f10..29587cd 100644
--- a/lualibs-util-jsn.lua
+++ b/lualibs-util-jsn.lua
@@ -11,6 +11,9 @@ if not modules then modules = { } end modules ['util-jsn'] = {
 -- a correct stream. If not, we have some fatal error anyway. So, we can just rely
 -- on strings being strings (apart from the unicode escape which is not in 5.1) and
 -- as we first catch known types we just assume that anything else is a number.
+--
+-- Reminder for me: check usage in framework and extend when needed. Also document
+-- it in the cld lib documentation.
 
 local P, V, R, S, C, Cc, Cs, Ct, Cf, Cg = lpeg.P, lpeg.V, lpeg.R, lpeg.S, lpeg.C, lpeg.Cc, lpeg.Cs, lpeg.Ct, lpeg.Cf, lpeg.Cg
 local lpegmatch = lpeg.match
@@ -141,5 +144,3 @@ end
 -- inspect(tmp)
 
 -- inspect(json.tostring(true))
-
-return json
diff --git a/lualibs.dtx b/lualibs.dtx
index b8c74c0..b3e6bdb 100644
--- a/lualibs.dtx
+++ b/lualibs.dtx
@@ -403,12 +403,6 @@ and the derived file lualibs.lua.
 %   ...
 % \end{verbatim}\end{quote}
 %
-% Note that there is one exception to the packaging:
-% \fileent{lualibs-util-jsn.lua} cannot be successfully packaged because
-% it follows a different coding convention, returning a \LUA table on exit.
-% Therefore, the file is loaded separately as part of the \identifier{extended}
-% set like any other \LUA module.
-%
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % \part{\fileent{lualibs.lua}}
@@ -780,7 +774,7 @@ if loaded == false then
   loadmodule("lualibs-util-prs.lua")--- miscellaneous parsers; cool. cool cool cool
   ----------("lualibs-util-fmt.lua")---!column formatter (rarely used)
   loadmodule("lualibs-util-dim.lua")--- conversions between dimensions
-  ----------("lualibs-util-jsn.lua")--- JSON parser
+  loadmodule("lualibs-util-jsn.lua")--- JSON parser
 
   ----------("lualibs-trac-set.lua")---!generalization of trackers
   ----------("lualibs-trac-log.lua")---!logging
@@ -796,8 +790,6 @@ if loaded == false then
   ----------("lualibs-core-con.lua")---
 end
 
-loadmodule"lualibs-util-jsn.lua"--- cannot be merged because of return statement
-
 unfake_context() --- TODO check if this works at runtime
 
 lualibs.extended_loaded = true