3 files changed, 52 insertions, 31 deletions
diff --git a/Completion/Unix/Command/_flex b/Completion/Unix/Command/_flex
index 7ca5b0f83..80b0cd7fc 100644
--- a/Completion/Unix/Command/_flex
+++ b/Completion/Unix/Command/_flex
@@ -1,35 +1,52 @@
-#compdef flex
+#compdef flex flex++
 
 local curcontext="$curcontext" state line ret=1
 typeset -A opt_args
 
-_arguments -C -s \
-  --help --version \
-  '-b[generate backing-up information]' \
-  '-d[make scanner running in debug mode]' \
-  '-f[generate fast scanner (full table)]' \
-  '-h[show help]' \
-  '-i[generate case-insensitive scanner]' \
-  '-l[maximum compatibility with lex]' \
-  '-p[generate performance report]' \
-  '-s[suppress default rule]' \
-  '-t[write scanner to stdout]' \
-  '-v[show summary of statistics about scanner]' \
-  '-w[suppress warnings]' \
-  '-B[generate batch scanner]' \
-  '-F[use fast scanner table representation]' \
-  '-I[generate interactive scanner]' \
-  '-L[don'"'"'t generate #line directives]' \
-  '-T[trace mode]' \
-  '-V[show version]' \
-  '-7[generate 7-bit scanner]' \
-  '-8[generate 8-bit scanner]' \
-  '-\+[generate C++ scanner class]' \
+_arguments -C -s -S \
   '-C-[specify degree of table compression]:table compression:->tabcomp' \
-  '-o-[specify output file]:output file:_files' \
-  '-P-[change yy prefix]:prefix string:' \
-  '-S-[override skeleton file]:skeleton file:_files' \
-  '*:input files:_files -g "*.(#i)(f|)lex(-.)"' && ret=0
+  '--align[trade off larger tables for better memory alignment]' \
+  '--ecs[construct equivalence classes]' \
+  '--meta-ecs[construct meta-equivalence classes]' \
+  '--read[use read() instead of stdio for scanner input]' \
+  '(-f --full)'{-f,--full}'[generate fast scanner (full table)]' \
+  '(-F --fast)'{-F,--fast}'[use fast scanner table representation]' \
+  '(-d --debug)'{-d,--debug}'[enable debug mode in scanner]' \
+  '(-b --backup)'{-b,--backup}'[write backup information to lex.backup]' \
+  '(-p --perf-report)'{-p,--perf-report}'[generate performance report]' \
+  '(-s --nodefault)'{-s,--nodefault}'[suppress default rule to ECHO unmatched text]' \
+  '(-T --trace)'{-T,--trace}'[trace mode]' \
+  '(-w --nowarn)'{-w,--nowarn}'[suppress warnings]' \
+  '(-v --verbose)'{-v,--verbose}'[show summary of statistics about scanner]' \
+  '--hex[use hexadecimal numbers instead of octal in debug outputs]' \
+  '(-o --outfile)'{-o+,--outfile=}'[specify output file]:output file:_files' \
+  '(-S --skel)'{-S+,--skel=}'-[override skeleton file]:skeleton file:_files' \
+  '(-t --stdout)'{-t,--stdout}'[write scanner to stdout]' \
+  '--yyclass=[specify name of C++ class]:class name' \
+  '--header-file=-[create a C header file in addition to the scanner]:file:_files' \
+  '--tables-file=-[write tables to file]::tables file:_files' \
+  '(-7 -8 --7bit --8bit)'{-7,--7bit}'[generate 7-bit scanner]' \
+  '(-7 -8 --7bit --8bit)'{-8,--8bit}'[generate 8-bit scanner]' \
+  '(-B --batch -I --interactive)'{-B,--batch}'[generate batch scanner]' \
+  '(-i --case-insensitive)'{-i,--case-insensitive}'[generate case-insensitive scanner]' \
+  '(-l --lex-compat)'{-l,--lex-compat}'[maximum compatibility with original lex]' \
+  '(-X --posix-compat)'{-l,--posix-compat}'[maximum compatibility with POSIX lex]' \
+  '(-B --batch -I --interactive)'{-I,--interactive}'[generate interactive scanner]' \
+  '--yylineno[track line count in yylineno]' \
+  '-\+[generate C++ scanner class]' \
+  '-D-[define macro]:macro' \
+  '(-L --noline)'{-L,--noline}"[don't generate #line directives]" \
+  '(-P --prefix)'{-P+,--prefix=}'[change yy prefix]:prefix string' \
+  '(-R --reentrant)'{-R,--reentrant}'[generate a reentrant C scanner]' \
+  '--bison-bridge[scanner for bison pure parser]' \
+  '--bison-locations[include yylloc support]' \
+  '--stdinit[initialize yyin/yyout to stdin/stdout]' \
+  "--nounistd[don't include <unistd.h>]" \
+  "--no-[don't generate a particular function]:function" \
+  '(-c -n)'{-c,-n}'[do nothing]' \
+  '(- *)'{-h,--help}'[display help information]' \
+  '( *)'{-V,--version}'[display version information]' \
+  '*:input file:_files -g "*.(#i)(f|)lex(-.)"' && ret=0
 
 if [[ -n "$state" ]]; then
   _values -s '' 'table compression' \
@@ -38,7 +55,7 @@ if [[ -n "$state" ]]; then
     '(m)f[generate full tables]' \
     '(m)F[generate fast tables]' \
     '(f F)m[construct meta-equivalence classes]' \
-    'r[don'"'"'t use stdio library]' && ret=0
+    "r[don't use stdio library]" && ret=0
 fi
 
 return ret
diff --git a/Completion/Unix/Command/_sqlite b/Completion/Unix/Command/_sqlite
index 05027c603..df673894c 100644
--- a/Completion/Unix/Command/_sqlite
+++ b/Completion/Unix/Command/_sqlite
@@ -22,7 +22,7 @@ options+=(
 )
 
 output_modes=( column HTML line list )
-(( $+sqlite3 )) && output_modes+=( csv )
+(( $+sqlite3 )) && output_modes+=( csv quote )
 exclusive=( $^dashes-${^output_modes:l} )
 for display_opt in $output_modes ; do
   # finagle the description to match the way SQLite's -help formats them
@@ -32,8 +32,8 @@ for display_opt in $output_modes ; do
 done
 
 options+=(
-  $^dashes'-separator[set output field separator]:string to separate output fields:'
-  $^dashes'-nullvalue[set null value string]:string for NULL values:'
+  $^dashes'-separator[set output field separator]:output field separator [|]'
+  $^dashes'-nullvalue[set text string for null values]:string'
   '(- :)'$^dashes'-version[show SQLite version]'
   '(- :)'$^dashes'-help[show help]'
   '1:SQLite database file:_files'
@@ -42,9 +42,12 @@ options+=(
 
 (( $+sqlite3 )) && options+=(
   $^dashes'-bail[stop after hitting an error]'
+  $^dashes'-cmd[run specified command before reading stdin]:sqlite meta-command'
   '(-*batch -*interactive)'$^dashes'-batch[force batch I/O]'
   '(-*batch -*interactive)'$^dashes'-interactive[force interactive I/O]'
+  $^dashes'-mmap[set default mmap size]:size'
   $^dashes'-stats[print memory stats before each finalize]'
+  $^dashes'-vfs[use specified default VFS]:vfs:(unix-dotfile unix-excl unix-none unix-namedsem)'
 )
 
 _arguments $options
diff --git a/Completion/Unix/Command/_sudo b/Completion/Unix/Command/_sudo
index aa7a1a498..ec293d469 100644
--- a/Completion/Unix/Command/_sudo
+++ b/Completion/Unix/Command/_sudo
@@ -26,6 +26,7 @@ args=(
   '(-r --role)'{-r+,--role=}'[create SELinux security context with specified role]:role'
   '(-S --stdin)'{-S,--stdin}'[read password from standard input]'
   '(-t --type)'{-t+,--type=}'[create SELinux security context with specified type]:type'
+  '(-T --command-timeout)'{-T+,--command-timeout=}'[terminate command after specified time limit]:timeout'
   '(-U --other-user)'{-U+,--other-user=}'[in list mode, display privileges for user]:user:_users'
   '(-u --user)'{-u+,--user=}'[run command (or edit file) as specified user]:user:_users'
   '(-)'{-V,--version}'[display version information and exit]'