update to version 2.5

This commit is contained in:
Tavish Naruka 2015-03-04 11:18:07 +05:30
parent 7ba6b81eb2
commit af4beb5e99
7 changed files with 1135 additions and 502 deletions

View File

@ -1,7 +1,7 @@
--- This file is part of LuaDist project
name = "dkjson"
version = "2.4"
version = "2.5"
desc = "dkjson is a module for encoding and decoding JSON data. It supports UTF-8."
author = "David Kolf"

92
dkjson-2.5-2.rockspec Normal file
View File

@ -0,0 +1,92 @@
<!DOCTYPE html>
<html>
<head>
<base href="http://dkolf.de/src/dkjson-lua.fsl/artifact" />
<title>Artifact Content - dkjson</title>
<link rel="alternate" type="application/rss+xml" title="RSS Feed"
href="/src/dkjson-lua.fsl/timeline.rss" />
<link rel="stylesheet" href="/src/dkjson-lua.fsl/style.css?default" type="text/css"
media="screen" />
</head>
<body>
<h1>Artifact Content &mdash; dkjson</h1>
<div class="mainmenu">
<a href='/'>dkolf.de</a>
<a href='/src/dkjson-lua.fsl/home'>dkjson</a>
<a href='/src/dkjson-lua.fsl/timeline'>Timeline</a>
<a href='/src/dkjson-lua.fsl/brlist'>Branches</a>
<a href='/src/dkjson-lua.fsl/taglist'>Tags</a>
<a href='/src/dkjson-lua.fsl/wiki'>Wiki</a>
<a href='/src/dkjson-lua.fsl/login'>Login</a>
</div>
<div class="submenu">
<a class="label" href="/src/dkjson-lua.fsl/timeline?n=200&amp;uf=f1093c6b2e5a858b6100958c8c5e575ae439a0df">Checkins Using</a>
<a class="label" href="/src/dkjson-lua.fsl/raw/dkjson-2.5-2.rockspec?name=f1093c6b2e5a858b6100958c8c5e575ae439a0df">Download</a>
<a class="label" href="/src/dkjson-lua.fsl/hexdump?name=f1093c6b2e5a858b6100958c8c5e575ae439a0df">Hex</a>
</div>
<div class="content">
<script>
function gebi(x){
if(/^#/.test(x)) x = x.substr(1);
var e = document.getElementById(x);
if(!e) throw new Error("Expecting element with ID "+x);
else return e;}
</script>
<h2>Artifact f1093c6b2e5a858b6100958c8c5e575ae439a0df:</h2>
<ul>
<li>File
<a id='a1' href='/src/dkjson-lua.fsl/honeypot'>dkjson-2.5-2.rockspec</a>
<ul>
<li>
2015-03-02 20:42:23
- part of checkin
<span class="timelineHistDsp">[dbf5178674]</span>
on branch <a id='a2' href='/src/dkjson-lua.fsl/honeypot'>trunk</a>
- tested for Lua 5.3, updated rockspec
(user:
dhkolf
</ul>
</ul>
<hr />
<blockquote>
<pre>
package = &quot;dkjson&quot;
version = &quot;2.5-2&quot;
source = {
url = &quot;http://dkolf.de/src/dkjson-lua.fsl/tarball/dkjson-2.5.tar.gz?uuid=release_2_5&quot;,
file = &quot;dkjson-2.5.tar.gz&quot;
}
description = {
summary = &quot;David Kolf's JSON module for Lua&quot;,
detailed = [[
dkjson is a module for encoding and decoding JSON data. It supports UTF-8.
JSON (JavaScript Object Notation) is a format for serializing data based
on the syntax for JavaScript data structures.
dkjson is written in Lua without any dependencies, but
when LPeg is available dkjson uses it to speed up decoding.
]],
homepage = &quot;http://dkolf.de/src/dkjson-lua.fsl/&quot;,
license = &quot;MIT/X11&quot;
}
dependencies = {
&quot;lua &gt;= 5.1, &lt; 5.4&quot;
}
build = {
type = &quot;builtin&quot;,
modules = {
dkjson = &quot;dkjson.lua&quot;
}
}
</pre>
</blockquote>
</div>
<div class="footer">
<a href="./">dkolf.de</a>
<a href="/contact">contact</a>
(This page was generated by <a class="extlink" href="http://www.fossil-scm.org/">Fossil</a>.)
</div>
</body></html>

View File

@ -1,3 +1,55 @@
<!DOCTYPE html>
<html>
<head>
<base href="http://dkolf.de/src/dkjson-lua.fsl/artifact" />
<title>Artifact Content - dkjson</title>
<link rel="alternate" type="application/rss+xml" title="RSS Feed"
href="/src/dkjson-lua.fsl/timeline.rss" />
<link rel="stylesheet" href="/src/dkjson-lua.fsl/style.css?default" type="text/css"
media="screen" />
</head>
<body>
<h1>Artifact Content &mdash; dkjson</h1>
<div class="mainmenu">
<a href='/'>dkolf.de</a>
<a href='/src/dkjson-lua.fsl/home'>dkjson</a>
<a href='/src/dkjson-lua.fsl/timeline'>Timeline</a>
<a href='/src/dkjson-lua.fsl/brlist'>Branches</a>
<a href='/src/dkjson-lua.fsl/taglist'>Tags</a>
<a href='/src/dkjson-lua.fsl/wiki'>Wiki</a>
<a href='/src/dkjson-lua.fsl/login'>Login</a>
</div>
<div class="submenu">
<a class="label" href="/src/dkjson-lua.fsl/timeline?n=200&amp;uf=19fd705cf41e4977b7fe04c79c0808b079836024">Checkins Using</a>
<a class="label" href="/src/dkjson-lua.fsl/raw/dkjson.lua?name=19fd705cf41e4977b7fe04c79c0808b079836024">Download</a>
<a class="label" href="/src/dkjson-lua.fsl/hexdump?name=19fd705cf41e4977b7fe04c79c0808b079836024">Hex</a>
</div>
<div class="content">
<script>
function gebi(x){
if(/^#/.test(x)) x = x.substr(1);
var e = document.getElementById(x);
if(!e) throw new Error("Expecting element with ID "+x);
else return e;}
</script>
<h2>Artifact 19fd705cf41e4977b7fe04c79c0808b079836024:</h2>
<ul>
<li>File
<a id='a1' href='/src/dkjson-lua.fsl/honeypot'>dkjson.lua</a>
<ul>
<li>
2014-04-28 21:16:16
- part of checkin
<span class="timelineHistDsp">[3d24a61dd0]</span>
on branch <a id='a2' href='/src/dkjson-lua.fsl/honeypot'>trunk</a>
- fix line breaks in readme.txt, fix release year
(user:
dhkolf
</ul>
</ul>
<hr />
<blockquote>
<pre>
-- Module options:
local always_try_using_lpeg = true
local register_global_module_table = false
@ -6,177 +58,22 @@
--[==[
David Kolf's JSON module for Lua 5.1/5.2
========================================
*Version 2.4*
Version 2.5
In the default configuration this module writes no global values, not even
the module table. Import it using
json = require ("dkjson")
In environments where `require` or a similiar function are not available
and you cannot receive the return value of the module, you can set the
option `register_global_module_table` to `true`. The module table will
then be saved in the global variable with the name given by the option
`global_module_name`.
Exported functions and values:
`json.encode (object [, state])`
--------------------------------
Create a string representing the object. `Object` can be a table,
a string, a number, a boolean, `nil`, `json.null` or any object with
a function `__tojson` in its metatable. A table can only use strings
and numbers as keys and its values have to be valid objects as
well. It raises an error for any invalid data types or reference
cycles.
`state` is an optional table with the following fields:
- `indent`
When `indent` (a boolean) is set, the created string will contain
newlines and indentations. Otherwise it will be one long line.
- `keyorder`
`keyorder` is an array to specify the ordering of keys in the
encoded output. If an object has keys which are not in this array
they are written after the sorted keys.
- `level`
This is the initial level of indentation used when `indent` is
set. For each level two spaces are added. When absent it is set
to 0.
- `buffer`
`buffer` is an array to store the strings for the result so they
can be concatenated at once. When it isn't given, the encode
function will create it temporary and will return the
concatenated result.
- `bufferlen`
When `bufferlen` is set, it has to be the index of the last
element of `buffer`.
- `tables`
`tables` is a set to detect reference cycles. It is created
temporary when absent. Every table that is currently processed
is used as key, the value is `true`.
When `state.buffer` was set, the return value will be `true` on
success. Without `state.buffer` the return value will be a string.
`json.decode (string [, position [, null]])`
--------------------------------------------
Decode `string` starting at `position` or at 1 if `position` was
omitted.
`null` is an optional value to be returned for null values. The
default is `nil`, but you could set it to `json.null` or any other
value.
The return values are the object or `nil`, the position of the next
character that doesn't belong to the object, and in case of errors
an error message.
Two metatables are created. Every array or object that is decoded gets
a metatable with the `__jsontype` field set to either `array` or
`object`. If you want to provide your own metatables use the syntax
json.decode (string, position, null, objectmeta, arraymeta)
To prevent the assigning of metatables pass `nil`:
json.decode (string, position, null, nil)
`<metatable>.__jsonorder`
-------------------------
`__jsonorder` can overwrite the `keyorder` for a specific table.
`<metatable>.__jsontype`
------------------------
`__jsontype` can be either `"array"` or `"object"`. This value is only
checked for empty tables. (The default for empty tables is `"array"`).
`<metatable>.__tojson (self, state)`
------------------------------------
You can provide your own `__tojson` function in a metatable. In this
function you can either add directly to the buffer and return true,
or you can return a string. On errors nil and a message should be
returned.
`json.null`
-----------
You can use this value for setting explicit `null` values.
`json.version`
--------------
Set to `"dkjson 2.4"`.
`json.quotestring (string)`
---------------------------
Quote a UTF-8 string and escape critical characters using JSON
escape sequences. This function is only necessary when you build
your own `__tojson` functions.
`json.addnewline (state)`
-------------------------
When `state.indent` is set, add a newline to `state.buffer` and spaces
according to `state.level`.
LPeg support
------------
When the local configuration variable `always_try_using_lpeg` is set,
this module tries to load LPeg to replace the `decode` function. The
speed increase is significant. You can get the LPeg module at
<http://www.inf.puc-rio.br/~roberto/lpeg/>.
When LPeg couldn't be loaded, the pure Lua functions stay active.
In case you don't want this module to require LPeg on its own,
disable the option `always_try_using_lpeg` in the options section at
the top of the module.
In this case you can later load LPeg support using
### `json.use_lpeg ()`
Require the LPeg module and replace the functions `quotestring` and
and `decode` with functions that use LPeg patterns.
This function returns the module table, so you can load the module
using:
json = require "dkjson".use_lpeg()
Alternatively you can use `pcall` so the JSON module still works when
LPeg isn't found.
json = require "dkjson"
pcall (json.use_lpeg)
### `json.using_lpeg`
This variable is set to `true` when LPeg was loaded successfully.
---------------------------------------------------------------------
Contact
-------
For the documentation see the corresponding readme.txt or visit
&lt;http://dkolf.de/src/dkjson-lua.fsl/&gt;.
You can contact the author by sending an e-mail to 'david' at the
domain 'dkolf.de'.
---------------------------------------------------------------------
*Copyright (C) 2010-2013 David Heiko Kolf*
Copyright (C) 2010-2014 David Heiko Kolf
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
&quot;Software&quot;), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
@ -185,7 +82,7 @@ the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
@ -194,13 +91,7 @@ ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
<!-- This documentation can be parsed using Markdown to generate HTML.
The source code is enclosed in a HTML comment so it won't be displayed
by browsers, but it should be removed from the final HTML file as
it isn't a valid HTML comment (and wastes space).
-->
<!--]==]
--]==]
-- global dependencies:
local pairs, type, tostring, tonumber, getmetatable, setmetatable, rawset =
@ -213,7 +104,7 @@ local strrep, gsub, strsub, strbyte, strchar, strfind, strlen, strformat =
local strmatch = string.match
local concat = table.concat
local json = { version = "dkjson 2.4" }
local json = { version = &quot;dkjson 2.5&quot; }
if register_global_module_table then
_G[global_module_name] = json
@ -224,12 +115,12 @@ local _ENV = nil -- blocking globals in Lua 5.2
pcall (function()
-- Enable access to blocked metatables.
-- Don't worry, this module doesn't change anything in them.
local debmeta = require "debug".getmetatable
local debmeta = require &quot;debug&quot;.getmetatable
if debmeta then getmetatable = debmeta end
end)
json.null = setmetatable ({}, {
__tojson = function () return "null" end
__tojson = function () return &quot;null&quot; end
})
local function isarray (tbl)
@ -237,28 +128,28 @@ local function isarray (tbl)
for k,v in pairs (tbl) do
if k == 'n' and type(v) == 'number' then
arraylen = v
if v > max then
if v &gt; max then
max = v
end
else
if type(k) ~= 'number' or k < 1 or floor(k) ~= k then
if type(k) ~= 'number' or k &lt; 1 or floor(k) ~= k then
return false
end
if k > max then
if k &gt; max then
max = k
end
n = n + 1
end
end
if max > 10 and max > arraylen and max > n * 2 then
if max &gt; 10 and max &gt; arraylen and max &gt; n * 2 then
return false -- don't create an array with too many holes
end
return true, max
end
local escapecodes = {
["\""] = "\\\"", ["\\"] = "\\\\", ["\b"] = "\\b", ["\f"] = "\\f",
["\n"] = "\\n", ["\r"] = "\\r", ["\t"] = "\\t"
[&quot;\&quot;&quot;] = &quot;\\\&quot;&quot;, [&quot;\\&quot;] = &quot;\\\\&quot;, [&quot;\b&quot;] = &quot;\\b&quot;, [&quot;\f&quot;] = &quot;\\f&quot;,
[&quot;\n&quot;] = &quot;\\n&quot;, [&quot;\r&quot;] = &quot;\\r&quot;, [&quot;\t&quot;] = &quot;\\t&quot;
}
local function escapeutf8 (uchar)
@ -268,26 +159,26 @@ local function escapeutf8 (uchar)
end
local a, b, c, d = strbyte (uchar, 1, 4)
a, b, c, d = a or 0, b or 0, c or 0, d or 0
if a <= 0x7f then
if a &lt;= 0x7f then
value = a
elseif 0xc0 <= a and a <= 0xdf and b >= 0x80 then
elseif 0xc0 &lt;= a and a &lt;= 0xdf and b &gt;= 0x80 then
value = (a - 0xc0) * 0x40 + b - 0x80
elseif 0xe0 <= a and a <= 0xef and b >= 0x80 and c >= 0x80 then
elseif 0xe0 &lt;= a and a &lt;= 0xef and b &gt;= 0x80 and c &gt;= 0x80 then
value = ((a - 0xe0) * 0x40 + b - 0x80) * 0x40 + c - 0x80
elseif 0xf0 <= a and a <= 0xf7 and b >= 0x80 and c >= 0x80 and d >= 0x80 then
elseif 0xf0 &lt;= a and a &lt;= 0xf7 and b &gt;= 0x80 and c &gt;= 0x80 and d &gt;= 0x80 then
value = (((a - 0xf0) * 0x40 + b - 0x80) * 0x40 + c - 0x80) * 0x40 + d - 0x80
else
return ""
return &quot;&quot;
end
if value <= 0xffff then
return strformat ("\\u%.4x", value)
elseif value <= 0x10ffff then
if value &lt;= 0xffff then
return strformat (&quot;\\u%.4x&quot;, value)
elseif value &lt;= 0x10ffff then
-- encode as UTF-16 surrogate pair
value = value - 0x10000
local highsur, lowsur = 0xD800 + floor (value/0x400), 0xDC00 + (value % 0x400)
return strformat ("\\u%.4x\\u%.4x", highsur, lowsur)
return strformat (&quot;\\u%.4x\\u%.4x&quot;, highsur, lowsur)
else
return ""
return &quot;&quot;
end
end
@ -303,19 +194,19 @@ local function fsub (str, pattern, repl)
end
local function quotestring (value)
-- based on the regexp "escapable" in https://github.com/douglascrockford/JSON-js
value = fsub (value, "[%z\1-\31\"\\\127]", escapeutf8)
if strfind (value, "[\194\216\220\225\226\239]") then
value = fsub (value, "\194[\128-\159\173]", escapeutf8)
value = fsub (value, "\216[\128-\132]", escapeutf8)
value = fsub (value, "\220\143", escapeutf8)
value = fsub (value, "\225\158[\180\181]", escapeutf8)
value = fsub (value, "\226\128[\140-\143\168-\175]", escapeutf8)
value = fsub (value, "\226\129[\160-\175]", escapeutf8)
value = fsub (value, "\239\187\191", escapeutf8)
value = fsub (value, "\239\191[\176-\191]", escapeutf8)
-- based on the regexp &quot;escapable&quot; in https://github.com/douglascrockford/JSON-js
value = fsub (value, &quot;[%z\1-\31\&quot;\\\127]&quot;, escapeutf8)
if strfind (value, &quot;[\194\216\220\225\226\239]&quot;) then
value = fsub (value, &quot;\194[\128-\159\173]&quot;, escapeutf8)
value = fsub (value, &quot;\216[\128-\132]&quot;, escapeutf8)
value = fsub (value, &quot;\220\143&quot;, escapeutf8)
value = fsub (value, &quot;\225\158[\180\181]&quot;, escapeutf8)
value = fsub (value, &quot;\226\128[\140-\143\168-\175]&quot;, escapeutf8)
value = fsub (value, &quot;\226\129[\160-\175]&quot;, escapeutf8)
value = fsub (value, &quot;\239\187\191&quot;, escapeutf8)
value = fsub (value, &quot;\239\191[\176-\191]&quot;, escapeutf8)
end
return "\"" .. value .. "\""
return &quot;\&quot;&quot; .. value .. &quot;\&quot;&quot;
end
json.quotestring = quotestring
@ -332,29 +223,29 @@ end
local decpoint, numfilter
local function updatedecpoint ()
decpoint = strmatch(tostring(0.5), "([^05+])")
decpoint = strmatch(tostring(0.5), &quot;([^05+])&quot;)
-- build a filter that can be used to remove group separators
numfilter = "[^0-9%-%+eE" .. gsub(decpoint, "[%^%$%(%)%%%.%[%]%*%+%-%?]", "%%%0") .. "]+"
numfilter = &quot;[^0-9%-%+eE&quot; .. gsub(decpoint, &quot;[%^%$%(%)%%%.%[%]%*%+%-%?]&quot;, &quot;%%%0&quot;) .. &quot;]+&quot;
end
updatedecpoint()
local function num2str (num)
return replace(fsub(tostring(num), numfilter, ""), decpoint, ".")
return replace(fsub(tostring(num), numfilter, &quot;&quot;), decpoint, &quot;.&quot;)
end
local function str2num (str)
local num = tonumber(replace(str, ".", decpoint))
local num = tonumber(replace(str, &quot;.&quot;, decpoint))
if not num then
updatedecpoint()
num = tonumber(replace(str, ".", decpoint))
num = tonumber(replace(str, &quot;.&quot;, decpoint))
end
return num
end
local function addnewline2 (level, buffer, buflen)
buffer[buflen+1] = "\n"
buffer[buflen+2] = strrep (" ", level)
buffer[buflen+1] = &quot;\n&quot;
buffer[buflen+2] = strrep (&quot; &quot;, level)
buflen = buflen + 2
return buflen
end
@ -368,53 +259,72 @@ end
local encode2 -- forward declaration
local function addpair (key, value, prev, indent, level, buffer, buflen, tables, globalorder)
local function addpair (key, value, prev, indent, level, buffer, buflen, tables, globalorder, state)
local kt = type (key)
if kt ~= 'string' and kt ~= 'number' then
return nil, "type '" .. kt .. "' is not supported as a key by JSON."
return nil, &quot;type '&quot; .. kt .. &quot;' is not supported as a key by JSON.&quot;
end
if prev then
buflen = buflen + 1
buffer[buflen] = ","
buffer[buflen] = &quot;,&quot;
end
if indent then
buflen = addnewline2 (level, buffer, buflen)
end
buffer[buflen+1] = quotestring (key)
buffer[buflen+2] = ":"
return encode2 (value, indent, level, buffer, buflen + 2, tables, globalorder)
buffer[buflen+2] = &quot;:&quot;
return encode2 (value, indent, level, buffer, buflen + 2, tables, globalorder, state)
end
encode2 = function (value, indent, level, buffer, buflen, tables, globalorder)
local function appendcustom(res, buffer, state)
local buflen = state.bufferlen
if type (res) == 'string' then
buflen = buflen + 1
buffer[buflen] = res
end
return buflen
end
local function exception(reason, value, state, buffer, buflen, defaultmessage)
defaultmessage = defaultmessage or reason
local handler = state.exception
if not handler then
return nil, defaultmessage
else
state.bufferlen = buflen
local ret, msg = handler (reason, value, state, defaultmessage)
if not ret then return nil, msg or defaultmessage end
return appendcustom(ret, buffer, state)
end
end
function json.encodeexception(reason, value, state, defaultmessage)
return quotestring(&quot;&lt;&quot; .. defaultmessage .. &quot;&gt;&quot;)
end
encode2 = function (value, indent, level, buffer, buflen, tables, globalorder, state)
local valtype = type (value)
local valmeta = getmetatable (value)
valmeta = type (valmeta) == 'table' and valmeta -- only tables
local valtojson = valmeta and valmeta.__tojson
if valtojson then
if tables[value] then
return nil, "reference cycle"
return exception('reference cycle', value, state, buffer, buflen)
end
tables[value] = true
local state = {
indent = indent, level = level, buffer = buffer,
bufferlen = buflen, tables = tables, keyorder = globalorder
}
state.bufferlen = buflen
local ret, msg = valtojson (value, state)
if not ret then return nil, msg end
if not ret then return exception('custom encoder failed', value, state, buffer, buflen, msg) end
tables[value] = nil
buflen = state.bufferlen
if type (ret) == 'string' then
buflen = buflen + 1
buffer[buflen] = ret
end
buflen = appendcustom(ret, buffer, state)
elseif value == nil then
buflen = buflen + 1
buffer[buflen] = "null"
buffer[buflen] = &quot;null&quot;
elseif valtype == 'number' then
local s
if value ~= value or value >= huge or -value >= huge then
if value ~= value or value &gt;= huge or -value &gt;= huge then
-- This is the behaviour of the original JSON implementation.
s = "null"
s = &quot;null&quot;
else
s = num2str (value)
end
@ -422,13 +332,13 @@ encode2 = function (value, indent, level, buffer, buflen, tables, globalorder)
buffer[buflen] = s
elseif valtype == 'boolean' then
buflen = buflen + 1
buffer[buflen] = value and "true" or "false"
buffer[buflen] = value and &quot;true&quot; or &quot;false&quot;
elseif valtype == 'string' then
buflen = buflen + 1
buffer[buflen] = quotestring (value)
elseif valtype == 'table' then
if tables[value] then
return nil, "reference cycle"
return exception('reference cycle', value, state, buffer, buflen)
end
tables[value] = true
level = level + 1
@ -439,21 +349,21 @@ encode2 = function (value, indent, level, buffer, buflen, tables, globalorder)
local msg
if isa then -- JSON array
buflen = buflen + 1
buffer[buflen] = "["
buffer[buflen] = &quot;[&quot;
for i = 1, n do
buflen, msg = encode2 (value[i], indent, level, buffer, buflen, tables, globalorder)
buflen, msg = encode2 (value[i], indent, level, buffer, buflen, tables, globalorder, state)
if not buflen then return nil, msg end
if i < n then
if i &lt; n then
buflen = buflen + 1
buffer[buflen] = ","
buffer[buflen] = &quot;,&quot;
end
end
buflen = buflen + 1
buffer[buflen] = "]"
buffer[buflen] = &quot;]&quot;
else -- JSON object
local prev = false
buflen = buflen + 1
buffer[buflen] = "{"
buffer[buflen] = &quot;{&quot;
local order = valmeta and valmeta.__jsonorder or globalorder
if order then
local used = {}
@ -463,20 +373,20 @@ encode2 = function (value, indent, level, buffer, buflen, tables, globalorder)
local v = value[k]
if v then
used[k] = true
buflen, msg = addpair (k, v, prev, indent, level, buffer, buflen, tables, globalorder)
buflen, msg = addpair (k, v, prev, indent, level, buffer, buflen, tables, globalorder, state)
prev = true -- add a seperator before the next element
end
end
for k,v in pairs (value) do
if not used[k] then
buflen, msg = addpair (k, v, prev, indent, level, buffer, buflen, tables, globalorder)
buflen, msg = addpair (k, v, prev, indent, level, buffer, buflen, tables, globalorder, state)
if not buflen then return nil, msg end
prev = true -- add a seperator before the next element
end
end
else -- unordered
for k,v in pairs (value) do
buflen, msg = addpair (k, v, prev, indent, level, buffer, buflen, tables, globalorder)
buflen, msg = addpair (k, v, prev, indent, level, buffer, buflen, tables, globalorder, state)
if not buflen then return nil, msg end
prev = true -- add a seperator before the next element
end
@ -485,11 +395,12 @@ encode2 = function (value, indent, level, buffer, buflen, tables, globalorder)
buflen = addnewline2 (level - 1, buffer, buflen)
end
buflen = buflen + 1
buffer[buflen] = "}"
buffer[buflen] = &quot;}&quot;
end
tables[value] = nil
else
return nil, "type '" .. valtype .. "' is not supported by JSON."
return exception ('unsupported type', value, state, buffer, buflen,
&quot;type '&quot; .. valtype .. &quot;' is not supported by JSON.&quot;)
end
return buflen
end
@ -498,15 +409,18 @@ function json.encode (value, state)
state = state or {}
local oldbuffer = state.buffer
local buffer = oldbuffer or {}
state.buffer = buffer
updatedecpoint()
local ret, msg = encode2 (value, state.indent, state.level or 0,
buffer, state.bufferlen or 0, state.tables or {}, state.keyorder)
buffer, state.bufferlen or 0, state.tables or {}, state.keyorder, state)
if not ret then
error (msg, 2)
elseif oldbuffer then
elseif oldbuffer == buffer then
state.bufferlen = ret
return true
else
state.bufferlen = nil
state.buffer = nil
return concat (buffer)
end
end
@ -514,8 +428,8 @@ end
local function loc (str, where)
local line, pos, linepos = 1, 1, 0
while true do
pos = strfind (str, "\n", pos, true)
if pos and pos < where then
pos = strfind (str, &quot;\n&quot;, pos, true)
if pos and pos &lt; where then
line = line + 1
linepos = pos
pos = pos + 1
@ -523,20 +437,28 @@ local function loc (str, where)
break
end
end
return "line " .. line .. ", column " .. (where - linepos)
return &quot;line &quot; .. line .. &quot;, column &quot; .. (where - linepos)
end
local function unterminated (str, what, where)
return nil, strlen (str) + 1, "unterminated " .. what .. " at " .. loc (str, where)
return nil, strlen (str) + 1, &quot;unterminated &quot; .. what .. &quot; at &quot; .. loc (str, where)
end
local function scanwhite (str, pos)
while true do
pos = strfind (str, "%S", pos)
pos = strfind (str, &quot;%S&quot;, pos)
if not pos then return nil end
if strsub (str, pos, pos + 2) == "\239\187\191" then
local sub2 = strsub (str, pos, pos + 1)
if sub2 == &quot;\239\187&quot; and strsub (str, pos + 2, pos + 2) == &quot;\191&quot; then
-- UTF-8 Byte Order Mark
pos = pos + 3
elseif sub2 == &quot;//&quot; then
pos = strfind (str, &quot;[\n\r]&quot;, pos + 2)
if not pos then return nil end
elseif sub2 == &quot;/*&quot; then
pos = strfind (str, &quot;*/&quot;, pos + 2)
if not pos then return nil end
pos = pos + 2
else
return pos
end
@ -544,23 +466,23 @@ local function scanwhite (str, pos)
end
local escapechars = {
["\""] = "\"", ["\\"] = "\\", ["/"] = "/", ["b"] = "\b", ["f"] = "\f",
["n"] = "\n", ["r"] = "\r", ["t"] = "\t"
[&quot;\&quot;&quot;] = &quot;\&quot;&quot;, [&quot;\\&quot;] = &quot;\\&quot;, [&quot;/&quot;] = &quot;/&quot;, [&quot;b&quot;] = &quot;\b&quot;, [&quot;f&quot;] = &quot;\f&quot;,
[&quot;n&quot;] = &quot;\n&quot;, [&quot;r&quot;] = &quot;\r&quot;, [&quot;t&quot;] = &quot;\t&quot;
}
local function unichar (value)
if value < 0 then
if value &lt; 0 then
return nil
elseif value <= 0x007f then
elseif value &lt;= 0x007f then
return strchar (value)
elseif value <= 0x07ff then
elseif value &lt;= 0x07ff then
return strchar (0xc0 + floor(value/0x40),
0x80 + (floor(value) % 0x40))
elseif value <= 0xffff then
elseif value &lt;= 0xffff then
return strchar (0xe0 + floor(value/0x1000),
0x80 + (floor(value/0x40) % 0x40),
0x80 + (floor(value) % 0x40))
elseif value <= 0x10ffff then
elseif value &lt;= 0x10ffff then
return strchar (0xf0 + floor(value/0x40000),
0x80 + (floor(value/0x1000) % 0x40),
0x80 + (floor(value/0x40) % 0x40),
@ -574,30 +496,30 @@ local function scanstring (str, pos)
local lastpos = pos + 1
local buffer, n = {}, 0
while true do
local nextpos = strfind (str, "[\"\\]", lastpos)
local nextpos = strfind (str, &quot;[\&quot;\\]&quot;, lastpos)
if not nextpos then
return unterminated (str, "string", pos)
return unterminated (str, &quot;string&quot;, pos)
end
if nextpos > lastpos then
if nextpos &gt; lastpos then
n = n + 1
buffer[n] = strsub (str, lastpos, nextpos - 1)
end
if strsub (str, nextpos, nextpos) == "\"" then
if strsub (str, nextpos, nextpos) == &quot;\&quot;&quot; then
lastpos = nextpos + 1
break
else
local escchar = strsub (str, nextpos + 1, nextpos + 1)
local value
if escchar == "u" then
if escchar == &quot;u&quot; then
value = tonumber (strsub (str, nextpos + 2, nextpos + 5), 16)
if value then
local value2
if 0xD800 <= value and value <= 0xDBff then
if 0xD800 &lt;= value and value &lt;= 0xDBff then
-- we have the high surrogate of UTF-16. Check if there is a
-- low surrogate escaped nearby to combine them.
if strsub (str, nextpos + 6, nextpos + 7) == "\\u" then
if strsub (str, nextpos + 6, nextpos + 7) == &quot;\\u&quot; then
value2 = tonumber (strsub (str, nextpos + 8, nextpos + 11), 16)
if value2 and 0xDC00 <= value2 and value2 <= 0xDFFF then
if value2 and 0xDC00 &lt;= value2 and value2 &lt;= 0xDFFF then
value = (value - 0xD800) * 0x400 + (value2 - 0xDC00) + 0x10000
else
value2 = nil -- in case it was out of range for a low surrogate
@ -624,10 +546,10 @@ local function scanstring (str, pos)
end
if n == 1 then
return buffer[1], lastpos
elseif n > 1 then
elseif n &gt; 1 then
return concat (buffer), lastpos
else
return "", lastpos
return &quot;&quot;, lastpos
end
end
@ -655,9 +577,9 @@ local function scantable (what, closechar, str, startpos, nullval, objectmeta, a
pos = scanwhite (str, pos)
if not pos then return unterminated (str, what, startpos) end
char = strsub (str, pos, pos)
if char == ":" then
if char == &quot;:&quot; then
if val1 == nil then
return nil, pos, "cannot use nil as table index (at " .. loc (str, pos) .. ")"
return nil, pos, &quot;cannot use nil as table index (at &quot; .. loc (str, pos) .. &quot;)&quot;
end
pos = scanwhite (str, pos + 1)
if not pos then return unterminated (str, what, startpos) end
@ -672,7 +594,7 @@ local function scantable (what, closechar, str, startpos, nullval, objectmeta, a
n = n + 1
tbl[n] = val1
end
if char == "," then
if char == &quot;,&quot; then
pos = pos + 1
end
end
@ -682,40 +604,40 @@ scanvalue = function (str, pos, nullval, objectmeta, arraymeta)
pos = pos or 1
pos = scanwhite (str, pos)
if not pos then
return nil, strlen (str) + 1, "no valid JSON value (reached the end)"
return nil, strlen (str) + 1, &quot;no valid JSON value (reached the end)&quot;
end
local char = strsub (str, pos, pos)
if char == "{" then
return scantable ('object', "}", str, pos, nullval, objectmeta, arraymeta)
elseif char == "[" then
return scantable ('array', "]", str, pos, nullval, objectmeta, arraymeta)
elseif char == "\"" then
if char == &quot;{&quot; then
return scantable ('object', &quot;}&quot;, str, pos, nullval, objectmeta, arraymeta)
elseif char == &quot;[&quot; then
return scantable ('array', &quot;]&quot;, str, pos, nullval, objectmeta, arraymeta)
elseif char == &quot;\&quot;&quot; then
return scanstring (str, pos)
else
local pstart, pend = strfind (str, "^%-?[%d%.]+[eE]?[%+%-]?%d*", pos)
local pstart, pend = strfind (str, &quot;^%-?[%d%.]+[eE]?[%+%-]?%d*&quot;, pos)
if pstart then
local number = str2num (strsub (str, pstart, pend))
if number then
return number, pend + 1
end
end
pstart, pend = strfind (str, "^%a%w*", pos)
pstart, pend = strfind (str, &quot;^%a%w*&quot;, pos)
if pstart then
local name = strsub (str, pstart, pend)
if name == "true" then
if name == &quot;true&quot; then
return true, pend + 1
elseif name == "false" then
elseif name == &quot;false&quot; then
return false, pend + 1
elseif name == "null" then
elseif name == &quot;null&quot; then
return nullval, pend + 1
end
end
return nil, pos, "no valid JSON value at " .. loc (str, pos)
return nil, pos, &quot;no valid JSON value at &quot; .. loc (str, pos)
end
end
local function optionalmetatables(...)
if select("#", ...) > 0 then
if select(&quot;#&quot;, ...) &gt; 0 then
return ...
else
return {__jsontype = 'object'}, {__jsontype = 'array'}
@ -728,10 +650,10 @@ function json.decode (str, pos, nullval, ...)
end
function json.use_lpeg ()
local g = require ("lpeg")
local g = require (&quot;lpeg&quot;)
if g.version() == "0.11" then
error "due to a bug in LPeg 0.11, it cannot be used for JSON matching"
if g.version() == &quot;0.11&quot; then
error &quot;due to a bug in LPeg 0.11, it cannot be used for JSON matching&quot;
end
local pegmatch = g.match
@ -739,7 +661,7 @@ function json.use_lpeg ()
local function ErrorCall (str, pos, msg, state)
if not state.msg then
state.msg = msg .. " at " .. loc (str, pos)
state.msg = msg .. &quot; at &quot; .. loc (str, pos)
state.pos = pos
end
return false
@ -749,14 +671,16 @@ function json.use_lpeg ()
return g.Cmt (g.Cc (msg) * g.Carg (2), ErrorCall)
end
local Space = (S" \n\r\t" + P"\239\187\191")^0
local SingleLineComment = P&quot;//&quot; * (1 - S&quot;\n\r&quot;)^0
local MultiLineComment = P&quot;/*&quot; * (1 - P&quot;*/&quot;)^0 * P&quot;*/&quot;
local Space = (S&quot; \n\r\t&quot; + P&quot;\239\187\191&quot; + SingleLineComment + MultiLineComment)^0
local PlainChar = 1 - S"\"\\\n\r"
local EscapeSequence = (P"\\" * g.C (S"\"\\/bfnrt" + Err "unsupported escape sequence")) / escapechars
local HexDigit = R("09", "af", "AF")
local PlainChar = 1 - S&quot;\&quot;\\\n\r&quot;
local EscapeSequence = (P&quot;\\&quot; * g.C (S&quot;\&quot;\\/bfnrt&quot; + Err &quot;unsupported escape sequence&quot;)) / escapechars
local HexDigit = R(&quot;09&quot;, &quot;af&quot;, &quot;AF&quot;)
local function UTF16Surrogate (match, pos, high, low)
high, low = tonumber (high, 16), tonumber (low, 16)
if 0xD800 <= high and high <= 0xDBff and 0xDC00 <= low and low <= 0xDFFF then
if 0xD800 &lt;= high and high &lt;= 0xDBff and 0xDC00 &lt;= low and low &lt;= 0xDFFF then
return true, unichar ((high - 0xD800) * 0x400 + (low - 0xDC00) + 0x10000)
else
return false
@ -765,15 +689,15 @@ function json.use_lpeg ()
local function UTF16BMP (hex)
return unichar (tonumber (hex, 16))
end
local U16Sequence = (P"\\u" * g.C (HexDigit * HexDigit * HexDigit * HexDigit))
local U16Sequence = (P&quot;\\u&quot; * g.C (HexDigit * HexDigit * HexDigit * HexDigit))
local UnicodeEscape = g.Cmt (U16Sequence * U16Sequence, UTF16Surrogate) + U16Sequence/UTF16BMP
local Char = UnicodeEscape + EscapeSequence + PlainChar
local String = P"\"" * g.Cs (Char ^ 0) * (P"\"" + Err "unterminated string")
local Integer = P"-"^(-1) * (P"0" + (R"19" * R"09"^0))
local Fractal = P"." * R"09"^0
local Exponent = (S"eE") * (S"+-")^(-1) * R"09"^1
local String = P&quot;\&quot;&quot; * g.Cs (Char ^ 0) * (P&quot;\&quot;&quot; + Err &quot;unterminated string&quot;)
local Integer = P&quot;-&quot;^(-1) * (P&quot;0&quot; + (R&quot;19&quot; * R&quot;09&quot;^0))
local Fractal = P&quot;.&quot; * R&quot;09&quot;^0
local Exponent = (S&quot;eE&quot;) * (S&quot;+-&quot;)^(-1) * R&quot;09&quot;^1
local Number = (Integer * Fractal^(-1) * Exponent^(-1))/str2num
local Constant = P"true" * g.Cc (true) + P"false" * g.Cc (false) + P"null" * g.Carg (1)
local Constant = P&quot;true&quot; * g.Cc (true) + P&quot;false&quot; * g.Cc (false) + P&quot;null&quot; * g.Carg (1)
local SimpleValue = Number + String + Constant
local ArrayContent, ObjectContent
@ -806,13 +730,13 @@ function json.use_lpeg ()
return pos, setmetatable (t, state.objectmeta)
end
local Array = P"[" * g.Cmt (g.Carg(1) * g.Carg(2), parsearray) * Space * (P"]" + Err "']' expected")
local Object = P"{" * g.Cmt (g.Carg(1) * g.Carg(2), parseobject) * Space * (P"}" + Err "'}' expected")
local Array = P&quot;[&quot; * g.Cmt (g.Carg(1) * g.Carg(2), parsearray) * Space * (P&quot;]&quot; + Err &quot;']' expected&quot;)
local Object = P&quot;{&quot; * g.Cmt (g.Carg(1) * g.Carg(2), parseobject) * Space * (P&quot;}&quot; + Err &quot;'}' expected&quot;)
local Value = Space * (Array + Object + SimpleValue)
local ExpectedValue = Value + Space * Err "value expected"
ArrayContent = Value * Space * (P"," * g.Cc'cont' + g.Cc'last') * g.Cp()
local Pair = g.Cg (Space * String * Space * (P":" + Err "colon expected") * ExpectedValue)
ObjectContent = Pair * Space * (P"," * g.Cc'cont' + g.Cc'last') * g.Cp()
local ExpectedValue = Value + Space * Err &quot;value expected&quot;
ArrayContent = Value * Space * (P&quot;,&quot; * g.Cc'cont' + g.Cc'last') * g.Cp()
local Pair = g.Cg (Space * String * Space * (P&quot;:&quot; + Err &quot;colon expected&quot;) * ExpectedValue)
ObjectContent = Pair * Space * (P&quot;,&quot; * g.Cc'cont' + g.Cc'last') * g.Cp()
local DecodeValue = ExpectedValue * g.Cp ()
function json.decode (str, pos, nullval, ...)
@ -831,7 +755,7 @@ function json.use_lpeg ()
json.using_lpeg = true
return json -- so you can get the module using json = require "dkjson".use_lpeg()
return json -- so you can get the module using json = require &quot;dkjson&quot;.use_lpeg()
end
if always_try_using_lpeg then
@ -840,4 +764,13 @@ end
return json
-->
</pre>
</blockquote>
</div>
<div class="footer">
<a href="./">dkolf.de</a>
<a href="/contact">contact</a>
(This page was generated by <a class="extlink" href="http://www.fossil-scm.org/">Fossil</a>.)
</div>
</body></html>

View File

@ -1,3 +1,55 @@
<!DOCTYPE html>
<html>
<head>
<base href="http://dkolf.de/src/dkjson-lua.fsl/artifact" />
<title>Artifact Content - dkjson</title>
<link rel="alternate" type="application/rss+xml" title="RSS Feed"
href="/src/dkjson-lua.fsl/timeline.rss" />
<link rel="stylesheet" href="/src/dkjson-lua.fsl/style.css?default" type="text/css"
media="screen" />
</head>
<body>
<h1>Artifact Content &mdash; dkjson</h1>
<div class="mainmenu">
<a href='/'>dkolf.de</a>
<a href='/src/dkjson-lua.fsl/home'>dkjson</a>
<a href='/src/dkjson-lua.fsl/timeline'>Timeline</a>
<a href='/src/dkjson-lua.fsl/brlist'>Branches</a>
<a href='/src/dkjson-lua.fsl/taglist'>Tags</a>
<a href='/src/dkjson-lua.fsl/wiki'>Wiki</a>
<a href='/src/dkjson-lua.fsl/login'>Login</a>
</div>
<div class="submenu">
<a class="label" href="/src/dkjson-lua.fsl/timeline?n=200&amp;uf=4711879926db7149e28e639af37a95356026c770">Checkins Using</a>
<a class="label" href="/src/dkjson-lua.fsl/raw/jsontest.lua?name=4711879926db7149e28e639af37a95356026c770">Download</a>
<a class="label" href="/src/dkjson-lua.fsl/hexdump?name=4711879926db7149e28e639af37a95356026c770">Hex</a>
</div>
<div class="content">
<script>
function gebi(x){
if(/^#/.test(x)) x = x.substr(1);
var e = document.getElementById(x);
if(!e) throw new Error("Expecting element with ID "+x);
else return e;}
</script>
<h2>Artifact 4711879926db7149e28e639af37a95356026c770:</h2>
<ul>
<li>File
<a id='a1' href='/src/dkjson-lua.fsl/honeypot'>jsontest.lua</a>
<ul>
<li>
2014-03-11 21:36:39
- part of checkin
<span class="timelineHistDsp">[14a1712f0a]</span>
on branch <a id='a2' href='/src/dkjson-lua.fsl/honeypot'>trunk</a>
- handle multi line comments
(user:
dhkolf
</ul>
</ul>
<hr />
<blockquote>
<pre>
local encode, decode, dkencode, dkdecode
@ -12,19 +64,20 @@ local test_module, opt = ... -- command line argument
--local test_module = 'nm-json'
--local test_module = 'sb-json'
--local test_module = 'th-json'
test_module = test_module or 'dkjson'
--local opt = "esc" -- Test which characters in the BMP get escaped and whether this is correct
--local opt = "esc_full" -- Full range from 0 to 0x10ffff
--local opt = "esc_asc" -- Just 0 to 127
--local opt = &quot;esc&quot; -- Test which characters in the BMP get escaped and whether this is correct
--local opt = &quot;esc_full&quot; -- Full range from 0 to 0x10ffff
--local opt = &quot;esc_asc&quot; -- Just 0 to 127
--local opt = "refcycle" -- What happens when a reference cycle gets encoded?
--local opt = &quot;refcycle&quot; -- What happens when a reference cycle gets encoded?
local testlocale = "de_DE.UTF8"
local testlocale = &quot;de_DE.UTF8&quot;
local function inlocale(fn)
local oldloc = os.setlocale(nil, 'numeric')
if not os.setlocale(testlocale, 'numeric') then
print("test could not switch to locale "..testlocale)
print(&quot;test could not switch to locale &quot;..testlocale)
else
fn()
end
@ -33,19 +86,19 @@ end
if test_module == 'dkjson-nopeg' then
test_module = 'dkjson'
package.preload["lpeg"] = function () error "lpeg disabled" end
package.loaded["lpeg"] = nil
package.preload[&quot;lpeg&quot;] = function () error &quot;lpeg disabled&quot; end
package.loaded[&quot;lpeg&quot;] = nil
lpeg = nil
end
if test_module == 'dkjson-lulpeg' then
test_module = 'dkjson'
package.loaded["lpeg"] = require "lulpeg"
package.loaded[&quot;lpeg&quot;] = require &quot;lulpeg&quot;
end
do
-- http://chiselapp.com/user/dhkolf/repository/dkjson/
local dkjson = require "dkjson"
local dkjson = require &quot;dkjson&quot;
dkencode = dkjson.encode
dkdecode = dkjson.decode
end
@ -53,7 +106,7 @@ end
if test_module == 'cmj-json' then
-- https://github.com/craigmj/json4lua/
-- http://json.luaforge.net/
local json = require "cmjjson" -- renamed, the original file was just 'json'
local json = require &quot;cmjjson&quot; -- renamed, the original file was just 'json'
encode = json.encode
decode = json.decode
elseif test_module == 'dkjson' then
@ -62,59 +115,59 @@ elseif test_module == 'dkjson' then
decode = dkdecode
elseif test_module == 'fleece' then
-- http://www.eonblast.com/fleece/
local fleece = require "fleece"
encode = function(x) return fleece.json(x, "E4") end
local fleece = require &quot;fleece&quot;
encode = function(x) return fleece.json(x, &quot;E4&quot;) end
elseif test_module == 'jf-json' then
-- http://regex.info/blog/lua/json
local json = require "jfjson" -- renamed, the original file was just 'JSON'
local json = require &quot;jfjson&quot; -- renamed, the original file was just 'JSON'
encode = function(x) return json:encode(x) end
decode = function(x) return json:decode(x) end
elseif test_module == 'lua-yajl' then
-- http://github.com/brimworks/lua-yajl
local yajl = require ("yajl")
local yajl = require (&quot;yajl&quot;)
encode = yajl.to_string
decode = yajl.to_value
elseif test_module == 'mp-cjson' then
-- http://www.kyne.com.au/~mark/software/lua-cjson.php
local json = require "cjson"
local json = require &quot;cjson&quot;
encode = json.encode
decode = json.decode
elseif test_module == 'nm-json' then
-- http://luaforge.net/projects/luajsonlib/
local json = require "LuaJSON"
local json = require &quot;LuaJSON&quot;
encode = json.encode or json.stringify
decode = json.decode or json.parse
elseif test_module == 'sb-json' then
-- http://www.chipmunkav.com/downloads/Json.lua
local json = require "sbjson" -- renamed, the original file was just 'Json'
local json = require &quot;sbjson&quot; -- renamed, the original file was just 'Json'
encode = json.Encode
decode = json.Decode
elseif test_module == 'th-json' then
-- https://github.com/harningt/luajson
-- http://luaforge.net/projects/luajson/
local json = require "json"
local json = require &quot;json&quot;
encode = json.encode
decode = json.decode
else
print "No module specified"
print &quot;No module specified&quot;
return
end
if not encode then
print ("No encode method")
print (&quot;No encode method&quot;)
else
local x, r
local escapecodes = {
["\""] = "\\\"", ["\\"] = "\\\\", ["\b"] = "\\b", ["\f"] = "\\f",
["\n"] = "\\n", ["\r"] = "\\r", ["\t"] = "\\t", ["/"] = "\\/"
[&quot;\&quot;&quot;] = &quot;\\\&quot;&quot;, [&quot;\\&quot;] = &quot;\\\\&quot;, [&quot;\b&quot;] = &quot;\\b&quot;, [&quot;\f&quot;] = &quot;\\f&quot;,
[&quot;\n&quot;] = &quot;\\n&quot;, [&quot;\r&quot;] = &quot;\\r&quot;, [&quot;\t&quot;] = &quot;\\t&quot;, [&quot;/&quot;] = &quot;\\/&quot;
}
local function test (x, n, expect)
local enc = encode{ x }:match("^%s*%[%s*%\"(.-)%\"%s*%]%s*$")
local enc = encode{ x }:match(&quot;^%s*%[%s*%\&quot;(.-)%\&quot;%s*%]%s*$&quot;)
if not enc or (escapecodes[x] ~= enc
and ("\\u%04x"):format(n) ~= enc:gsub("[A-F]", string.lower)
and not (expect and enc:match("^"..expect.."$"))) then
print(("U+%04X isn't encoded correctly: %q"):format(n, enc))
and (&quot;\\u%04x&quot;):format(n) ~= enc:gsub(&quot;[A-F]&quot;, string.lower)
and not (expect and enc:match(&quot;^&quot;..expect..&quot;$&quot;))) then
print((&quot;U+%04X isn't encoded correctly: %q&quot;):format(n, enc))
end
end
@ -122,81 +175,81 @@ else
for i = 0,31 do
test(string.char(i), i)
end
test("\"", ("\""):byte())
test("\\", ("\\"):byte())
test(&quot;\&quot;&quot;, (&quot;\&quot;&quot;):byte())
test(&quot;\\&quot;, (&quot;\\&quot;):byte())
-- necessary escapes for JavaScript:
test("\226\128\168", 0x2028)
test("\226\128\169", 0x2029)
test(&quot;\226\128\168&quot;, 0x2028)
test(&quot;\226\128\169&quot;, 0x2029)
-- invalid escapes that were seen in the wild:
test("'", ("'"):byte(), "%'")
test(&quot;'&quot;, (&quot;'&quot;):byte(), &quot;%'&quot;)
r,x = pcall (encode, { [1000] = "x" })
r,x = pcall (encode, { [1000] = &quot;x&quot; })
if not r then
print ("encoding a sparse array (#=0) raises an error:", x)
print (&quot;encoding a sparse array (#=0) raises an error:&quot;, x)
else
if #x > 30 then
print ("sparse array (#=0) encoded as:", x:sub(1,15).." <...> "..x:sub(-15,-1), "#"..#x)
if #x &gt; 30 then
print (&quot;sparse array (#=0) encoded as:&quot;, x:sub(1,15)..&quot; &lt;...&gt; &quot;..x:sub(-15,-1), &quot;#&quot;..#x)
else
print ("sparse array (#=0) encoded as:", x)
print (&quot;sparse array (#=0) encoded as:&quot;, x)
end
end
r,x = pcall (encode, { [1] = "a", [1000] = "x" })
r,x = pcall (encode, { [1] = &quot;a&quot;, [1000] = &quot;x&quot; })
if not r then
print ("encoding a sparse array (#=1) raises an error:", x)
print (&quot;encoding a sparse array (#=1) raises an error:&quot;, x)
else
if #x > 30 then
print ("sparse array (#=1) encoded as:", x:sub(1,15).." <...> "..x:sub(-15,-1), "#str="..#x)
if #x &gt; 30 then
print (&quot;sparse array (#=1) encoded as:&quot;, x:sub(1,15)..&quot; &lt;...&gt; &quot;..x:sub(-15,-1), &quot;#str=&quot;..#x)
else
print ("sparse array (#=1) encoded as:", x)
print (&quot;sparse array (#=1) encoded as:&quot;, x)
end
end
r,x = pcall (encode, { [1] = "a", [5] = "c", ["x"] = "x" })
r,x = pcall (encode, { [1] = &quot;a&quot;, [5] = &quot;c&quot;, [&quot;x&quot;] = &quot;x&quot; })
if not r then
print ("encoding a mixed table raises an error:", x)
print (&quot;encoding a mixed table raises an error:&quot;, x)
else
print ("mixed table encoded as:", x)
print (&quot;mixed table encoded as:&quot;, x)
end
r, x = pcall(encode, { math.huge*0 }) -- NaN
if not r then
print ("encoding NaN raises an error:", x)
print (&quot;encoding NaN raises an error:&quot;, x)
else
r = dkdecode(x)
if not r then
print ("NaN isn't converted into valid JSON:", x)
elseif type(r[1]) == "number" and r[1] == r[1] then -- a number, but not NaN
print ("NaN is converted into a valid number:", x)
print (&quot;NaN isn't converted into valid JSON:&quot;, x)
elseif type(r[1]) == &quot;number&quot; and r[1] == r[1] then -- a number, but not NaN
print (&quot;NaN is converted into a valid number:&quot;, x)
else
print ("NaN is converted to:", x)
print (&quot;NaN is converted to:&quot;, x)
end
end
if test_module == 'fleece' then
print ("Fleece (0.3.1) is known to freeze on +/-Inf")
print (&quot;Fleece (0.3.1) is known to freeze on +/-Inf&quot;)
else
r, x = pcall(encode, { math.huge }) -- +Inf
if not r then
print ("encoding +Inf raises an error:", x)
print (&quot;encoding +Inf raises an error:&quot;, x)
else
r = dkdecode(x)
if not r then
print ("+Inf isn't converted into valid JSON:", x)
print (&quot;+Inf isn't converted into valid JSON:&quot;, x)
else
print ("+Inf is converted to:", x)
print (&quot;+Inf is converted to:&quot;, x)
end
end
r, x = pcall(encode, { -math.huge }) -- -Inf
if not r then
print ("encoding -Inf raises an error:", x)
print (&quot;encoding -Inf raises an error:&quot;, x)
else
r = dkdecode(x)
if not r then
print ("-Inf isn't converted into valid JSON:", x)
print (&quot;-Inf isn't converted into valid JSON:&quot;, x)
else
print ("-Inf is converted to:", x)
print (&quot;-Inf is converted to:&quot;, x)
end
end
end
@ -204,39 +257,155 @@ else
inlocale(function ()
local r, x = pcall(encode, { 0.5 })
if not r then
print("encoding 0.5 in locale raises an error:", x)
elseif not x:find(".", 1, true) then
print("In locale 0.5 isn't converted into valid JSON:", x)
print(&quot;encoding 0.5 in locale raises an error:&quot;, x)
elseif not x:find(&quot;.&quot;, 1, true) then
print(&quot;In locale 0.5 isn't converted into valid JSON:&quot;, x)
end
end)
-- special tests for dkjson:
if test_module == 'dkjson' then
do -- encode a function
local why, value, exstate
local state = {
exception = function (w, v, s)
why, value, exstate = w, v, s
return &quot;\&quot;demo\&quot;&quot;
end
}
local encfunction = function () end
r, x = pcall(dkencode, { encfunction }, state )
if not r then
print(&quot;encoding a function with exception handler raises an error:&quot;, x)
else
if x ~= &quot;[\&quot;demo\&quot;]&quot; then
print(&quot;expected to see output of exception handler for type exception, but got&quot;, x)
end
if why ~= &quot;unsupported type&quot; then
print(&quot;expected exception reason to be 'unsupported type' for type exception&quot;)
end
if value ~= encfunction then
print(&quot;expected to recieve value for type exception&quot;)
end
if exstate ~= state then
print(&quot;expected to recieve state for type exception&quot;)
end
end
r, x = pcall(dkencode, { function () end }, {
exception = function (w, v, s)
return nil, &quot;demo&quot;
end
})
if r or x ~= &quot;demo&quot; then
print(&quot;expected custom error for type exception, but got:&quot;, r, x)
end
r, x = pcall(dkencode, { function () end }, {
exception = function (w, v, s)
return nil
end
})
if r or x ~= &quot;type 'function' is not supported by JSON.&quot; then
print(&quot;expected default error for type exception, but got:&quot;, r, x)
end
end
do -- encode a reference cycle
local why, value, exstate
local state = {
exception = function (w, v, s)
why, value, exstate = w, v, s
return &quot;\&quot;demo\&quot;&quot;
end
}
local a = {}
a[1] = a
r, x = pcall(dkencode, a, state )
if not r then
print(&quot;encoding a reference cycle with exception handler raises an error:&quot;, x)
else
if x ~= &quot;[\&quot;demo\&quot;]&quot; then
print(&quot;expected to see output of exception handler for reference cycle exception, but got&quot;, x)
end
if why ~= &quot;reference cycle&quot; then
print(&quot;expected exception reason to be 'reference cycle' for reference cycle exception&quot;)
end
if value ~= a then
print(&quot;expected to recieve value for reference cycle exception&quot;)
end
if exstate ~= state then
print(&quot;expected to recieve state for reference cycle exception&quot;)
end
end
end
do -- example exception handler
r = dkencode(function () end, { exception = require &quot;dkjson&quot;.encodeexception })
if r ~= [[&quot;&lt;type 'function' is not supported by JSON.&gt;&quot;]] then
print(&quot;expected the exception encoder to encode default error message, but got&quot;, r)
end
end
do -- test state buffer for custom __tojson function
local origstate = {}
local usedstate, usedbuffer, usedbufferlen
dkencode({ setmetatable({}, {
__tojson = function(self, state)
usedstate = state
usedbuffer = state.buffer
usedbufferlen = state.bufferlen
return true
end
}) }, origstate)
if usedstate ~= origstate then print(&quot;expected tojson-function to recieve the original state&quot;) end
if type(usedbuffer) ~= 'table' or #usedbuffer &lt; 1 then print(&quot;expected buffer in tojson-function to be an array&quot;) end
if usedbufferlen ~= 1 then print(&quot;expected bufferlen in tojson-function to be 1, but got &quot;..tostring(usedbufferlen)) end
end
do -- do not keep buffer and bufferlen when they were not present initially
local origstate = {}
dkencode(setmetatable({}, {__tojson = function() return true end}), origstate)
if origstate.buffer ~= nil then print(&quot;expected buffer to be reset to nil&quot;) end
if origstate.bufferlen ~= nil then print(&quot;expected bufferlen to be reset to nil&quot;) end
end
do -- keep buffer and update bufferlen when they were present initially
local origbuffer = {}
local origstate = { buffer = origbuffer }
dkencode(true, origstate)
if origstate.buffer ~= origbuffer then print(&quot;expected original buffer to remain&quot;) end
if origstate.bufferlen ~= 1 then print(&quot;expected bufferlen to be updated&quot;) end
end
end
end
if not decode then
print ("No decode method")
print (&quot;No decode method&quot;)
else
local x, r
x = decode[=[ ["\u0000"] ]=]
if x[1] ~= "\000" then
print ("\\u0000 isn't decoded correctly")
x = decode[=[ [&quot;\u0000&quot;] ]=]
if x[1] ~= &quot;\000&quot; then
print (&quot;\\u0000 isn't decoded correctly&quot;)
end
x = decode[=[ ["\u20AC"] ]=]
if x[1] ~= "\226\130\172" then
print ("\\u20AC isn't decoded correctly")
x = decode[=[ [&quot;\u20AC&quot;] ]=]
if x[1] ~= &quot;\226\130\172&quot; then
print (&quot;\\u20AC isn't decoded correctly&quot;)
end
x = decode[=[ ["\uD834\uDD1E"] ]=]
if x[1] ~= "\240\157\132\158" then
print ("\\uD834\\uDD1E isn't decoded correctly")
x = decode[=[ [&quot;\uD834\uDD1E&quot;] ]=]
if x[1] ~= &quot;\240\157\132\158&quot; then
print (&quot;\\uD834\\uDD1E isn't decoded correctly&quot;)
end
r, x = pcall(decode, [=[
{"x":{"x":{"x":{"x":{"x": {"x":{"x":{"x":{"x":{"x": {"x":{"x":{"x":{"x":{"x":
{"x":{"x":{"x":{"x":{"x": {"x":{"x":{"x":{"x":{"x": {"x":{"x":{"x":{"x":{"x":
{"x":{"x":{"x":{"x":{"x": {"x":{"x":{"x":{"x":{"x": {"x":{"x":{"x":{"x":{"x":
{"x":{"x":{"x":{"x":{"x": {"x":{"x":{"x":{"x":{"x": {"x":{"x":{"x":{"x":{"x":
"deep down"
{&quot;x&quot;:{&quot;x&quot;:{&quot;x&quot;:{&quot;x&quot;:{&quot;x&quot;: {&quot;x&quot;:{&quot;x&quot;:{&quot;x&quot;:{&quot;x&quot;:{&quot;x&quot;: {&quot;x&quot;:{&quot;x&quot;:{&quot;x&quot;:{&quot;x&quot;:{&quot;x&quot;:
{&quot;x&quot;:{&quot;x&quot;:{&quot;x&quot;:{&quot;x&quot;:{&quot;x&quot;: {&quot;x&quot;:{&quot;x&quot;:{&quot;x&quot;:{&quot;x&quot;:{&quot;x&quot;: {&quot;x&quot;:{&quot;x&quot;:{&quot;x&quot;:{&quot;x&quot;:{&quot;x&quot;:
{&quot;x&quot;:{&quot;x&quot;:{&quot;x&quot;:{&quot;x&quot;:{&quot;x&quot;: {&quot;x&quot;:{&quot;x&quot;:{&quot;x&quot;:{&quot;x&quot;:{&quot;x&quot;: {&quot;x&quot;:{&quot;x&quot;:{&quot;x&quot;:{&quot;x&quot;:{&quot;x&quot;:
{&quot;x&quot;:{&quot;x&quot;:{&quot;x&quot;:{&quot;x&quot;:{&quot;x&quot;: {&quot;x&quot;:{&quot;x&quot;:{&quot;x&quot;:{&quot;x&quot;:{&quot;x&quot;: {&quot;x&quot;:{&quot;x&quot;:{&quot;x&quot;:{&quot;x&quot;:{&quot;x&quot;:
&quot;deep down&quot;
} } } } } } } } } } } } } } }
} } } } } } } } } } } } } } }
} } } } } } } } } } } } } } }
@ -244,108 +413,132 @@ else
]=])
if not r then
print ("decoding a deep nested table raises an error:", x)
print (&quot;decoding a deep nested table raises an error:&quot;, x)
else
local i = 0
while type(x) == 'table' do
i = i + 1
x = x.x
end
if i ~= 60 or x ~= "deep down" then
print ("deep nested table isn't decoded correctly")
if i ~= 60 or x ~= &quot;deep down&quot; then
print (&quot;deep nested table isn't decoded correctly&quot;)
end
end
if false and test_module == 'cmj-json' then
-- unfortunatly the version can't be read
print ("decoding a big array takes ages (or forever?) on cmj-json prior to version 0.9.5")
print (&quot;decoding a big array takes ages (or forever?) on cmj-json prior to version 0.9.5&quot;)
else
r, x = pcall(decode, "["..("0,"):rep(100000).."0]")
r, x = pcall(decode, &quot;[&quot;..(&quot;0,&quot;):rep(100000)..&quot;0]&quot;)
if not r then
print ("decoding a big array raises an error:", x)
print (&quot;decoding a big array raises an error:&quot;, x)
else
if type(x) ~= 'table' or #x ~= 100001 then
print ("big array isn't decoded correctly")
print (&quot;big array isn't decoded correctly&quot;)
end
end
end
r, x = pcall(decode, "{}")
r, x = pcall(decode, &quot;{}&quot;)
if not r then
print ("decoding an empty object raises an error:", x)
print (&quot;decoding an empty object raises an error:&quot;, x)
end
r, x = pcall(decode, "[]")
r, x = pcall(decode, &quot;[]&quot;)
if not r then
print ("decoding an empty array raises an error:", x)
print (&quot;decoding an empty array raises an error:&quot;, x)
end
r, x = pcall(decode, "[1e+2]")
r, x = pcall(decode, &quot;[1e+2]&quot;)
if not r then
print ("decoding a number with exponential notation raises an error:", x)
print (&quot;decoding a number with exponential notation raises an error:&quot;, x)
elseif x[1] ~= 1e+2 then
print ("1e+2 decoded incorrectly:", r[1])
print (&quot;1e+2 decoded incorrectly:&quot;, r[1])
end
inlocale(function ()
local r, x = pcall(decode, "[0.5]")
local r, x = pcall(decode, &quot;[0.5]&quot;)
if not r then
print("decoding 0.5 in locale raises an error:", x)
print(&quot;decoding 0.5 in locale raises an error:&quot;, x)
elseif not x then
print("cannot decode 0.5 in locale")
print(&quot;cannot decode 0.5 in locale&quot;)
elseif x[1] ~= 0.5 then
print("decoded 0.5 incorrectly in locale:", x[1])
print(&quot;decoded 0.5 incorrectly in locale:&quot;, x[1])
end
end)
-- special tests for dkjson:
if test_module == 'dkjson' then
x = dkdecode[=[ [{"x":0}] ]=]
x = dkdecode[=[ [{&quot;x&quot;:0}] ]=]
local m = getmetatable(x)
if not m or m.__jsontype ~= 'array' then
print ("<metatable>.__jsontype ~= array")
print (&quot;&lt;metatable&gt;.__jsontype ~= array&quot;)
end
local m = getmetatable(x[1])
if not m or m.__jsontype ~= 'object' then
print ("<metatable>.__jsontype ~= object")
print (&quot;&lt;metatable&gt;.__jsontype ~= object&quot;)
end
local x,p,m = dkdecode" invalid "
if p ~= 2 or type(m) ~= 'string' or not m:find("at line 1, column 2$") then
print (("Invalid location: position=%d, message=%q"):format(p,m))
local x,p,m = dkdecode&quot; invalid &quot;
if p ~= 2 or type(m) ~= 'string' or not m:find(&quot;at line 1, column 2$&quot;) then
print ((&quot;Invalid location: position=%d, message=%q&quot;):format(p,m))
end
local x,p,m = dkdecode&quot; \n invalid &quot;
if p ~= 4 or type(m) ~= 'string' or not m:find(&quot;at line 2, column 2$&quot;) then
print ((&quot;Invalid location: position=%d, message=%q&quot;):format(p,m))
end
do -- single line comments
local x, p, m = dkdecode [[
{&quot;test://&quot; // comment // --?
: [ // continues
0] //
}
]]
if type(x) ~= 'table' or type(x[&quot;test://&quot;]) ~= 'table' or x[&quot;test://&quot;][1] ~= 0 then
print(&quot;could not decode a string with single line comments: &quot;..tostring(m))
end
end
do -- multi line comments
local x, p, m = dkdecode [[
{&quot;test:/*&quot;/**//*
hi! this is a comment
*/ : [/** / **/ 0]
}
]]
if type(x) ~= 'table' or type(x[&quot;test:/*&quot;]) ~= 'table' or x[&quot;test:/*&quot;][1] ~= 0 then
print(&quot;could not decode a string with multi line comments: &quot;..tostring(m))
end
local x,p,m = dkdecode" \n invalid "
if p ~= 4 or type(m) ~= 'string' or not m:find("at line 2, column 2$") then
print (("Invalid location: position=%d, message=%q"):format(p,m))
end
end
end
if encode and opt == "refcycle" then
if encode and opt == &quot;refcycle&quot; then
local a = {}
a.a = a
print ("Trying a reference cycle...")
print (&quot;Trying a reference cycle...&quot;)
encode(a)
end
if encode and (opt or ""):sub(1,3) == "esc" then
if encode and (opt or &quot;&quot;):sub(1,3) == &quot;esc&quot; then
local strchar, strbyte, strformat = string.char, string.byte, string.format
local floor = math.floor
local function unichar (value)
if value < 0 then
if value &lt; 0 then
return nil
elseif value <= 0x007f then
elseif value &lt;= 0x007f then
return strchar (value)
elseif value <= 0x07ff then
elseif value &lt;= 0x07ff then
return strchar (0xc0 + floor(value/0x40),
0x80 + (floor(value) % 0x40))
elseif value <= 0xffff then
elseif value &lt;= 0xffff then
return strchar (0xe0 + floor(value/0x1000),
0x80 + (floor(value/0x40) % 0x40),
0x80 + (floor(value) % 0x40))
elseif value <= 0x10ffff then
elseif value &lt;= 0x10ffff then
return strchar (0xf0 + floor(value/0x40000),
0x80 + (floor(value/0x1000) % 0x40),
0x80 + (floor(value/0x40) % 0x40),
@ -356,53 +549,53 @@ local function unichar (value)
end
local escapecodes = {
["\""] = "\\\"", ["\\"] = "\\\\", ["\b"] = "\\b", ["\f"] = "\\f",
["\n"] = "\\n", ["\r"] = "\\r", ["\t"] = "\\t", ["/"] = "\\/"
[&quot;\&quot;&quot;] = &quot;\\\&quot;&quot;, [&quot;\\&quot;] = &quot;\\\\&quot;, [&quot;\b&quot;] = &quot;\\b&quot;, [&quot;\f&quot;] = &quot;\\f&quot;,
[&quot;\n&quot;] = &quot;\\n&quot;, [&quot;\r&quot;] = &quot;\\r&quot;, [&quot;\t&quot;] = &quot;\\t&quot;, [&quot;/&quot;] = &quot;\\/&quot;
}
local function escapeutf8 (uchar)
local a, b, c, d = strbyte (uchar, 1, 4)
a, b, c, d = a or 0, b or 0, c or 0, d or 0
if a <= 0x7f then
if a &lt;= 0x7f then
value = a
elseif 0xc0 <= a and a <= 0xdf and b >= 0x80 then
elseif 0xc0 &lt;= a and a &lt;= 0xdf and b &gt;= 0x80 then
value = (a - 0xc0) * 0x40 + b - 0x80
elseif 0xe0 <= a and a <= 0xef and b >= 0x80 and c >= 0x80 then
elseif 0xe0 &lt;= a and a &lt;= 0xef and b &gt;= 0x80 and c &gt;= 0x80 then
value = ((a - 0xe0) * 0x40 + b - 0x80) * 0x40 + c - 0x80
elseif 0xf0 <= a and a <= 0xf7 and b >= 0x80 and c >= 0x80 and d >= 0x80 then
elseif 0xf0 &lt;= a and a &lt;= 0xf7 and b &gt;= 0x80 and c &gt;= 0x80 and d &gt;= 0x80 then
value = (((a - 0xf0) * 0x40 + b - 0x80) * 0x40 + c - 0x80) * 0x40 + d - 0x80
else
return ""
return &quot;&quot;
end
if value <= 0xffff then
return strformat ("\\u%.4x", value)
elseif value <= 0x10ffff then
if value &lt;= 0xffff then
return strformat (&quot;\\u%.4x&quot;, value)
elseif value &lt;= 0x10ffff then
-- encode as UTF-16 surrogate pair
value = value - 0x10000
local highsur, lowsur = 0xD800 + floor (value/0x400), 0xDC00 + (value % 0x400)
return strformat ("\\u%.4x\\u%.4x", highsur, lowsur)
return strformat (&quot;\\u%.4x\\u%.4x&quot;, highsur, lowsur)
else
return ""
return &quot;&quot;
end
end
local isspecial = {}
local unifile = io.open("UnicodeData.txt")
local unifile = io.open(&quot;UnicodeData.txt&quot;)
if unifile then
-- <http://www.unicode.org/Public/UNIDATA/UnicodeData.txt>
-- &lt;http://www.unicode.org/Public/UNIDATA/UnicodeData.txt&gt;
-- each line consists of 15 parts for each defined codepoints
local pat = {}
for i = 1,14 do
pat[i] = "[^;]*;"
pat[i] = &quot;[^;]*;&quot;
end
pat[1] = "([^;]*);" -- Codepoint
pat[3] = "([^;]*);" -- Category
pat[15] = "[^;]*"
pat[1] = &quot;([^;]*);&quot; -- Codepoint
pat[3] = &quot;([^;]*);&quot; -- Category
pat[15] = &quot;[^;]*&quot;
pat = table.concat(pat)
for line in unifile:lines() do
local cp, cat = line:match(pat)
if cat:match("^C[^so]") or cat:match("^Z[lp]") then
if cat:match(&quot;^C[^so]&quot;) or cat:match(&quot;^Z[lp]&quot;) then
isspecial[tonumber(cp, 16)] = cat
end
end
@ -415,72 +608,72 @@ end
local esc = {}
local escerr = {}
local range
if opt == "esc_full" then range = 0x10ffff
elseif opt == "esc_asc" then range = 0x7f
if opt == &quot;esc_full&quot; then range = 0x10ffff
elseif opt == &quot;esc_asc&quot; then range = 0x7f
else range = 0xffff end
for i = 0,range do
t[1] = unichar(i)
xe = encode(t)
x = string.match(xe, "^%s*%[%s*%\"(.*)%\"%s*%]%s*$")
x = string.match(xe, &quot;^%s*%[%s*%\&quot;(.*)%\&quot;%s*%]%s*$&quot;)
if type(x) ~= 'string' then
escerr[i] = xe
elseif string.lower(x) == escapeutf8(t[1]) then
esc[i] = 'u'
elseif x == escapecodes[t[1]] then
esc[i] = 'c'
elseif x:sub(1,1) == "\\" then
elseif x:sub(1,1) == &quot;\\&quot; then
escerr[i] = xe
end
end
do
local i = 0
while i <= range do
while i &lt;= range do
local first
while i <= range and not (esc[i] or isspecial[i]) do i = i + 1 end
if i > range then break end
while i &lt;= range and not (esc[i] or isspecial[i]) do i = i + 1 end
if i &gt; range then break end
first = i
local special = isspecial[i]
if esc[i] and special then
while esc[i] and isspecial[i] == special do i = i + 1 end
if i-1 > first then
print (("Escaped %s characters from U+%04X to U+%04X"):format(special,first,i-1))
if i-1 &gt; first then
print ((&quot;Escaped %s characters from U+%04X to U+%04X&quot;):format(special,first,i-1))
else
print (("Escaped %s character U+%04X"):format(special,first))
print ((&quot;Escaped %s character U+%04X&quot;):format(special,first))
end
elseif esc[i] then
while esc[i] and not isspecial[i] do i = i + 1 end
if i-1 > first then
print (("Escaped from U+%04X to U+%04X"):format(first,i-1))
if i-1 &gt; first then
print ((&quot;Escaped from U+%04X to U+%04X&quot;):format(first,i-1))
else
if first >= 32 and first <= 127 then
print (("Escaped U+%04X (%c)"):format(first,first))
if first &gt;= 32 and first &lt;= 127 then
print ((&quot;Escaped U+%04X (%c)&quot;):format(first,first))
else
print (("Escaped U+%04X"):format(first))
print ((&quot;Escaped U+%04X&quot;):format(first))
end
end
elseif special then
while not esc[i] and isspecial[i] == special do i = i + 1 end
if i-1 > first then
print (("Unescaped %s characters from U+%04X to U+%04X"):format(special,first,i-1))
if i-1 &gt; first then
print ((&quot;Unescaped %s characters from U+%04X to U+%04X&quot;):format(special,first,i-1))
else
print (("Unescaped %s character U+%04X"):format(special,first))
print ((&quot;Unescaped %s character U+%04X&quot;):format(special,first))
end
end
end
end
do
local i = 0
while i <= range do
while i &lt;= range do
local first
while i <= range and not escerr[i] do i = i + 1 end
while i &lt;= range and not escerr[i] do i = i + 1 end
if not escerr[i] then break end
first = i
while escerr[i] do i = i + 1 end
if i-1 > first then
print (("Errors while escaping from U+%04X to U+%04X"):format(first, i-1))
if i-1 &gt; first then
print ((&quot;Errors while escaping from U+%04X to U+%04X&quot;):format(first, i-1))
else
print (("Errors while escaping U+%04X"):format(first))
print ((&quot;Errors while escaping U+%04X&quot;):format(first))
end
end
end
@ -491,7 +684,7 @@ end
--
-- Permission is hereby granted, free of charge, to any person obtaining
-- a copy of this software and associated documentation files (the
-- "Software"), to deal in the Software without restriction, including
-- &quot;Software&quot;), to deal in the Software without restriction, including
-- without limitation the rights to use, copy, modify, merge, publish,
-- distribute, sublicense, and/or sell copies of the Software, and to
-- permit persons to whom the Software is furnished to do so, subject to
@ -500,7 +693,7 @@ end
-- The above copyright notice and this permission notice shall be
-- included in all copies or substantial portions of the Software.
--
-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-- THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND,
-- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
@ -510,3 +703,13 @@ end
-- SOFTWARE.
</pre>
</blockquote>
</div>
<div class="footer">
<a href="./">dkolf.de</a>
<a href="/contact">contact</a>
(This page was generated by <a class="extlink" href="http://www.fossil-scm.org/">Fossil</a>.)
</div>
</body></html>

273
readme.txt Normal file
View File

@ -0,0 +1,273 @@
<!DOCTYPE html>
<html>
<head>
<base href="http://dkolf.de/src/dkjson-lua.fsl/artifact" />
<title>Artifact Content - dkjson</title>
<link rel="alternate" type="application/rss+xml" title="RSS Feed"
href="/src/dkjson-lua.fsl/timeline.rss" />
<link rel="stylesheet" href="/src/dkjson-lua.fsl/style.css?default" type="text/css"
media="screen" />
</head>
<body>
<h1>Artifact Content &mdash; dkjson</h1>
<div class="mainmenu">
<a href='/'>dkolf.de</a>
<a href='/src/dkjson-lua.fsl/home'>dkjson</a>
<a href='/src/dkjson-lua.fsl/timeline'>Timeline</a>
<a href='/src/dkjson-lua.fsl/brlist'>Branches</a>
<a href='/src/dkjson-lua.fsl/taglist'>Tags</a>
<a href='/src/dkjson-lua.fsl/wiki'>Wiki</a>
<a href='/src/dkjson-lua.fsl/login'>Login</a>
</div>
<div class="submenu">
<a class="label" href="/src/dkjson-lua.fsl/timeline?n=200&amp;uf=14fd609d5835b5c808632c2ef0d11c6a92e8f967">Checkins Using</a>
<a class="label" href="/src/dkjson-lua.fsl/raw/readme.txt?name=14fd609d5835b5c808632c2ef0d11c6a92e8f967">Download</a>
<a class="label" href="/src/dkjson-lua.fsl/hexdump?name=14fd609d5835b5c808632c2ef0d11c6a92e8f967">Hex</a>
</div>
<div class="content">
<script>
function gebi(x){
if(/^#/.test(x)) x = x.substr(1);
var e = document.getElementById(x);
if(!e) throw new Error("Expecting element with ID "+x);
else return e;}
</script>
<h2>Artifact 14fd609d5835b5c808632c2ef0d11c6a92e8f967:</h2>
<ul>
<li>File
<a id='a1' href='/src/dkjson-lua.fsl/honeypot'>readme.txt</a>
<ul>
<li>
2014-04-28 21:16:16
- part of checkin
<span class="timelineHistDsp">[3d24a61dd0]</span>
on branch <a id='a2' href='/src/dkjson-lua.fsl/honeypot'>trunk</a>
- fix line breaks in readme.txt, fix release year
(user:
dhkolf
</ul>
</ul>
<hr />
<blockquote>
<pre>
David Kolf's JSON module for Lua 5.1/5.2
========================================
*Version 2.5*
In the default configuration this module writes no global values, not even
the module table. Import it using
json = require (&quot;dkjson&quot;)
In environments where `require` or a similiar function are not available
and you cannot receive the return value of the module, you can set the
option `register_global_module_table` to `true`. The module table will
then be saved in the global variable with the name given by the option
`global_module_name`.
Exported functions and values:
`json.encode (object [, state])`
--------------------------------
Create a string representing the object. `Object` can be a table,
a string, a number, a boolean, `nil`, `json.null` or any object with
a function `__tojson` in its metatable. A table can only use strings
and numbers as keys and its values have to be valid objects as
well. It raises an error for any invalid data types or reference
cycles.
`state` is an optional table with the following fields:
- `indent`
When `indent` (a boolean) is set, the created string will contain
newlines and indentations. Otherwise it will be one long line.
- `keyorder`
`keyorder` is an array to specify the ordering of keys in the
encoded output. If an object has keys which are not in this array
they are written after the sorted keys.
- `level`
This is the initial level of indentation used when `indent` is
set. For each level two spaces are added. When absent it is set
to 0.
- `buffer`
`buffer` is an array to store the strings for the result so they
can be concatenated at once. When it isn't given, the encode
function will create it temporary and will return the
concatenated result.
- `bufferlen`
When `bufferlen` is set, it has to be the index of the last
element of `buffer`.
- `tables`
`tables` is a set to detect reference cycles. It is created
temporary when absent. Every table that is currently processed
is used as key, the value is `true`.
- `exception`
When `exception` is given, it will be called whenever the encoder
cannot encode a given value.
The parameters are `reason`, `value`, `state` and `defaultmessage`.
`reason` is either `&quot;reference cycle&quot;`, `&quot;custom encoder failed&quot;` or
`&quot;unsupported type&quot;`. `value` is the original value that caused the
exception, `state` is this state table, `defaultmessage` is the message
of the error that would usually be raised.
You can either return `true` and add directly to the buffer or you can
return the string directly. To keep raising an error return `nil` and
the desired error message.
An example implementation for an exception function is given in
`json.encodeexception`.
When `state.buffer` was set, the return value will be `true` on
success. Without `state.buffer` the return value will be a string.
`json.decode (string [, position [, null]])`
--------------------------------------------
Decode `string` starting at `position` or at 1 if `position` was
omitted.
`null` is an optional value to be returned for null values. The
default is `nil`, but you could set it to `json.null` or any other
value.
The return values are the object or `nil`, the position of the next
character that doesn't belong to the object, and in case of errors
an error message.
Two metatables are created. Every array or object that is decoded gets
a metatable with the `__jsontype` field set to either `array` or
`object`. If you want to provide your own metatables use the syntax
json.decode (string, position, null, objectmeta, arraymeta)
To prevent the assigning of metatables pass `nil`:
json.decode (string, position, null, nil)
`&lt;metatable&gt;.__jsonorder`
-------------------------
`__jsonorder` can overwrite the `keyorder` for a specific table.
`&lt;metatable&gt;.__jsontype`
------------------------
`__jsontype` can be either `&quot;array&quot;` or `&quot;object&quot;`. This value is only
checked for empty tables. (The default for empty tables is `&quot;array&quot;`).
`&lt;metatable&gt;.__tojson (self, state)`
------------------------------------
You can provide your own `__tojson` function in a metatable. In this
function you can either add directly to the buffer and return true,
or you can return a string. On errors nil and a message should be
returned.
`json.null`
-----------
You can use this value for setting explicit `null` values.
`json.version`
--------------
Set to `&quot;dkjson 2.5&quot;`.
`json.quotestring (string)`
---------------------------
Quote a UTF-8 string and escape critical characters using JSON
escape sequences. This function is only necessary when you build
your own `__tojson` functions.
`json.addnewline (state)`
-------------------------
When `state.indent` is set, add a newline to `state.buffer` and spaces
according to `state.level`.
`json.encodeexception (reason, value, state, defaultmessage)`
-------------------------------------------------------------
This function can be used as value to the `exception` option. Instead of
raising an error this function encodes the error message as a string. This
can help to debug malformed input data.
x = json.encode(value, { exception = json.encodeexception })
LPeg support
------------
When the local configuration variable `always_try_using_lpeg` is set,
this module tries to load LPeg to replace the `decode` function. The
speed increase is significant. You can get the LPeg module at
&lt;http://www.inf.puc-rio.br/~roberto/lpeg/&gt;.
When LPeg couldn't be loaded, the pure Lua functions stay active.
In case you don't want this module to require LPeg on its own,
disable the option `always_try_using_lpeg` in the options section at
the top of the module.
In this case you can later load LPeg support using
### `json.use_lpeg ()`
Require the LPeg module and replace the functions `quotestring` and
and `decode` with functions that use LPeg patterns.
This function returns the module table, so you can load the module
using:
json = require &quot;dkjson&quot;.use_lpeg()
Alternatively you can use `pcall` so the JSON module still works when
LPeg isn't found.
json = require &quot;dkjson&quot;
pcall (json.use_lpeg)
### `json.using_lpeg`
This variable is set to `true` when LPeg was loaded successfully.
---------------------------------------------------------------------
Contact
-------
You can contact the author by sending an e-mail to 'david' at the
domain 'dkolf.de'.
---------------------------------------------------------------------
*Copyright (C) 2010-2014 David Heiko Kolf*
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
&quot;Software&quot;), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
</pre>
</blockquote>
</div>
<div class="footer">
<a href="./">dkolf.de</a>
<a href="/contact">contact</a>
(This page was generated by <a class="extlink" href="http://www.fossil-scm.org/">Fossil</a>.)
</div>
</body></html>

View File

@ -1,3 +1,55 @@
<!DOCTYPE html>
<html>
<head>
<base href="http://dkolf.de/src/dkjson-lua.fsl/artifact" />
<title>Artifact Content - dkjson</title>
<link rel="alternate" type="application/rss+xml" title="RSS Feed"
href="/src/dkjson-lua.fsl/timeline.rss" />
<link rel="stylesheet" href="/src/dkjson-lua.fsl/style.css?default" type="text/css"
media="screen" />
</head>
<body>
<h1>Artifact Content &mdash; dkjson</h1>
<div class="mainmenu">
<a href='/'>dkolf.de</a>
<a href='/src/dkjson-lua.fsl/home'>dkjson</a>
<a href='/src/dkjson-lua.fsl/timeline'>Timeline</a>
<a href='/src/dkjson-lua.fsl/brlist'>Branches</a>
<a href='/src/dkjson-lua.fsl/taglist'>Tags</a>
<a href='/src/dkjson-lua.fsl/wiki'>Wiki</a>
<a href='/src/dkjson-lua.fsl/login'>Login</a>
</div>
<div class="submenu">
<a class="label" href="/src/dkjson-lua.fsl/timeline?n=200&amp;uf=18fa972b68042a87ff3ae03c9f6accf575b13d2d">Checkins Using</a>
<a class="label" href="/src/dkjson-lua.fsl/raw/speedtest.lua?name=18fa972b68042a87ff3ae03c9f6accf575b13d2d">Download</a>
<a class="label" href="/src/dkjson-lua.fsl/hexdump?name=18fa972b68042a87ff3ae03c9f6accf575b13d2d">Hex</a>
</div>
<div class="content">
<script>
function gebi(x){
if(/^#/.test(x)) x = x.substr(1);
var e = document.getElementById(x);
if(!e) throw new Error("Expecting element with ID "+x);
else return e;}
</script>
<h2>Artifact 18fa972b68042a87ff3ae03c9f6accf575b13d2d:</h2>
<ul>
<li>File
<a id='a1' href='/src/dkjson-lua.fsl/honeypot'>speedtest.lua</a>
<ul>
<li>
2011-08-05 21:59:09
- part of checkin
<span class="timelineHistDsp">[e0a83a39ad]</span>
on branch <a id='a2' href='/src/dkjson-lua.fsl/honeypot'>trunk</a>
- updated the tests to reflect the new version of cmj-JSON4Lua
(user:
dhkolf
</ul>
</ul>
<hr />
<blockquote>
<pre>
local encode, decode
local test_module = ... -- command line argument
@ -15,57 +67,57 @@ local test_module = ... -- command line argument
if test_module == 'cmj-json' then
-- http://json.luaforge.net/
local json = require "cmjjson" -- renamed, the original file was just 'json'
local json = require &quot;cmjjson&quot; -- renamed, the original file was just 'json'
encode = json.encode
decode = json.decode
elseif test_module == 'dkjson' then
-- http://chiselapp.com/user/dhkolf/repository/dkjson/
local dkjson = require "dkjson"
local dkjson = require &quot;dkjson&quot;
encode = dkjson.encode
decode = dkjson.decode
elseif test_module == 'dkjson-nopeg' then
package.preload["lpeg"] = function () error "lpeg disabled" end
package.loaded["lpeg"] = nil
package.preload[&quot;lpeg&quot;] = function () error &quot;lpeg disabled&quot; end
package.loaded[&quot;lpeg&quot;] = nil
lpeg = nil
local dkjson = require "dkjson"
local dkjson = require &quot;dkjson&quot;
encode = dkjson.encode
decode = dkjson.decode
elseif test_module == 'fleece' then
-- http://www.eonblast.com/fleece/
local fleece = require "fleece"
encode = function(x) return fleece.json(x, "E4") end
local fleece = require &quot;fleece&quot;
encode = function(x) return fleece.json(x, &quot;E4&quot;) end
elseif test_module == 'jf-json' then
-- http://regex.info/blog/lua/json
local json = require "jfjson" -- renamed, the original file was just 'JSON'
local json = require &quot;jfjson&quot; -- renamed, the original file was just 'JSON'
encode = function(x) return json:encode(x) end
decode = function(x) return json:decode(x) end
elseif test_module == 'lua-yajl' then
-- http://github.com/brimworks/lua-yajl
local yajl = require ("yajl")
local yajl = require (&quot;yajl&quot;)
encode = yajl.to_string
decode = yajl.to_value
elseif test_module == 'mp-cjson' then
-- http://www.kyne.com.au/~mark/software/lua-cjson.php
local json = require "cjson"
local json = require &quot;cjson&quot;
encode = json.encode
decode = json.decode
elseif test_module == 'nm-json' then
-- http://luaforge.net/projects/luajsonlib/
local json = require "LuaJSON"
local json = require &quot;LuaJSON&quot;
encode = json.encode or json.stringify
decode = json.decode or json.parse
elseif test_module == 'sb-json' then
-- http://www.chipmunkav.com/downloads/Json.lua
local json = require "sbjson" -- renamed, the original file was just 'Json'
local json = require &quot;sbjson&quot; -- renamed, the original file was just 'Json'
encode = json.Encode
decode = json.Decode
elseif test_module == 'th-json' then
-- http://luaforge.net/projects/luajson/
local json = require "json"
local json = require &quot;json&quot;
encode = json.encode
decode = json.decode
else
print "No module specified"
print &quot;No module specified&quot;
return
end
@ -74,34 +126,34 @@ end
local str = [[
{
"Herausgeber": "Xema",
"Nummer": "1234-5678-9012-3456",
"Deckung": 26,
"Währung": "EUR",
"Inhaber": {
"Name": "Mustermann",
"Vorname": "Max",
"männlich": true,
"Depot": {},
"Hobbys": [ "Reiten", "Golfen", "Lesen" ],
"Alter": 42,
"Kinder": [0],
"Partner": null
&quot;Herausgeber&quot;: &quot;Xema&quot;,
&quot;Nummer&quot;: &quot;1234-5678-9012-3456&quot;,
&quot;Deckung&quot;: 26,
&quot;Währung&quot;: &quot;EUR&quot;,
&quot;Inhaber&quot;: {
&quot;Name&quot;: &quot;Mustermann&quot;,
&quot;Vorname&quot;: &quot;Max&quot;,
&quot;männlich&quot;: true,
&quot;Depot&quot;: {},
&quot;Hobbys&quot;: [ &quot;Reiten&quot;, &quot;Golfen&quot;, &quot;Lesen&quot; ],
&quot;Alter&quot;: 42,
&quot;Kinder&quot;: [0],
&quot;Partner&quot;: null
}
}
]]
local tbl = {
Herausgeber= "Xema",
Nummer= "1234-5678-9012-3456",
Herausgeber= &quot;Xema&quot;,
Nummer= &quot;1234-5678-9012-3456&quot;,
Deckung= 2e+6,
["Währung"]= "EUR",
[&quot;Währung&quot;]= &quot;EUR&quot;,
Inhaber= {
Name= "Mustermann",
Vorname= "Max",
["männlich"]= true,
Name= &quot;Mustermann&quot;,
Vorname= &quot;Max&quot;,
[&quot;männlich&quot;]= true,
Depot= {},
Hobbys= { "Reiten", "Golfen", "Lesen" },
Hobbys= { &quot;Reiten&quot;, &quot;Golfen&quot;, &quot;Lesen&quot; },
Alter= 42,
Kinder= {},
Partner= nil
@ -117,7 +169,7 @@ if decode then
decode (str)
end
t2 = os.clock ()
print ("Decoding:", t2 - t1)
print (&quot;Decoding:&quot;, t2 - t1)
end
if encode then
@ -126,6 +178,16 @@ if encode then
encode (tbl)
end
t2 = os.clock ()
print ("Encoding:", t2 - t1)
print (&quot;Encoding:&quot;, t2 - t1)
end
</pre>
</blockquote>
</div>
<div class="footer">
<a href="./">dkolf.de</a>
<a href="/contact">contact</a>
(This page was generated by <a class="extlink" href="http://www.fossil-scm.org/">Fossil</a>.)
</div>
</body></html>

View File

@ -1,3 +1,63 @@
<!DOCTYPE html>
<html>
<head>
<base href="http://dkolf.de/src/dkjson-lua.fsl/artifact" />
<title>Artifact Content - dkjson</title>
<link rel="alternate" type="application/rss+xml" title="RSS Feed"
href="/src/dkjson-lua.fsl/timeline.rss" />
<link rel="stylesheet" href="/src/dkjson-lua.fsl/style.css?default" type="text/css"
media="screen" />
</head>
<body>
<h1>Artifact Content &mdash; dkjson</h1>
<div class="mainmenu">
<a href='/'>dkolf.de</a>
<a href='/src/dkjson-lua.fsl/home'>dkjson</a>
<a href='/src/dkjson-lua.fsl/timeline'>Timeline</a>
<a href='/src/dkjson-lua.fsl/brlist'>Branches</a>
<a href='/src/dkjson-lua.fsl/taglist'>Tags</a>
<a href='/src/dkjson-lua.fsl/wiki'>Wiki</a>
<a href='/src/dkjson-lua.fsl/login'>Login</a>
</div>
<div class="submenu">
<a class="label" href="/src/dkjson-lua.fsl/timeline?n=200&amp;uf=441fcf232729d1ec667cb34cc60ebda85579ed9e">Checkins Using</a>
<a class="label" href="/src/dkjson-lua.fsl/raw/versions.txt?name=441fcf232729d1ec667cb34cc60ebda85579ed9e">Download</a>
<a class="label" href="/src/dkjson-lua.fsl/hexdump?name=441fcf232729d1ec667cb34cc60ebda85579ed9e">Hex</a>
</div>
<div class="content">
<script>
function gebi(x){
if(/^#/.test(x)) x = x.substr(1);
var e = document.getElementById(x);
if(!e) throw new Error("Expecting element with ID "+x);
else return e;}
</script>
<h2>Artifact 441fcf232729d1ec667cb34cc60ebda85579ed9e:</h2>
<ul>
<li>File
<a id='a1' href='/src/dkjson-lua.fsl/honeypot'>versions.txt</a>
<ul>
<li>
2014-04-28 21:01:14
- part of checkin
<span class="timelineHistDsp">[fdee269361]</span>
on branch <a id='a2' href='/src/dkjson-lua.fsl/honeypot'>trunk</a>
- increased version
(user:
dhkolf
</ul>
</ul>
<hr />
<blockquote>
<pre>
Version 2.5 (2014-04-28)
===========
Changes since version 2.4:
* Added customizable exception handling.
* Decode input that contains JavaScript comments.
Version 2.4 (2013-09-28)
===========
@ -64,7 +124,7 @@ Version 1.1 (2011-07-08)
Changes since version 1.0:
* The values NaN/+Inf/-Inf are recognised and encoded as "null" like in
* The values NaN/+Inf/-Inf are recognised and encoded as &quot;null&quot; like in
the original JavaScript implementation.
* Read __tojson even from blocked metatables through the debug module.
* Fixed decoding single numbers.
@ -88,8 +148,8 @@ Changes since version 1.0:
However, you can specify your own metatables as arguments).
* There are no spaces added any longer when encoding.
* It is possible to explicitly sort keys for encoding by providing an array with key
names to the option "keyorder" or the metatable field __jsonorder.
* The values NaN/+Inf/-Inf are recognised and encoded as "null" like in
names to the option &quot;keyorder&quot; or the metatable field __jsonorder.
* The values NaN/+Inf/-Inf are recognised and encoded as &quot;null&quot; like in
the original JavaScript implementation.
Version 1.0
@ -97,3 +157,13 @@ Version 1.0
Initial version, released 2010-08-28.
</pre>
</blockquote>
</div>
<div class="footer">
<a href="./">dkolf.de</a>
<a href="/contact">contact</a>
(This page was generated by <a class="extlink" href="http://www.fossil-scm.org/">Fossil</a>.)
</div>
</body></html>