optgen 0.4 → 0.5

data/bin/optgen

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 #
-#  Copyright 2015-2016 Jyri J. Virkki <jyri@virkki.com>
+#  Copyright 2015-2018 Jyri J. Virkki <jyri@virkki.com>
 #
 #  This file is part of optgen.
 #
@@ -19,7 +19,7 @@
 #  along with optgen.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-$VERSION = '0.4'
+$VERSION = '0.5'
 
 
 #-----------------------------------------------------------------------------
@@ -135,6 +135,9 @@ class Command
   # name of the command as given in the config file
   attr_reader :name
 
+  # true if this is a hidden command
+  attr_reader :hidden
+
   # human readable description as given in the config file
   attr_reader :description
 
@@ -153,6 +156,10 @@ class Command
     @description = $2.strip if ($2)
     @options = Array.new()
     @longest_option = 0
+    if (@name[0..1] == "H:")
+      @hidden = true
+      @name = @name[2..-1]
+    end
   end
 
   #---------------------------------------------------------------------------
@@ -194,7 +201,8 @@ class OptGen
       line.chomp!
       line.strip!
       next if (line == "")
-      # depending on the ruby version, char from string may return a char or an int... sigh...
+      # depending on the ruby version, char from string may return
+      # a char or an int... sigh...
       next if (line[0] == '#' || line[0] == 35)
 
       if (line[0] == '[' || line[0] == 91)
@@ -315,6 +323,22 @@ ENDHEADER
     o.puts "#include <stdlib.h>"
     o.puts
 
+    # Print info about which option letters are not taken
+    alphanum = ('a'..'z').to_a + ('A'..'Z').to_a + ('0'..'9').to_a
+    o.puts "//"
+    o.puts "// The following short options are NOT yet taken:"
+    o.print "// "
+    alphanum.each { |c|
+      if (@allargs[c])
+        o.print "."
+      else
+        o.print "#{c}"
+      end
+    }
+    o.puts
+    o.puts "//"
+    o.puts
+
     # Define constants OPT_* for each known option
     n = 0
     o.puts "#define COUNT_OPTIONS #{@options.size}"
@@ -423,6 +447,21 @@ ENDHEADER
     o.puts 'char opt_char(char * str, char def);'
     o.puts
 
+    o.puts '/**'
+    o.puts ' * Convenience function to string value of an option'
+    o.puts ' *'
+    o.puts ' * Parameters:'
+    o.puts ' *   str - A value from options array'
+    o.puts ' *   def - Default value if none given'
+    o.puts ' *'
+    o.puts ' * Return:'
+    o.puts ' *'
+    o.puts ' *   Value of option as char *. If NULL, returns default def.'
+    o.puts ' *'
+    o.puts ' */'
+    o.puts 'char * opt_string(char * str, char * def);'
+    o.puts
+
     o.puts '/**'
     o.puts ' * Show help based on command and option descriptions.'
     o.puts ' *'
@@ -457,7 +496,11 @@ ENDHEADER
     o.puts
     o.puts '// LCOV_EXCL_START'
     o.puts
-    o.puts 'char * numstring[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9", "10" };'
+    o.print 'char * numstring[] = { '
+    1.upto(50) {|n|
+      o.print "\"#{n}\","
+    }
+    o.puts ' "X" };'
     o.puts
 
     # Define the options allowed by each command
@@ -575,6 +618,10 @@ ENDHEADER
         o.puts "        options[#{n}] = numstring[0];"
         o.puts '      } else {'
         o.puts "        options[#{n}] = numstring[atoi(options[#{n}])];"
+        o.puts "        if (!strcmp(options[#{n}], \"X\")) {"
+        o.puts "          printf(\"error: option %s repeated too many times!\\n\", argv[pos]);"
+        o.puts '          exit(1);'
+        o.puts '        }'
         o.puts '      }'
         o.puts '      pos++;'
       end
@@ -653,11 +700,22 @@ ENDHEADER
     o.puts '}'
     o.puts
 
+    o.puts 'char * opt_string(char * str, char * def)'
+    o.puts '{'
+    o.puts '  if (str == NULL) {'
+    o.puts '    return def;'
+    o.puts '  } else {'
+    o.puts '    return str;'
+    o.puts '  }'
+    o.puts '}'
+    o.puts
+
     o.puts 'void opt_show_help()'
     o.puts '{'
 
     @commands.each { |command|
       next if (command.name == "GLOBAL")
+      next if (command.hidden)
 
       line = command.name
       line = line + " " * (2 + @longest_command - command.name.length)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: optgen
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: '0.5'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-13 00:00:00.000000000 Z
+date: 2018-02-13 00:00:00.000000000 Z
 dependencies: []
 description: Generate C code to parse command line options
 email: jyri@virkki.com