Reordered functions

(find_option_type): Take third argument.
(symbol_override,number,parse_level_string)
(set_level_indent): Operate on read-only strings
(options): New option --number (-n)

1 files changed, 265 insertions, 244 deletions

diff --git a/src/main.c b/src/main.c
index d312718..08ab6cc 100644
--- a/src/main.c
+++ b/src/main.c
@@ -20,12 +20,6 @@
 #include <stdarg.h>
 #include <parser.h>
 
-void symbol_override();
-void init();
-void set_print_option(char*);
-static void set_level_indent(char*);
-static void parse_level_string(char*, char**);
-
 const char *argp_program_version = "cflow (" PACKAGE_NAME ") " VERSION;
 const char *argp_program_bug_address = "<" PACKAGE_BUGREPORT ">";
 static char doc[] = "";
@@ -61,15 +55,17 @@ static struct argp_option options[] = {
        "record defines (not implemented yet)", 11 },
      { "ansi", 'a', NULL, 0,
        "Assume input to be written in ANSI C", 11 },
-     { "pushdown", 'p', "VALUE", 0,
-       "set initial token stack size to VALUE", 11 },
+     { "pushdown", 'p', "NUMBER", 0,
+       "set initial token stack size to NUMBER", 11 },
      { "symbol", 's', "SYM:TYPE", 0,
        "make cflow believe the symbol SYM is of type TYPE. Valid types are: keyword (or kw), modifier, identifier, type, wrapper. Any unambiguous abbreviation of the above is also accepted", 11 },
      { "main", 'm', "NAME", 0,
        "Assume main function to be called NAME", 11 },
      
      { NULL, 0, NULL, 0,
-       "Output control:", 20},
+       "Output control:", 20 },
+     { "number", 'n', "BOOL", OPTION_ARG_OPTIONAL,
+       "Print line numbers", 21 },
      { "print-level", 'l', NULL, 0,
        "Print nesting level along with the call tree", 21 },
      { "level-indent", OPT_LEVEL_INDENT, "STRING", 0,
@@ -112,26 +108,6 @@ struct option_type {
     int type;            /* data associated with the arg */
 };
 
-static int find_option_type(struct option_type *, char *);
-
-/* Args for --print option */
-struct option_type print_optype[] = {
-     { "xref", 1, PRINT_XREF },
-     { "cross-ref", 1, PRINT_XREF },
-     { "tree", 1, PRINT_TREE },
-     { 0 },
-};
-/* Args for --symbol option */
-struct option_type symbol_optype[] = {
-     { "keyword", 2, WORD },
-     { "kw", 2, WORD },
-     { "modifier", 1, MODIFIER },
-     { "identifier", 1, IDENTIFIER },
-     { "type", 1, TYPE },
-     { "wrapper", 1, PARM_WRAPPER },
-     { 0 },
-};
-
 int debug;              /* debug level */
 char *outname = "-";    /* default output file name */
 int print_option = 0;   /* what to print. */
@@ -143,6 +119,7 @@ int ignore_indentation; /* Don't rely on indentation,
                          */
 int record_defines;     /* Record macro definitions */
 int strict_ansi;        /* Assume sources to be written in ANSI C */
+int print_line_numbers; /* Print line numbers */
 int print_levels;       /* Print level number near every branch */
 int print_as_tree;      /* Print as tree */
 int brief_listing;      /* Produce short listing */
@@ -164,207 +141,62 @@ char *level_begin = "";
 
 char *start_name = "main"; /* Name of start symbol */
 
-static error_t
-parse_opt (int key, char *arg, struct argp_state *state)
-{
-     int num;
-     
-     switch (key) {
-     case 'a':
-          strict_ansi = 1;
-          break;
-     case OPT_DEBUG:
-          debug = arg ? atoi(arg) : 1;
-          break;
-     case 'L':
-          printf("License for %s:\n\n", argp_program_version);
-          printf("%s", cflow_license_text);
-          exit(0);
-     case 'P':
-          set_print_option(arg);
-          break;
-     case 'S':
-          ignore_indentation = 1;
-          break;
-     case 'T':
-          print_as_tree = 1;
-          level_indent[0] = "  "; /* two spaces */
-          level_indent[1] = "| ";
-          level_end[0] = "+-";
-          level_end[1] = "\\-";
-          break;
-     case 'b':
-          brief_listing = arg ? (arg[0] == 'y' || arg[0] == 'Y') : 1;
-          break;
-     case 'd':
-          max_depth = atoi(arg);
-          if (max_depth < 0)
-               max_depth = 0;
-          break;
-     case OPT_DEFINES:
-          record_defines = 1;
-          break;
-     case 'f':
-          if (select_output_driver(arg))
-               argp_error(state, "%s: No such output driver", optarg);
-          else if (strcmp(arg, "posix") == 0)
-               brief_listing = 1;
-          break;
-     case OPT_LEVEL_INDENT:
-          set_level_indent(arg);
-          break;
-     case 'i':
-          if (arg[0] == '^') {
-               excluded_symbols = xrealloc(excluded_symbols,
-                                           strlen(excluded_symbols) +
-                                           strlen(arg+1) + 1);
-               strcat(excluded_symbols, arg+1);
-          } else {
-               included_symbols = xrealloc(included_symbols,
-                                           strlen(included_symbols) +
-                                           strlen(arg) + 1);
-               strcat(included_symbols, arg);
-          }
-          break;
-     case 'l':
-          print_levels = 1;
-          break;        
-     case 'm':
-          start_name = strdup(arg);
-          break;
-     case 'o':
-          outname = strdup(arg);
-          break;
-     case 'p':
-          num = atoi(arg);
-          if (num > 0)
-               token_stack_length = num;
-          break;
-     case 'r':
-          reverse_tree = 1;
-          break;
-     case 's':
-          symbol_override(arg);
-          break;
-     case 'v':
-          verbose = 1;
-          break;
-     case 'x':
-          print_option = PRINT_XREF;
-          break;
-     default:
-          return ARGP_ERR_UNKNOWN;
-     }
-     return 0;
-}
-
-static struct argp argp = {
-     options,
-     parse_opt,
-     "[FILE]...",
-     doc,
-     NULL,
-     NULL,
-     NULL
-};
-
-int
-included_char(int c)
-{
-     return strchr (included_symbols, c)
-              && !strchr (excluded_symbols, c);
-}
-
-int
-globals_only()
-{
-     return !included_char('s');
-}
-
-int
-include_symbol(Symbol *sym)
-{
-     int type = 0;
-     
-     if (sym->name[0] == '_' && !included_char('_'))
-          return 0;
-
-     if (sym->type == SymIdentifier) {
-          if (sym->arity == -1)
-               type = 'x';
-          else if (sym->storage == StaticStorage)
-               type = 's';
-     } else if (sym->type == SymToken
-                && sym->token_type == TYPE
-                && sym->source)
-          type = 't';
-     
-     if (type == 0)
-          return 1;
-     return included_char(type);
-}
-
-void
-xalloc_die(void)
-{
-     error(1, ENOMEM, "");
-}
-
-void
-init()
-{
-     if (level_indent[0] == NULL) {
-          level_indent[0] = level_indent[1] = "    "; /* 4 spaces */
-          level_end[0] = level_end[1] = "";
-     }
+#define boolean_value(arg) ((arg) ? ((arg)[0] == 'y' || (arg)[0] == 'Y') : 1)