cli: Move help/0 to inter.jq, better help for -n

wader · Sep 12, 2021 · e2ff2a2 · e2ff2a2
1 parent 5a82224
commit e2ff2a2
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 10 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -115,6 +115,8 @@
         "tfhd",
         "tfra",
         "tmpl",
+        "toboolean",
+        "tobytes",
         "toimage",
         "tojson",
         "tojvalue",

diff --git a/doc/usage.md b/doc/usage.md
@@ -14,7 +14,7 @@ Usage: fq [OPTIONS] [--] [EXPR] [FILE...]
 --help,-h               Show help
 --include-path,-L PATH  Include search path
 --join-output,-j        No newline between outputs
---null-input,-n         Null input (can still use input/0 and inputs/0)
+--null-input,-n         Null input (use input/0 and inputs/0 to read input)
 --null-output,-0        Null byte between outputs
 --option,-o KEY=VALUE   Set option, eg: color=true
                           addrbase=16

diff --git a/pkg/interp/funcs.jq b/pkg/interp/funcs.jq
@@ -1,10 +1,3 @@
-# TODO: introspect and show doc, reflection somehow?
-def help:
-  ( builtins[]
-  , "^C interrupt"
-  , "^D exit REPL"
-  ) | println;
-
 def format: ._format? // null;
 
 # integer division

diff --git a/pkg/interp/interp.jq b/pkg/interp/interp.jq
@@ -341,6 +341,12 @@ def var($k; f):
   );
 def var($k): . as $c | var($k; $c);
 
+# TODO: introspect and show doc, reflection somehow?
+def help:
+  ( builtins[]
+  , "^C interrupt"
+  , "^D exit REPL"
+  ) | println;
 
 def _main:
   def _formats_list:
@@ -413,7 +419,7 @@ def _main:
       "null_input": {
         short: "-n",
         long: "--null-input",
-        description: "Null input (can still use input/0 and inputs/0)",
+        description: "Null input (use input/0 and inputs/0 to read input)",
         bool: true
       },
       "options": {

diff --git a/pkg/interp/testdata/args.fqtest b/pkg/interp/testdata/args.fqtest
@@ -1,5 +1,6 @@
 /test.mp3:
 $ fq
+\
 exitcode: 2
 stderr:
 Usage: fq [OPTIONS] [--] [EXPR] [FILE...]
@@ -16,7 +17,7 @@ Usage: fq [OPTIONS] [--] [EXPR] [FILE...]
 --help,-h               Show help
 --include-path,-L PATH  Include search path
 --join-output,-j        No newline between outputs
---null-input,-n         Null input (can still use input/0 and inputs/0)
+--null-input,-n         Null input (use input/0 and inputs/0 to read input)
 --null-output,-0        Null byte between outputs
 --option,-o KEY=VALUE   Set option, eg: color=true
                           addrbase=16
@@ -49,6 +50,7 @@ null> ^D
 $ fq -i . /test.mp3
 mp3> ^D
 $ fq -n
+\
 exitcode: 2
 stderr:
 Usage: fq [OPTIONS] [--] [EXPR] [FILE...]
@@ -129,14 +131,17 @@ wav                WAV file
 webp               WebP image
 xing               Xing header
 $ fq -X
+\
 exitcode: 2
 stderr:
 error: -X: no such argument
 $ fq --X
+\
 exitcode: 2
 stderr:
 error: --X: no such argument
 $ fq -.
+\
 exitcode: 2
 stderr:
 error: -.: no such argument