Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/torch/argcheck.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRonan Collobert <ronan@collobert.com>2016-01-31 06:38:55 +0300
committerRonan Collobert <ronan@collobert.com>2016-01-31 06:38:55 +0300
commit6a65dc9446208f7f30a0cdec4a2b9f92449efbc7 (patch)
tree552e6acc09b15642b08080a339ec47ded21cb041
parenta7b8a29c17c9421f7567f1c36454060b1470edfb (diff)
better support of the doc dump feature
-rw-r--r--dump.lua1
-rw-r--r--init.lua6
-rw-r--r--usage.lua3
3 files changed, 8 insertions, 2 deletions
diff --git a/dump.lua b/dump.lua
index ac60498..01072ef 100644
--- a/dump.lua
+++ b/dump.lua
@@ -9,4 +9,3 @@ ffi.gc(doc.__noop,
end)
doc.record()
-
diff --git a/init.lua b/init.lua
index aafa5c5..0461de3 100644
--- a/init.lua
+++ b/init.lua
@@ -1,6 +1,7 @@
local env = require 'argcheck.env'
local utils = require 'argcheck.utils'
local doc = require 'argcheck.doc'
+local usage = require 'argcheck.usage'
local ACN = require 'argcheck.graph'
local setupvalue = utils.setupvalue
@@ -96,6 +97,11 @@ local function argcheck(rules)
'self cannot be optional, nor having a default value!')
end
+ -- dump doc if any
+ if rules.doc or rules.help then
+ doc(usage(true, rules, true))
+ end
+
local code, upvalues = generaterules(rules)
if rules.debug then
print(code)
diff --git a/usage.lua b/usage.lua
index d4090b8..3eed346 100644
--- a/usage.lua
+++ b/usage.lua
@@ -78,6 +78,7 @@ end
local function usage(truth, rules, ...)
if truth then
+ local norender = select(1, ...)
local doc = rules.help or rules.doc
if doc then
@@ -96,7 +97,7 @@ local function usage(truth, rules, ...)
doc = '\n*Arguments:*\n' .. generateargt(rules)
end
- if sdascii then
+ if sdascii and not norender then
doc = sdascii.render(doc)
end