Fix processing of typedef struct and struct declarations. Fix --xref mode.

Some constucts were processed incorrectly (see typedef.at for examples).
Unit-local types were not displayed in xref mode.

* src/cflow.h (symbol_temp): Rename to symbol_temp. All uses changed.
* src/output.c (tree_output): In all_functions mode: print all functions
without explicit caller.
* src/parser.c (save_token): Process curly braces.
(fake_struct): Don't restore stack upon encountering identifier or
modifier. See typedef.at for testcases.
(parse_variable_declaration): restore stack only if type_end is -1 (no
tag encountered). See struct06 in struct.at
(skip_struct): Minor change.
* src/parser.h: Redefine token types as enum.
* src/symbol.c (unit_local_list): New static.
(static_free): Preserve unit-local symbols in unit_local_list in xref
mode.
(collect_symbols): Consider symbols from unit_local_list.

* tests/Makefile.am: Add new testcases.
* tests/testsuite.at (CFLOW_TEST): New macro.
Include new testcases.
* tests/struct.at: New file.

* tests/typedef.at: New file.
* tests/struct01.at: Remove.
* tests/struct02.at: Remove.
* tests/struct03.at: Remove.
* tests/struct04.at: Remove.

* .gitignore: Update.

13 files changed, 223 insertions, 176 deletions

diff --git a/.gitignore b/.gitignore
index 9ed9226..099af3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,7 @@
 *~
 .bootstrap
 .deps
-.emacs.desktop
+.emacs*
 .gdbinit
 ABOUT-NLS
 ChangeLog
@@ -28,3 +28,8 @@ configure
 gnu
 m4
 stamp-h1
+/cflow-*.tar.*
+*.cflow
+core
+tmp/
+*.patch
diff --git a/src/cflow.h b/src/cflow.h
index 8779a68..7728ab7 100644
--- a/src/cflow.h
+++ b/src/cflow.h
@@ -85,8 +85,8 @@ typedef struct {
 
 enum symbol_flag {
      symbol_none,
-     symbol_temp,                  /* Temporary symbol. Must be deleted after
-                                      processing of the current module */
+     symbol_local,                 /* Unit-local symbol. Must be deleted after
+                                      processing current compilation unit */
      symbol_parm,                  /* Parameter */
      symbol_alias                  /* Alias to another symbol */
 };
diff --git a/src/output.c b/src/output.c
index f4d1359..bf5af1f 100644
--- a/src/output.c
+++ b/src/output.c
@@ -401,7 +401,9 @@ tree_output()
 
           if (all_functions) {
                for (i = 0; i < num; i++) {
-                    if (main_sym != symbols[i] && symbols[i]->source) {
+                    if (main_sym != symbols[i]
+                        && symbols[i]->source
+                        && symbols[i]->caller == NULL) {
                          direct_tree(0, 0, symbols[i]);
                          separator();
                     }
diff --git a/src/parser.c b/src/parser.c
index 391fe33..39d4b7c 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -379,6 +379,20 @@ save_token(TOKSTK *tokptr)
           obstack_1grow(&text_stk, tokptr->type);
           need_space = 0;
           break;
+     case LBRACE:
+     case LBRACE0:
+          if (need_space) 
+               obstack_1grow(&text_stk, ' ');
+          obstack_1grow(&text_stk, '{');
+          need_space = 1;
+          break;
+     case RBRACE:
+     case RBRACE0:
+          if (need_space) 
+               obstack_1grow(&text_stk, ' ');
+          obstack_1grow(&text_stk, '}');
+          need_space = 1;
+          break;
      case OP:
           obstack_1grow(&text_stk, ' ');
           obstack_grow(&text_stk, tokptr->token, strlen(tokptr->token));
@@ -685,9 +699,6 @@ parse_function_declaration(Ident *ident, int parm)
 int
 fake_struct(Ident *ident)
 {
-     Stackpos sp;
-     
-     mark(sp);
      ident->type_end = -1;
      if (tok.type == STRUCT) {
           if (nexttoken() == IDENTIFIER) {
@@ -695,15 +706,8 @@ fake_struct(Ident *ident)
           }
           putback();
           skip_struct();
-          if (tok.type == IDENTIFIER || tok.type == MODIFIER) {
-               int pos = curs-1;
-               restore(sp);
-               if (ident->type_end == -1) {
-                    /* there was no tag. Insert { ... } */
-                    tokdel(curs, pos - 1);
-                    tokins(curs, IDENTIFIER, tok.line, "{ ... }");
-                    debugtoken(&tok, "modified stack");
-               }
+          if (tok.type == IDENTIFIER || tok.type == MODIFIER || tok.type == QUALIFIER) {
+               putback();
           } else if (tok.type == '(')
                return 0;
           else if (tok.type != ';')
@@ -729,9 +733,9 @@ parse_variable_declaration(Ident *ident, int parm)
           while (tok.type == MODIFIER || tok.type == QUALIFIER)
                nexttoken();
           if (tok.type == IDENTIFIER) {
-               int pos = curs-1;
-               restore(sp);
                if (ident->type_end == -1) {
+                    int pos = curs-1;
+                    restore(sp);
                     /* there was no tag. Insert { ... } */
                     tokdel(curs, pos - 1);
                     tokins(curs, IDENTIFIER, tok.line, "{ ... }");
@@ -772,7 +776,6 @@ parse_variable_declaration(Ident *ident, int parm)
           else
                expression();
           goto select;
-          break;
      case LBRACE0:
      case LBRACE:
           func_body();
@@ -837,8 +840,10 @@ skip_struct()
      }
 
      while (tok.type == PARM_WRAPPER) {
-          if (skip_balanced('(', ')', 0) == -1)
+          if (skip_balanced('(', ')', 0) == -1) {
               file_error(_("unexpected end of file in struct"), NULL);
+              return;
+          }
      }
 }
 
diff --git a/src/parser.h b/src/parser.h
index 24434b1..6415d5b 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -15,25 +15,27 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 /* tokens */
-#define WORD 257
-#define LBRACE0 258
-#define RBRACE0 259
-#define IDENTIFIER 260
-#define EXTERN 261
-#define STATIC 262
-#define TYPEDEF 263
-#define STRUCT 264
-#define MODIFIER 265
-#define OP 266
-#define UNION 267
-#define ENUM 268
-#define LBRACE '{'
-#define RBRACE '}'
-#define MEMBER_OF 269
-#define TYPE 270
-#define STRING 271
-#define PARM_WRAPPER 272
-#define QUALIFIER 273
+enum {
+     LBRACE = '{',
+     RBRACE = '}',
+     WORD = 257,
+     LBRACE0,
+     RBRACE0,
+     IDENTIFIER,
+     EXTERN,
+     STATIC,
+     TYPEDEF,
+     STRUCT,
+     MODIFIER,
+     OP,
+     UNION,
+     ENUM,
+     MEMBER_OF,
+     TYPE,
+     STRING,
+     PARM_WRAPPER,
+     QUALIFIER
+};
 
 typedef struct {
     char *str;
diff --git a/src/symbol.c b/src/symbol.c
index e4cf657..a4ca34f 100644
--- a/src/symbol.c
+++ b/src/symbol.c
@@ -23,6 +23,7 @@ static Hash_table *symbol_table;
 static struct linked_list *static_symbol_list;
 static struct linked_list *auto_symbol_list;
 static struct linked_list *static_func_list;
+static struct linked_list *unit_local_list;
 
 static void
 append_symbol(struct linked_list **plist, Symbol *sp)
@@ -99,7 +100,7 @@ install(char *name, int flags)
      if (((flags & INSTALL_CHECK_LOCAL) &&
           canonical_filename && strcmp(filename, canonical_filename)) ||
          (flags & INSTALL_UNIT_LOCAL)) {
-          sym->flag = symbol_temp;
+          sym->flag = symbol_local;
           append_symbol(&static_symbol_list, sym);
      } else
           sym->flag = symbol_none;
@@ -222,9 +223,17 @@ static_free(void *data)
 
      if (!t)
           return;
-     if (sym->flag == symbol_temp) 
+     if (sym->flag == symbol_local) {