diff --git a/HACKING b/HACKING index c9ad4cc49..341b97100 100644 --- a/HACKING +++ b/HACKING @@ -109,3 +109,12 @@ There should be no difference shown as long as the "old version" passed the same tests as the new version - given the example above: there was no support for REPORT WRITER in 2.2 so there would be an expected failure of the RW tests. + +For debugging the AST, you may specify --enable-dump-ast at the +configure step. In such a case, new options -fdump-ast= and +-fdump-ast-flags= will become available to print the AST +generated for a given file in a file. This option is implemented using +an automatically generated printer cobc/dump_ast_gen.c, that is +generated by ctypes-gen (https://github.com/OCamlPro/ctypes-gen). If +you don't have the tool, you may just modify the file and wait for +somebody else to regenerate it at some point. diff --git a/cobc/ChangeLog.branch b/cobc/ChangeLog.branch index d8d470f63..3765d53dc 100644 --- a/cobc/ChangeLog.branch +++ b/cobc/ChangeLog.branch @@ -1,11 +1,8 @@ - * cobc.c, dump_tree.c: new options to dump the AST in text format: - --dump-tree=, and --dump-tree-flags=. Format is - either OCaml (for files with .ml extension) or JSON. If file - ends with '/', then it is expected to be a directory and the - file will be generated with the program id as name. Flags are - '+/-' for enable/disable, 'c' for cb_common, 'l' for locations, - 't' for types, 'p' for pointers, 'i' for indentation, 'n' for - newlines, 'A' for all infos, 'O' for OCaml format, 'J' for - JSON format, 'm' for message. Env variables COB_DUMP_TREE and - COB_DUMP_TREE_FLAGS can also be used to set these flags. + * Makefile.am, cobc.c, dump_ast.c: new options to dump the AST in + text format: --dump-ast=, and + --dump-ast-flags=. Format is not standard for now, because + it is only for debugging the AST. Flags are prefixed with '+/-' + for enable/disable, 'i' for indentation, 'z' for zero/null + fields. Env variables COB_DUMP_AST and COB_DUMP_AST_FLAGS can also + be used to set these flags. diff --git a/cobc/Makefile.am b/cobc/Makefile.am index 03e38c3f8..1782899f7 100644 --- a/cobc/Makefile.am +++ b/cobc/Makefile.am @@ -23,7 +23,7 @@ bin_PROGRAMS = cobc cobc_SOURCES = cobc.c cobc.h ppparse.y pplex.c parser.y scanner.c config.c \ reserved.c error.c tree.c tree.h field.c typeck.c codegen.c help.c \ config.def flag.def warning.def codeoptim.def ppparse.def \ - codeoptim.c replace.c dump_tree.c + codeoptim.c replace.c dump_ast.c #cobc_SOURCES = cobc.c cobc.h ppparse.y pplex.l parser.y scanner.l config.c @@ -40,7 +40,7 @@ COBC = cobc$(EXEEXT) # sources that needs to be built *before* any other file # note: we actually want their header files... BUILT_SOURCES = ppparse.c parser.c -EXTRA_DIST = pplex.l scanner.l ppparse.h parser.h dump_tree_gen.c +EXTRA_DIST = pplex.l scanner.l ppparse.h parser.h dump_ast_gen.c MAINTAINERCLEANFILES = pplex.c scanner.c ppparse.h parser.h cobc.1 CLEANFILES = parser.output ppparse.output @@ -68,9 +68,7 @@ endif .l.c: LC_CTYPE=C $(LEX) -o$@ $< -dump_tree.$(OBJEXT): $(top_srcdir)/cobc/dump_tree_gen.c - .PHONY: update-dump-tree update-dump-tree: - ctypes2json -I $(top_srcdir)/cobc -I $(top_srcdir)/lib > $(top_srcdir)/cobc/dump_tree_gen.c + ctypes-gen --gnucobol -I $(top_srcdir)/cobc -I $(top_srcdir)/lib > $(top_srcdir)/cobc/dump_ast_gen.c diff --git a/cobc/cobc.c b/cobc/cobc.c index 2eb706c3b..ada1bbf68 100644 --- a/cobc/cobc.c +++ b/cobc/cobc.c @@ -116,8 +116,8 @@ enum compile_level { #define CB_FLAG_GETOPT_DEPEND_ADD_PHONY 24 #define CB_FLAG_GETOPT_DEPEND_KEEP_MISSING 25 #define CB_FLAG_GETOPT_DEPEND_ON_THE_SIDE 26 -#define CB_FLAG_DUMP_TREE 27 -#define CB_FLAG_DUMP_TREE_FLAGS 28 +#define CB_FLAG_DUMP_AST 27 +#define CB_FLAG_DUMP_AST_FLAGS 28 /* Info display limits */ #define CB_IMSG_SIZE 24 @@ -465,8 +465,8 @@ static int save_all_src = 0; static signed int save_c_src = 0; static signed int verbose_output = 0; static int cb_coverage_enabled = 0; -static char* dump_tree_to_file = NULL; -static char* dump_tree_flags = NULL; +static char* dump_ast_to_file = NULL; +static char* dump_ast_flags = NULL; static int cob_optimize = 0; @@ -3777,18 +3777,18 @@ process_command_line (const int argc, char **argv) break; case CB_FLAG_GETOPT_DEPEND_OUTPUT_FILE: /* -MF */ cb_depend_filename = cobc_strdup(cob_optarg); - case CB_FLAG_DUMP_TREE: - if (dump_tree_to_file) - cobc_main_free (dump_tree_to_file); - dump_tree_to_file = cobc_main_strdup (cob_optarg); + case CB_FLAG_DUMP_AST: + if (dump_ast_to_file) + cobc_main_free (dump_ast_to_file); + dump_ast_to_file = cobc_main_strdup (cob_optarg); break; - case CB_FLAG_DUMP_TREE_FLAGS: - if (dump_tree_flags){ - char* old = dump_tree_flags; - dump_tree_flags = cobc_main_stradd_dup(dump_tree_flags, cob_optarg); + case CB_FLAG_DUMP_AST_FLAGS: + if (dump_ast_flags){ + char* old = dump_ast_flags; + dump_ast_flags = cobc_main_stradd_dup(dump_ast_flags, cob_optarg); cobc_main_free (old); } else { - dump_tree_flags = cobc_main_strdup (cob_optarg); + dump_ast_flags = cobc_main_strdup (cob_optarg); } break; @@ -8320,10 +8320,10 @@ process_translate (struct filename *fn) } } - if (!dump_tree_to_file) - dump_tree_to_file = getenv("COB_DUMP_TREE"); - if (dump_tree_to_file) - cb_dump_tree_to_file (current_program, dump_tree_to_file, dump_tree_flags); + if (!dump_ast_to_file) + dump_ast_to_file = getenv("COB_DUMP_AST"); + if (dump_ast_to_file) + cb_dump_ast_to_file (current_program, dump_ast_to_file, dump_ast_flags); /* Translate to C */ codegen (current_program, fn->translate); diff --git a/cobc/cobc.h b/cobc/cobc.h index 822ab413d..2c1bcf2ca 100644 --- a/cobc/cobc.h +++ b/cobc/cobc.h @@ -509,7 +509,6 @@ extern void *cobc_realloc (void *, const size_t); extern void *cobc_main_malloc (const size_t); extern void *cobc_main_strdup (const char *); -extern char *cobc_main_stradd_dup (const char *, const char*); extern void *cobc_main_realloc (void *, const size_t); extern void cobc_main_free (void *); diff --git a/cobc/codegen.c b/cobc/codegen.c index 5215ba26b..c46d67f24 100644 --- a/cobc/codegen.c +++ b/cobc/codegen.c @@ -14040,7 +14040,6 @@ codegen_internal (struct cb_program *prog, const int subsequent_call) } } - /* output the procedure division code */ output_internal_function (prog, prog->parameter_list); if (!prog->next_program) { diff --git a/cobc/dump_ast.c b/cobc/dump_ast.c new file mode 100644 index 000000000..9e8cc9b31 --- /dev/null +++ b/cobc/dump_ast.c @@ -0,0 +1,259 @@ +/* + Copyright (C) 2023-2024 Free Software Foundation, Inc. + Written by Fabrice Le Fessant + + This file is part of GnuCOBOL. + + The GnuCOBOL compiler is free software: you can redistribute it + and/or modify it under the terms of the GNU General Public License + as published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + GnuCOBOL is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with GnuCOBOL. If not, see . +*/ + + +#include "config.h" + +#include +#include +#include +#include +#ifdef HAVE_STRINGS_H +#include +#endif +#include +#include +#include + +#include "cobc.h" +#include "../libcob/coblocal.h" +#include "tree.h" + +/* field descriptor of tree dump */ +static FILE* fd = NULL; + +/* flag: whether we should indent the file. Enabled by default */ +static int print_tree_with_indent = 1; + +/* flag: whether we print fields that are 0 or NULL. Disabled by default */ +static int print_zero_fields = 0; + +static const char * get_indent (int indent); +static void print_struct_cb_tree_common (int indent, int ptr_uid, struct cb_tree_common *ptr); +static void print_struct_cb_tree_common_ptr (int indent, cb_tree cb); +static void print_int_array (int indent, int n, int * tab); + +#define PRINT_NULL(indent,ty) \ + fprintf (fd, "NULL") +#define PRINT_ENUM_TY(s) \ + /* const char* ty = s */ +#define PRINT_ENUM(indent,ty,s) \ + fprintf (fd, "%s", s) +#define PRINT_ENUM_UNKNOWN(indent,ty,s) \ + fprintf (fd, "Unknown enum %d", s) + +#define PRINT_STRUCT_KNOWN(indent, ty, ptr_uid) \ + fprintf (fd, "ALREADY_SEEN(%s --> MB%03d)", ty, ptr_uid) +#define PRINT_STRUCT_TY(s) \ + const char* ty = s +#define PRINT_STRUCT_PTR_TY(s) \ + const char* ty = s +#define PRINT_STRUCT_BEGIN(indent,ty, ptr_uid) \ + if (ptr_uid != 0) \ + fprintf (fd, "// MEMORY_BLOCK(MB%03d):\n", ptr_uid); \ + else \ + fprintf (fd, "// INLINE_BLOCK:\n"); \ + fprintf (fd, "%s{ //[%s]\n", get_indent (indent), ty) +#define PRINT_STRUCT_END(indent,ty) \ + fprintf (fd, "%s} //[%s]", get_indent (indent), ty) +#define PRINT_VOID(indent) \ + fprintf(fd, "") +#define PRINT_FUNCTION(indent) \ + fprintf(fd, "") +#define PRINT_STRUCT_FIELD_BEGIN(indent,name) \ + fprintf (fd, "%s " #name ": ", get_indent (indent) ) +#define PRINT_STRUCT_FIELD_END(indent) \ + fprintf (fd, ";\n") +#define PRINT_STRUCT_FIELD_END(indent) \ + fprintf (fd, ";\n") + + +#define PRINT_ARRAY_BEGIN(indent) \ + fprintf (fd, "[\n%s", get_indent (indent)) +#define PRINT_ARRAY_SEP(indent) \ + fprintf (fd, ",\n%s", get_indent (indent)) +#define PRINT_ARRAY_END(indent) \ + fprintf (fd, "]") + + + +#define PRINT_UNKNOWN_SELECTOR(indent,ty, tag) \ + fprintf (fd, "%s UNKNOWN %s(%d)\n", get_indent(indent), ty, tag); + + +static void print_size_t (int indent, size_t x) +{ + fprintf (fd, "%ld", x); +} + +static void print_int (int indent, int x) +{ + fprintf (fd, "%d", x); +} + +static void print_char (int indent, char x) +{ + fprintf (fd, "'%c'(%d)", x, x); +} + +static void print_uchar (int indent, unsigned char x) +{ + fprintf (fd, "%d", x); +} + +static void print_uint (int indent, unsigned int x) +{ + fprintf (fd, "%d", x); +} + +static void print_char_ptr (int indent, const char* x) +{ + if (x == NULL){ + PRINT_NULL(indent,ty); + } else { + fprintf (fd, "\"%s\"", x); + } +} + +static void print_uchar_ptr (int indent, const unsigned char* x) +{ + if (x == NULL){ + PRINT_NULL(indent,ty); + } else { + fprintf (fd, "\"%s\"", x); + } +} + +static void print_FILE_ptr (int indent, const FILE* x) +{ + if (x == NULL){ + PRINT_NULL(indent,ty); + } else { + fprintf (fd, ""); + } +} + +static void print_int_ptr (int indent, const int* x) +{ + if (x == NULL){ + PRINT_NULL(indent,ty); + } else { + fprintf (fd, ""); + } +} + +static void print_int_array (int indent, int n, int *x) +{ + if (x == NULL){ + PRINT_NULL(indent,ty); + } else { + fprintf (fd, ""); + } +} + +static void print_cb_word_ptr2 (int indent, struct cb_word** x) +{ + if (x == NULL){ + PRINT_NULL(indent,ty); + } else { + fprintf (fd, ""); + } +} + +static void print_cb_field_ptr2 (int indent, struct cb_field** x) +{ + if (x == NULL){ + PRINT_NULL(indent,ty); + } else { + fprintf (fd, ""); + } +} + + +#include "dump_ast_gen.c" + +static void print_struct_cb_tree_common (int indent, int ptr_uid, struct cb_tree_common *ptr){ + + print_enum_cb_tag (indent+2, ptr->tag); + fprintf (fd, "/"); + print_enum_cb_category (indent+2, ptr->category); + fprintf (fd, "@"); + print_char_ptr (indent+2, ptr->source_file); + fprintf (fd, ":"); + print_int (indent+2, ptr->source_line); +} + +static +void set_flags (const char* flags) +{ + int sign = 1; + int i; + int len = strlen(flags); + + for(i=0; i< len; i++){ + switch(flags[i]){ + case '+': sign = 1; break; + case '-': sign = 0; break; + case 'i': + print_tree_with_indent = sign; + break; + case 'z': + print_zero_fields = sign; + break; + case 'A': + print_zero_fields = sign; + print_tree_with_indent = sign ; + break; + default: + cobc_err_exit ("-fdump-ast-flags: unknown flag '%c', expecting '+-cltpinA'", flags[i]); + } + } +} + +void cb_dump_ast_to_file (struct cb_program *prog, const char *filename, const char* flags) +{ + char *env; + int close_fd = 1; + + env = getenv ("COB_DUMP_AST_FLAGS"); + if (env) set_flags (env); + if (flags) set_flags (flags); + + if (!strcmp(filename, COB_DASH)){ + close_fd = 0; + fd = stdout; + } else { + int len = strlen (filename); + struct stat st; + if (!stat (filename, &st)) unlink(filename); + fd = fopen (filename, "w"); + } + if (!fd){ + cb_perror (0, "cobc: %s: %s", filename, cb_get_strerror ()); + return ; + } + + cb_print_tree ( (cb_tree) prog); + + if (close_fd) { + fclose (fd); + } +} + diff --git a/cobc/dump_tree_gen.c b/cobc/dump_ast_gen.c similarity index 81% rename from cobc/dump_tree_gen.c rename to cobc/dump_ast_gen.c index 84d20295e..d2581b7b0 100644 --- a/cobc/dump_tree_gen.c +++ b/cobc/dump_ast_gen.c @@ -1,5 +1,28 @@ -/* Generated by ctypes2json */ - +/* Generated by ctypes-gen */ + + +static const char * get_indent (int indent){ + static int current_indent = 0; + static char* indent_string = NULL; + static int current_size ; + if (indent == 0 || !print_tree_with_indent) return ""; + + if (indent >= current_size){ + int i; + if (indent_string != NULL) free (indent_string); + current_size = indent + 100 ; + indent_string = (char*) malloc ( current_size ); + current_indent = current_size-1; + for (i=0; ival != NULL ){ + if( print_zero_fields || ptr->val != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,val); @@ -265,7 +288,7 @@ static void print_struct_cb_const (int indent, int ptr_uid, struct cb_const *ptr PRINT_STRUCT_FIELD_END(indent); - } + } indent -= 2; PRINT_STRUCT_END(indent, ty); @@ -299,7 +322,7 @@ static void print_struct_cb_integer (int indent, int ptr_uid, struct cb_integer PRINT_STRUCT_FIELD_END(indent); - if( ptr->val != 0 ){ + if( print_zero_fields || ptr->val != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,val); @@ -307,7 +330,7 @@ static void print_struct_cb_integer (int indent, int ptr_uid, struct cb_integer PRINT_STRUCT_FIELD_END(indent); - } + } indent -= 2; PRINT_STRUCT_END(indent, ty); @@ -341,7 +364,7 @@ static void print_struct_cb_string (int indent, int ptr_uid, struct cb_string *p PRINT_STRUCT_FIELD_END(indent); - if( ptr->data != NULL ){ + if( print_zero_fields || ptr->data != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,data); @@ -349,7 +372,7 @@ static void print_struct_cb_string (int indent, int ptr_uid, struct cb_string *p PRINT_STRUCT_FIELD_END(indent); - } + } PRINT_STRUCT_FIELD_BEGIN(indent,size); @@ -435,7 +458,7 @@ static void print_struct_cb_alphabet_name (int indent, int ptr_uid, struct cb_al PRINT_STRUCT_FIELD_END(indent); - if( ptr->name != NULL ){ + if( print_zero_fields || ptr->name != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,name); @@ -443,9 +466,9 @@ static void print_struct_cb_alphabet_name (int indent, int ptr_uid, struct cb_al PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->cname != NULL ){ + if( print_zero_fields || ptr->cname != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,cname); @@ -453,9 +476,9 @@ static void print_struct_cb_alphabet_name (int indent, int ptr_uid, struct cb_al PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->custom_list != NULL ){ + if( print_zero_fields || ptr->custom_list != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,custom_list); @@ -467,7 +490,7 @@ static void print_struct_cb_alphabet_name (int indent, int ptr_uid, struct cb_al PRINT_STRUCT_FIELD_END(indent); - } + } PRINT_STRUCT_FIELD_BEGIN(indent,alphabet_target); @@ -481,7 +504,7 @@ static void print_struct_cb_alphabet_name (int indent, int ptr_uid, struct cb_al PRINT_STRUCT_FIELD_END(indent); - if( ptr->low_val_char != 0 ){ + if( print_zero_fields || ptr->low_val_char != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,low_val_char); @@ -489,9 +512,9 @@ static void print_struct_cb_alphabet_name (int indent, int ptr_uid, struct cb_al PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->high_val_char != 0 ){ + if( print_zero_fields || ptr->high_val_char != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,high_val_char); @@ -499,9 +522,9 @@ static void print_struct_cb_alphabet_name (int indent, int ptr_uid, struct cb_al PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->values != NULL ){ + if( print_zero_fields || ptr->values != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,values); @@ -509,9 +532,9 @@ static void print_struct_cb_alphabet_name (int indent, int ptr_uid, struct cb_al PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->alphachr != NULL ){ + if( print_zero_fields || ptr->alphachr != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,alphachr); @@ -519,7 +542,7 @@ static void print_struct_cb_alphabet_name (int indent, int ptr_uid, struct cb_al PRINT_STRUCT_FIELD_END(indent); - } + } indent -= 2; PRINT_STRUCT_END(indent, ty); @@ -553,7 +576,7 @@ static void print_struct_cb_class_name (int indent, int ptr_uid, struct cb_class PRINT_STRUCT_FIELD_END(indent); - if( ptr->name != NULL ){ + if( print_zero_fields || ptr->name != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,name); @@ -561,9 +584,9 @@ static void print_struct_cb_class_name (int indent, int ptr_uid, struct cb_class PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->cname != NULL ){ + if( print_zero_fields || ptr->cname != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,cname); @@ -571,9 +594,9 @@ static void print_struct_cb_class_name (int indent, int ptr_uid, struct cb_class PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->list != NULL ){ + if( print_zero_fields || ptr->list != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,list); @@ -585,7 +608,7 @@ static void print_struct_cb_class_name (int indent, int ptr_uid, struct cb_class PRINT_STRUCT_FIELD_END(indent); - } + } indent -= 2; PRINT_STRUCT_END(indent, ty); @@ -619,7 +642,7 @@ static void print_struct_cb_locale_name (int indent, int ptr_uid, struct cb_loca PRINT_STRUCT_FIELD_END(indent); - if( ptr->name != NULL ){ + if( print_zero_fields || ptr->name != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,name); @@ -627,9 +650,9 @@ static void print_struct_cb_locale_name (int indent, int ptr_uid, struct cb_loca PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->cname != NULL ){ + if( print_zero_fields || ptr->cname != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,cname); @@ -637,9 +660,9 @@ static void print_struct_cb_locale_name (int indent, int ptr_uid, struct cb_loca PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->list != NULL ){ + if( print_zero_fields || ptr->list != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,list); @@ -651,7 +674,7 @@ static void print_struct_cb_locale_name (int indent, int ptr_uid, struct cb_loca PRINT_STRUCT_FIELD_END(indent); - } + } indent -= 2; PRINT_STRUCT_END(indent, ty); @@ -716,7 +739,7 @@ static void print_struct_cb_system_name (int indent, int ptr_uid, struct cb_syst PRINT_STRUCT_FIELD_END(indent); - if( ptr->value != NULL ){ + if( print_zero_fields || ptr->value != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,value); @@ -728,7 +751,7 @@ static void print_struct_cb_system_name (int indent, int ptr_uid, struct cb_syst PRINT_STRUCT_FIELD_END(indent); - } + } PRINT_STRUCT_FIELD_BEGIN(indent,category); @@ -736,7 +759,7 @@ static void print_struct_cb_system_name (int indent, int ptr_uid, struct cb_syst PRINT_STRUCT_FIELD_END(indent); - if( ptr->token != 0 ){ + if( print_zero_fields || ptr->token != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,token); @@ -744,7 +767,7 @@ static void print_struct_cb_system_name (int indent, int ptr_uid, struct cb_syst PRINT_STRUCT_FIELD_END(indent); - } + } indent -= 2; PRINT_STRUCT_END(indent, ty); @@ -778,7 +801,7 @@ static void print_struct_cb_schema_name (int indent, int ptr_uid, struct cb_sche PRINT_STRUCT_FIELD_END(indent); - if( ptr->name != NULL ){ + if( print_zero_fields || ptr->name != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,name); @@ -786,9 +809,9 @@ static void print_struct_cb_schema_name (int indent, int ptr_uid, struct cb_sche PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->data != NULL ){ + if( print_zero_fields || ptr->data != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,data); @@ -796,7 +819,7 @@ static void print_struct_cb_schema_name (int indent, int ptr_uid, struct cb_sche PRINT_STRUCT_FIELD_END(indent); - } + } indent -= 2; PRINT_STRUCT_END(indent, ty); @@ -830,7 +853,7 @@ static void print_struct_cb_literal (int indent, int ptr_uid, struct cb_literal PRINT_STRUCT_FIELD_END(indent); - if( ptr->data != NULL ){ + if( print_zero_fields || ptr->data != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,data); @@ -838,9 +861,9 @@ static void print_struct_cb_literal (int indent, int ptr_uid, struct cb_literal PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->size != 0 ){ + if( print_zero_fields || ptr->size != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,size); @@ -848,9 +871,9 @@ static void print_struct_cb_literal (int indent, int ptr_uid, struct cb_literal PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->scale != 0 ){ + if( print_zero_fields || ptr->scale != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,scale); @@ -858,9 +881,9 @@ static void print_struct_cb_literal (int indent, int ptr_uid, struct cb_literal PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->llit != 0 ){ + if( print_zero_fields || ptr->llit != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,llit); @@ -868,9 +891,9 @@ static void print_struct_cb_literal (int indent, int ptr_uid, struct cb_literal PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->sign != 0 ){ + if( print_zero_fields || ptr->sign != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,sign); @@ -878,9 +901,9 @@ static void print_struct_cb_literal (int indent, int ptr_uid, struct cb_literal PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->all != 0 ){ + if( print_zero_fields || ptr->all != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,all); @@ -888,7 +911,7 @@ static void print_struct_cb_literal (int indent, int ptr_uid, struct cb_literal PRINT_STRUCT_FIELD_END(indent); - } + } indent -= 2; PRINT_STRUCT_END(indent, ty); @@ -922,7 +945,7 @@ static void print_struct_cb_decimal (int indent, int ptr_uid, struct cb_decimal PRINT_STRUCT_FIELD_END(indent); - if( ptr->id != 0 ){ + if( print_zero_fields || ptr->id != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,id); @@ -930,7 +953,7 @@ static void print_struct_cb_decimal (int indent, int ptr_uid, struct cb_decimal PRINT_STRUCT_FIELD_END(indent); - } + } indent -= 2; PRINT_STRUCT_END(indent, ty); @@ -992,7 +1015,7 @@ static void print_struct_cb_key_component (int indent, int ptr_uid, struct cb_ke PRINT_STRUCT_BEGIN(indent, ty, ptr_uid); indent += 2; - if( ptr->next != NULL ){ + if( print_zero_fields || ptr->next != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,next); @@ -1004,9 +1027,9 @@ static void print_struct_cb_key_component (int indent, int ptr_uid, struct cb_ke PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->component != NULL ){ + if( print_zero_fields || ptr->component != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,component); @@ -1018,7 +1041,7 @@ static void print_struct_cb_key_component (int indent, int ptr_uid, struct cb_ke PRINT_STRUCT_FIELD_END(indent); - } + } indent -= 2; PRINT_STRUCT_END(indent, ty); @@ -1046,7 +1069,7 @@ static void print_struct_cb_alt_key (int indent, int ptr_uid, struct cb_alt_key PRINT_STRUCT_BEGIN(indent, ty, ptr_uid); indent += 2; - if( ptr->next != NULL ){ + if( print_zero_fields || ptr->next != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,next); @@ -1058,9 +1081,9 @@ static void print_struct_cb_alt_key (int indent, int ptr_uid, struct cb_alt_key PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->key != NULL ){ + if( print_zero_fields || ptr->key != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,key); @@ -1072,9 +1095,9 @@ static void print_struct_cb_alt_key (int indent, int ptr_uid, struct cb_alt_key PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->password != NULL ){ + if( print_zero_fields || ptr->password != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,password); @@ -1086,9 +1109,9 @@ static void print_struct_cb_alt_key (int indent, int ptr_uid, struct cb_alt_key PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->collating_sequence_key != NULL ){ + if( print_zero_fields || ptr->collating_sequence_key != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,collating_sequence_key); @@ -1100,9 +1123,9 @@ static void print_struct_cb_alt_key (int indent, int ptr_uid, struct cb_alt_key PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->duplicates != 0 ){ + if( print_zero_fields || ptr->duplicates != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,duplicates); @@ -1110,9 +1133,9 @@ static void print_struct_cb_alt_key (int indent, int ptr_uid, struct cb_alt_key PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->offset != 0 ){ + if( print_zero_fields || ptr->offset != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,offset); @@ -1120,9 +1143,9 @@ static void print_struct_cb_alt_key (int indent, int ptr_uid, struct cb_alt_key PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->tf_suppress != 0 ){ + if( print_zero_fields || ptr->tf_suppress != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,tf_suppress); @@ -1130,9 +1153,9 @@ static void print_struct_cb_alt_key (int indent, int ptr_uid, struct cb_alt_key PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->char_suppress != 0 ){ + if( print_zero_fields || ptr->char_suppress != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,char_suppress); @@ -1140,9 +1163,9 @@ static void print_struct_cb_alt_key (int indent, int ptr_uid, struct cb_alt_key PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->component_list != NULL ){ + if( print_zero_fields || ptr->component_list != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,component_list); @@ -1154,7 +1177,7 @@ static void print_struct_cb_alt_key (int indent, int ptr_uid, struct cb_alt_key PRINT_STRUCT_FIELD_END(indent); - } + } indent -= 2; PRINT_STRUCT_END(indent, ty); @@ -1199,7 +1222,7 @@ static void print_struct_cb_para_label (int indent, int ptr_uid, struct cb_para_ PRINT_STRUCT_BEGIN(indent, ty, ptr_uid); indent += 2; - if( ptr->next != NULL ){ + if( print_zero_fields || ptr->next != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,next); @@ -1211,9 +1234,9 @@ static void print_struct_cb_para_label (int indent, int ptr_uid, struct cb_para_ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->para != NULL ){ + if( print_zero_fields || ptr->para != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,para); @@ -1225,7 +1248,7 @@ static void print_struct_cb_para_label (int indent, int ptr_uid, struct cb_para_ PRINT_STRUCT_FIELD_END(indent); - } + } indent -= 2; PRINT_STRUCT_END(indent, ty); @@ -1270,7 +1293,7 @@ static void print_struct_cb_xref_elem (int indent, int ptr_uid, struct cb_xref_e PRINT_STRUCT_BEGIN(indent, ty, ptr_uid); indent += 2; - if( ptr->next != NULL ){ + if( print_zero_fields || ptr->next != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,next); @@ -1282,9 +1305,9 @@ static void print_struct_cb_xref_elem (int indent, int ptr_uid, struct cb_xref_e PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->prev != NULL ){ + if( print_zero_fields || ptr->prev != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,prev); @@ -1296,9 +1319,9 @@ static void print_struct_cb_xref_elem (int indent, int ptr_uid, struct cb_xref_e PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->line != 0 ){ + if( print_zero_fields || ptr->line != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,line); @@ -1306,9 +1329,9 @@ static void print_struct_cb_xref_elem (int indent, int ptr_uid, struct cb_xref_e PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->receive != 0 ){ + if( print_zero_fields || ptr->receive != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,receive); @@ -1316,7 +1339,7 @@ static void print_struct_cb_xref_elem (int indent, int ptr_uid, struct cb_xref_e PRINT_STRUCT_FIELD_END(indent); - } + } indent -= 2; PRINT_STRUCT_END(indent, ty); @@ -1327,7 +1350,7 @@ static void print_struct_cb_xref (int indent, int ptr_uid, struct cb_xref *ptr){ PRINT_STRUCT_BEGIN(indent, ty, ptr_uid); indent += 2; - if( ptr->head != NULL ){ + if( print_zero_fields || ptr->head != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,head); @@ -1339,9 +1362,9 @@ static void print_struct_cb_xref (int indent, int ptr_uid, struct cb_xref *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->tail != NULL ){ + if( print_zero_fields || ptr->tail != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,tail); @@ -1353,9 +1376,9 @@ static void print_struct_cb_xref (int indent, int ptr_uid, struct cb_xref *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->amount != 0 ){ + if( print_zero_fields || ptr->amount != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,amount); @@ -1363,9 +1386,9 @@ static void print_struct_cb_xref (int indent, int ptr_uid, struct cb_xref *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->skip != 0 ){ + if( print_zero_fields || ptr->skip != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,skip); @@ -1373,7 +1396,7 @@ static void print_struct_cb_xref (int indent, int ptr_uid, struct cb_xref *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } indent -= 2; PRINT_STRUCT_END(indent, ty); @@ -1401,7 +1424,7 @@ static void print_struct_cb_alter_id (int indent, int ptr_uid, struct cb_alter_i PRINT_STRUCT_BEGIN(indent, ty, ptr_uid); indent += 2; - if( ptr->next != NULL ){ + if( print_zero_fields || ptr->next != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,next); @@ -1413,9 +1436,9 @@ static void print_struct_cb_alter_id (int indent, int ptr_uid, struct cb_alter_i PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->goto_id != 0 ){ + if( print_zero_fields || ptr->goto_id != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,goto_id); @@ -1423,7 +1446,7 @@ static void print_struct_cb_alter_id (int indent, int ptr_uid, struct cb_alter_i PRINT_STRUCT_FIELD_END(indent); - } + } indent -= 2; PRINT_STRUCT_END(indent, ty); @@ -1440,7 +1463,7 @@ static void print_struct_cb_label (int indent, int ptr_uid, struct cb_label *ptr PRINT_STRUCT_FIELD_END(indent); - if( ptr->name != NULL ){ + if( print_zero_fields || ptr->name != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,name); @@ -1448,9 +1471,9 @@ static void print_struct_cb_label (int indent, int ptr_uid, struct cb_label *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->orig_name != NULL ){ + if( print_zero_fields || ptr->orig_name != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,orig_name); @@ -1458,9 +1481,9 @@ static void print_struct_cb_label (int indent, int ptr_uid, struct cb_label *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->section != NULL ){ + if( print_zero_fields || ptr->section != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,section); @@ -1472,9 +1495,9 @@ static void print_struct_cb_label (int indent, int ptr_uid, struct cb_label *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->debug_section != NULL ){ + if( print_zero_fields || ptr->debug_section != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,debug_section); @@ -1486,9 +1509,9 @@ static void print_struct_cb_label (int indent, int ptr_uid, struct cb_label *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->para_label != NULL ){ + if( print_zero_fields || ptr->para_label != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,para_label); @@ -1500,7 +1523,7 @@ static void print_struct_cb_label (int indent, int ptr_uid, struct cb_label *ptr PRINT_STRUCT_FIELD_END(indent); - } + } PRINT_STRUCT_FIELD_BEGIN(indent,xref); @@ -1508,7 +1531,7 @@ static void print_struct_cb_label (int indent, int ptr_uid, struct cb_label *ptr PRINT_STRUCT_FIELD_END(indent); - if( ptr->exit_label != NULL ){ + if( print_zero_fields || ptr->exit_label != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,exit_label); @@ -1520,9 +1543,9 @@ static void print_struct_cb_label (int indent, int ptr_uid, struct cb_label *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->alter_gotos != NULL ){ + if( print_zero_fields || ptr->alter_gotos != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,alter_gotos); @@ -1534,9 +1557,9 @@ static void print_struct_cb_label (int indent, int ptr_uid, struct cb_label *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->id != 0 ){ + if( print_zero_fields || ptr->id != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,id); @@ -1544,9 +1567,9 @@ static void print_struct_cb_label (int indent, int ptr_uid, struct cb_label *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->section_id != 0 ){ + if( print_zero_fields || ptr->section_id != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,section_id); @@ -1554,9 +1577,9 @@ static void print_struct_cb_label (int indent, int ptr_uid, struct cb_label *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->segment != 0 ){ + if( print_zero_fields || ptr->segment != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,segment); @@ -1564,9 +1587,9 @@ static void print_struct_cb_label (int indent, int ptr_uid, struct cb_label *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_section != 0 ){ + if( print_zero_fields || ptr->flag_section != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_section); @@ -1574,9 +1597,9 @@ static void print_struct_cb_label (int indent, int ptr_uid, struct cb_label *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_entry != 0 ){ + if( print_zero_fields || ptr->flag_entry != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_entry); @@ -1584,9 +1607,9 @@ static void print_struct_cb_label (int indent, int ptr_uid, struct cb_label *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_begin != 0 ){ + if( print_zero_fields || ptr->flag_begin != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_begin); @@ -1594,9 +1617,9 @@ static void print_struct_cb_label (int indent, int ptr_uid, struct cb_label *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_return != 0 ){ + if( print_zero_fields || ptr->flag_return != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_return); @@ -1604,9 +1627,9 @@ static void print_struct_cb_label (int indent, int ptr_uid, struct cb_label *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_real_label != 0 ){ + if( print_zero_fields || ptr->flag_real_label != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_real_label); @@ -1614,9 +1637,9 @@ static void print_struct_cb_label (int indent, int ptr_uid, struct cb_label *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_global != 0 ){ + if( print_zero_fields || ptr->flag_global != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_global); @@ -1624,9 +1647,9 @@ static void print_struct_cb_label (int indent, int ptr_uid, struct cb_label *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_declarative_exit != 0 ){ + if( print_zero_fields || ptr->flag_declarative_exit != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_declarative_exit); @@ -1634,9 +1657,9 @@ static void print_struct_cb_label (int indent, int ptr_uid, struct cb_label *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_declaratives != 0 ){ + if( print_zero_fields || ptr->flag_declaratives != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_declaratives); @@ -1644,9 +1667,9 @@ static void print_struct_cb_label (int indent, int ptr_uid, struct cb_label *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_fatal_check != 0 ){ + if( print_zero_fields || ptr->flag_fatal_check != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_fatal_check); @@ -1654,9 +1677,9 @@ static void print_struct_cb_label (int indent, int ptr_uid, struct cb_label *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_dummy_section != 0 ){ + if( print_zero_fields || ptr->flag_dummy_section != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_dummy_section); @@ -1664,9 +1687,9 @@ static void print_struct_cb_label (int indent, int ptr_uid, struct cb_label *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_dummy_paragraph != 0 ){ + if( print_zero_fields || ptr->flag_dummy_paragraph != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_dummy_paragraph); @@ -1674,9 +1697,9 @@ static void print_struct_cb_label (int indent, int ptr_uid, struct cb_label *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_dummy_exit != 0 ){ + if( print_zero_fields || ptr->flag_dummy_exit != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_dummy_exit); @@ -1684,9 +1707,9 @@ static void print_struct_cb_label (int indent, int ptr_uid, struct cb_label *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_next_sentence != 0 ){ + if( print_zero_fields || ptr->flag_next_sentence != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_next_sentence); @@ -1694,9 +1717,9 @@ static void print_struct_cb_label (int indent, int ptr_uid, struct cb_label *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_default_handler != 0 ){ + if( print_zero_fields || ptr->flag_default_handler != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_default_handler); @@ -1704,9 +1727,9 @@ static void print_struct_cb_label (int indent, int ptr_uid, struct cb_label *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_statement != 0 ){ + if( print_zero_fields || ptr->flag_statement != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_statement); @@ -1714,9 +1737,9 @@ static void print_struct_cb_label (int indent, int ptr_uid, struct cb_label *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_first_is_goto != 0 ){ + if( print_zero_fields || ptr->flag_first_is_goto != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_first_is_goto); @@ -1724,9 +1747,9 @@ static void print_struct_cb_label (int indent, int ptr_uid, struct cb_label *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_alter != 0 ){ + if( print_zero_fields || ptr->flag_alter != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_alter); @@ -1734,9 +1757,9 @@ static void print_struct_cb_label (int indent, int ptr_uid, struct cb_label *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_debugging_mode != 0 ){ + if( print_zero_fields || ptr->flag_debugging_mode != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_debugging_mode); @@ -1744,9 +1767,9 @@ static void print_struct_cb_label (int indent, int ptr_uid, struct cb_label *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_is_debug_sect != 0 ){ + if( print_zero_fields || ptr->flag_is_debug_sect != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_is_debug_sect); @@ -1754,9 +1777,9 @@ static void print_struct_cb_label (int indent, int ptr_uid, struct cb_label *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_skip_label != 0 ){ + if( print_zero_fields || ptr->flag_skip_label != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_skip_label); @@ -1764,9 +1787,9 @@ static void print_struct_cb_label (int indent, int ptr_uid, struct cb_label *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_entry_for_goto != 0 ){ + if( print_zero_fields || ptr->flag_entry_for_goto != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_entry_for_goto); @@ -1774,7 +1797,7 @@ static void print_struct_cb_label (int indent, int ptr_uid, struct cb_label *ptr PRINT_STRUCT_FIELD_END(indent); - } + } indent -= 2; PRINT_STRUCT_END(indent, ty); @@ -1819,7 +1842,7 @@ static void print_struct_cb_word (int indent, int ptr_uid, struct cb_word *ptr){ PRINT_STRUCT_BEGIN(indent, ty, ptr_uid); indent += 2; - if( ptr->next != NULL ){ + if( print_zero_fields || ptr->next != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,next); @@ -1831,9 +1854,9 @@ static void print_struct_cb_word (int indent, int ptr_uid, struct cb_word *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->name != NULL ){ + if( print_zero_fields || ptr->name != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,name); @@ -1841,9 +1864,9 @@ static void print_struct_cb_word (int indent, int ptr_uid, struct cb_word *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->items != NULL ){ + if( print_zero_fields || ptr->items != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,items); @@ -1855,9 +1878,9 @@ static void print_struct_cb_word (int indent, int ptr_uid, struct cb_word *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->count != 0 ){ + if( print_zero_fields || ptr->count != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,count); @@ -1865,9 +1888,9 @@ static void print_struct_cb_word (int indent, int ptr_uid, struct cb_word *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->error != 0 ){ + if( print_zero_fields || ptr->error != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,error); @@ -1875,7 +1898,7 @@ static void print_struct_cb_word (int indent, int ptr_uid, struct cb_word *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } indent -= 2; PRINT_STRUCT_END(indent, ty); @@ -1903,7 +1926,7 @@ static void print_struct_local_filename (int indent, int ptr_uid, struct local_f PRINT_STRUCT_BEGIN(indent, ty, ptr_uid); indent += 2; - if( ptr->next != NULL ){ + if( print_zero_fields || ptr->next != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,next); @@ -1915,9 +1938,9 @@ static void print_struct_local_filename (int indent, int ptr_uid, struct local_f PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->local_name != NULL ){ + if( print_zero_fields || ptr->local_name != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,local_name); @@ -1925,9 +1948,9 @@ static void print_struct_local_filename (int indent, int ptr_uid, struct local_f PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->local_include_name != NULL ){ + if( print_zero_fields || ptr->local_include_name != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,local_include_name); @@ -1935,9 +1958,9 @@ static void print_struct_local_filename (int indent, int ptr_uid, struct local_f PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->local_fp != NULL ){ + if( print_zero_fields || ptr->local_fp != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,local_fp); @@ -1949,7 +1972,7 @@ static void print_struct_local_filename (int indent, int ptr_uid, struct local_f PRINT_STRUCT_FIELD_END(indent); - } + } indent -= 2; PRINT_STRUCT_END(indent, ty); @@ -1977,7 +2000,7 @@ static void print_struct_nested_list (int indent, int ptr_uid, struct nested_lis PRINT_STRUCT_BEGIN(indent, ty, ptr_uid); indent += 2; - if( ptr->next != NULL ){ + if( print_zero_fields || ptr->next != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,next); @@ -1989,9 +2012,9 @@ static void print_struct_nested_list (int indent, int ptr_uid, struct nested_lis PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->nested_prog != NULL ){ + if( print_zero_fields || ptr->nested_prog != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,nested_prog); @@ -2003,7 +2026,7 @@ static void print_struct_nested_list (int indent, int ptr_uid, struct nested_lis PRINT_STRUCT_FIELD_END(indent); - } + } indent -= 2; PRINT_STRUCT_END(indent, ty); @@ -2031,7 +2054,7 @@ static void print_struct_handler_struct (int indent, int ptr_uid, struct handler PRINT_STRUCT_BEGIN(indent, ty, ptr_uid); indent += 2; - if( ptr->handler_label != NULL ){ + if( print_zero_fields || ptr->handler_label != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,handler_label); @@ -2043,9 +2066,9 @@ static void print_struct_handler_struct (int indent, int ptr_uid, struct handler PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->handler_prog != NULL ){ + if( print_zero_fields || ptr->handler_prog != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,handler_prog); @@ -2057,7 +2080,7 @@ static void print_struct_handler_struct (int indent, int ptr_uid, struct handler PRINT_STRUCT_FIELD_END(indent); - } + } indent -= 2; PRINT_STRUCT_END(indent, ty); @@ -2102,7 +2125,7 @@ static void print_struct_cb_call_elem (int indent, int ptr_uid, struct cb_call_e PRINT_STRUCT_BEGIN(indent, ty, ptr_uid); indent += 2; - if( ptr->next != NULL ){ + if( print_zero_fields || ptr->next != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,next); @@ -2114,9 +2137,9 @@ static void print_struct_cb_call_elem (int indent, int ptr_uid, struct cb_call_e PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->name != NULL ){ + if( print_zero_fields || ptr->name != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,name); @@ -2124,7 +2147,7 @@ static void print_struct_cb_call_elem (int indent, int ptr_uid, struct cb_call_e PRINT_STRUCT_FIELD_END(indent); - } + } PRINT_STRUCT_FIELD_BEGIN(indent,xref); @@ -2132,7 +2155,7 @@ static void print_struct_cb_call_elem (int indent, int ptr_uid, struct cb_call_e PRINT_STRUCT_FIELD_END(indent); - if( ptr->is_identifier != 0 ){ + if( print_zero_fields || ptr->is_identifier != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,is_identifier); @@ -2140,9 +2163,9 @@ static void print_struct_cb_call_elem (int indent, int ptr_uid, struct cb_call_e PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->is_system != 0 ){ + if( print_zero_fields || ptr->is_system != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,is_system); @@ -2150,7 +2173,7 @@ static void print_struct_cb_call_elem (int indent, int ptr_uid, struct cb_call_e PRINT_STRUCT_FIELD_END(indent); - } + } indent -= 2; PRINT_STRUCT_END(indent, ty); @@ -2161,7 +2184,7 @@ static void print_struct_cb_call_xref (int indent, int ptr_uid, struct cb_call_x PRINT_STRUCT_BEGIN(indent, ty, ptr_uid); indent += 2; - if( ptr->head != NULL ){ + if( print_zero_fields || ptr->head != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,head); @@ -2173,9 +2196,9 @@ static void print_struct_cb_call_xref (int indent, int ptr_uid, struct cb_call_x PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->tail != NULL ){ + if( print_zero_fields || ptr->tail != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,tail); @@ -2187,7 +2210,7 @@ static void print_struct_cb_call_xref (int indent, int ptr_uid, struct cb_call_x PRINT_STRUCT_FIELD_END(indent); - } + } indent -= 2; PRINT_STRUCT_END(indent, ty); @@ -2242,7 +2265,7 @@ static void print_struct_cb_ml_generate_tree (int indent, int ptr_uid, struct cb PRINT_STRUCT_FIELD_END(indent); - if( ptr->name != NULL ){ + if( print_zero_fields || ptr->name != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,name); @@ -2254,7 +2277,7 @@ static void print_struct_cb_ml_generate_tree (int indent, int ptr_uid, struct cb PRINT_STRUCT_FIELD_END(indent); - } + } PRINT_STRUCT_FIELD_BEGIN(indent,type); @@ -2262,7 +2285,7 @@ static void print_struct_cb_ml_generate_tree (int indent, int ptr_uid, struct cb PRINT_STRUCT_FIELD_END(indent); - if( ptr->value != NULL ){ + if( print_zero_fields || ptr->value != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,value); @@ -2274,9 +2297,9 @@ static void print_struct_cb_ml_generate_tree (int indent, int ptr_uid, struct cb PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->suppress_cond != NULL ){ + if( print_zero_fields || ptr->suppress_cond != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,suppress_cond); @@ -2288,9 +2311,9 @@ static void print_struct_cb_ml_generate_tree (int indent, int ptr_uid, struct cb PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->id != 0 ){ + if( print_zero_fields || ptr->id != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,id); @@ -2298,9 +2321,9 @@ static void print_struct_cb_ml_generate_tree (int indent, int ptr_uid, struct cb PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->attrs != NULL ){ + if( print_zero_fields || ptr->attrs != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,attrs); @@ -2312,9 +2335,9 @@ static void print_struct_cb_ml_generate_tree (int indent, int ptr_uid, struct cb PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->parent != NULL ){ + if( print_zero_fields || ptr->parent != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,parent); @@ -2326,9 +2349,9 @@ static void print_struct_cb_ml_generate_tree (int indent, int ptr_uid, struct cb PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->children != NULL ){ + if( print_zero_fields || ptr->children != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,children); @@ -2340,9 +2363,9 @@ static void print_struct_cb_ml_generate_tree (int indent, int ptr_uid, struct cb PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->prev_sibling != NULL ){ + if( print_zero_fields || ptr->prev_sibling != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,prev_sibling); @@ -2354,9 +2377,9 @@ static void print_struct_cb_ml_generate_tree (int indent, int ptr_uid, struct cb PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->sibling != NULL ){ + if( print_zero_fields || ptr->sibling != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,sibling); @@ -2368,7 +2391,7 @@ static void print_struct_cb_ml_generate_tree (int indent, int ptr_uid, struct cb PRINT_STRUCT_FIELD_END(indent); - } + } indent -= 2; PRINT_STRUCT_END(indent, ty); @@ -2413,7 +2436,7 @@ static void print_struct_literal_list (int indent, int ptr_uid, struct literal_l PRINT_STRUCT_BEGIN(indent, ty, ptr_uid); indent += 2; - if( ptr->next != NULL ){ + if( print_zero_fields || ptr->next != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,next); @@ -2425,9 +2448,9 @@ static void print_struct_literal_list (int indent, int ptr_uid, struct literal_l PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->literal != NULL ){ + if( print_zero_fields || ptr->literal != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,literal); @@ -2439,9 +2462,9 @@ static void print_struct_literal_list (int indent, int ptr_uid, struct literal_l PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->id != 0 ){ + if( print_zero_fields || ptr->id != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,id); @@ -2449,9 +2472,9 @@ static void print_struct_literal_list (int indent, int ptr_uid, struct literal_l PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->make_decimal != 0 ){ + if( print_zero_fields || ptr->make_decimal != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,make_decimal); @@ -2459,7 +2482,7 @@ static void print_struct_literal_list (int indent, int ptr_uid, struct literal_l PRINT_STRUCT_FIELD_END(indent); - } + } indent -= 2; PRINT_STRUCT_END(indent, ty); @@ -2527,7 +2550,7 @@ static void print_struct_cob_prof_procedure (int indent, int ptr_uid, struct cob PRINT_STRUCT_BEGIN(indent, ty, ptr_uid); indent += 2; - if( ptr->text != NULL ){ + if( print_zero_fields || ptr->text != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,text); @@ -2535,9 +2558,9 @@ static void print_struct_cob_prof_procedure (int indent, int ptr_uid, struct cob PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->file != NULL ){ + if( print_zero_fields || ptr->file != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,file); @@ -2545,9 +2568,9 @@ static void print_struct_cob_prof_procedure (int indent, int ptr_uid, struct cob PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->line != 0 ){ + if( print_zero_fields || ptr->line != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,line); @@ -2555,9 +2578,9 @@ static void print_struct_cob_prof_procedure (int indent, int ptr_uid, struct cob PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->section != 0 ){ + if( print_zero_fields || ptr->section != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,section); @@ -2565,7 +2588,7 @@ static void print_struct_cob_prof_procedure (int indent, int ptr_uid, struct cob PRINT_STRUCT_FIELD_END(indent); - } + } PRINT_STRUCT_FIELD_BEGIN(indent,kind); @@ -2582,7 +2605,7 @@ static void print_struct_cb_procedure_list (int indent, int ptr_uid, struct cb_p PRINT_STRUCT_BEGIN(indent, ty, ptr_uid); indent += 2; - if( ptr->next != NULL ){ + if( print_zero_fields || ptr->next != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,next); @@ -2594,7 +2617,7 @@ static void print_struct_cb_procedure_list (int indent, int ptr_uid, struct cb_p PRINT_STRUCT_FIELD_END(indent); - } + } PRINT_STRUCT_FIELD_BEGIN(indent,proc); @@ -2617,7 +2640,7 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - if( ptr->next_program != NULL ){ + if( print_zero_fields || ptr->next_program != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,next_program); @@ -2629,9 +2652,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->next_program_ordered != NULL ){ + if( print_zero_fields || ptr->next_program_ordered != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,next_program_ordered); @@ -2643,9 +2666,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->program_name != NULL ){ + if( print_zero_fields || ptr->program_name != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,program_name); @@ -2653,9 +2676,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->program_id != NULL ){ + if( print_zero_fields || ptr->program_id != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,program_id); @@ -2663,9 +2686,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->source_name != NULL ){ + if( print_zero_fields || ptr->source_name != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,source_name); @@ -2673,9 +2696,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->orig_program_id != NULL ){ + if( print_zero_fields || ptr->orig_program_id != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,orig_program_id); @@ -2683,9 +2706,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->word_table != NULL ){ + if( print_zero_fields || ptr->word_table != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,word_table); @@ -2693,9 +2716,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->local_include != NULL ){ + if( print_zero_fields || ptr->local_include != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,local_include); @@ -2707,9 +2730,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->nested_prog_list != NULL ){ + if( print_zero_fields || ptr->nested_prog_list != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,nested_prog_list); @@ -2721,9 +2744,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->common_prog_list != NULL ){ + if( print_zero_fields || ptr->common_prog_list != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,common_prog_list); @@ -2735,9 +2758,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->entry_list != NULL ){ + if( print_zero_fields || ptr->entry_list != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,entry_list); @@ -2749,9 +2772,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->entry_list_goto != NULL ){ + if( print_zero_fields || ptr->entry_list_goto != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,entry_list_goto); @@ -2763,9 +2786,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->file_list != NULL ){ + if( print_zero_fields || ptr->file_list != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,file_list); @@ -2777,9 +2800,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->cd_list != NULL ){ + if( print_zero_fields || ptr->cd_list != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,cd_list); @@ -2791,9 +2814,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->exec_list != NULL ){ + if( print_zero_fields || ptr->exec_list != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,exec_list); @@ -2805,9 +2828,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->label_list != NULL ){ + if( print_zero_fields || ptr->label_list != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,label_list); @@ -2819,9 +2842,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->reference_list != NULL ){ + if( print_zero_fields || ptr->reference_list != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,reference_list); @@ -2833,9 +2856,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->alphabet_name_list != NULL ){ + if( print_zero_fields || ptr->alphabet_name_list != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,alphabet_name_list); @@ -2847,9 +2870,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->symbolic_char_list != NULL ){ + if( print_zero_fields || ptr->symbolic_char_list != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,symbolic_char_list); @@ -2861,9 +2884,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->class_name_list != NULL ){ + if( print_zero_fields || ptr->class_name_list != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,class_name_list); @@ -2875,9 +2898,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->schema_name_list != NULL ){ + if( print_zero_fields || ptr->schema_name_list != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,schema_name_list); @@ -2889,9 +2912,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->parameter_list != NULL ){ + if( print_zero_fields || ptr->parameter_list != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,parameter_list); @@ -2903,9 +2926,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->locale_list != NULL ){ + if( print_zero_fields || ptr->locale_list != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,locale_list); @@ -2917,9 +2940,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->global_list != NULL ){ + if( print_zero_fields || ptr->global_list != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,global_list); @@ -2931,9 +2954,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->report_list != NULL ){ + if( print_zero_fields || ptr->report_list != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,report_list); @@ -2945,9 +2968,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->perform_thru_list != NULL ){ + if( print_zero_fields || ptr->perform_thru_list != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,perform_thru_list); @@ -2959,9 +2982,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->alter_list != NULL ){ + if( print_zero_fields || ptr->alter_list != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,alter_list); @@ -2973,9 +2996,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->debug_list != NULL ){ + if( print_zero_fields || ptr->debug_list != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,debug_list); @@ -2987,9 +3010,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->cb_return_code != NULL ){ + if( print_zero_fields || ptr->cb_return_code != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,cb_return_code); @@ -3001,9 +3024,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->cb_sort_return != NULL ){ + if( print_zero_fields || ptr->cb_sort_return != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,cb_sort_return); @@ -3015,9 +3038,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->cb_call_params != NULL ){ + if( print_zero_fields || ptr->cb_call_params != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,cb_call_params); @@ -3029,9 +3052,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->mnemonic_spec_list != NULL ){ + if( print_zero_fields || ptr->mnemonic_spec_list != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,mnemonic_spec_list); @@ -3043,9 +3066,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->class_spec_list != NULL ){ + if( print_zero_fields || ptr->class_spec_list != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,class_spec_list); @@ -3057,9 +3080,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->interface_spec_list != NULL ){ + if( print_zero_fields || ptr->interface_spec_list != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,interface_spec_list); @@ -3071,9 +3094,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->function_spec_list != NULL ){ + if( print_zero_fields || ptr->function_spec_list != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,function_spec_list); @@ -3085,9 +3108,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->user_spec_list != NULL ){ + if( print_zero_fields || ptr->user_spec_list != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,user_spec_list); @@ -3099,9 +3122,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->program_spec_list != NULL ){ + if( print_zero_fields || ptr->program_spec_list != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,program_spec_list); @@ -3113,9 +3136,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->property_spec_list != NULL ){ + if( print_zero_fields || ptr->property_spec_list != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,property_spec_list); @@ -3127,9 +3150,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->alter_gotos != NULL ){ + if( print_zero_fields || ptr->alter_gotos != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,alter_gotos); @@ -3141,9 +3164,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->working_storage != NULL ){ + if( print_zero_fields || ptr->working_storage != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,working_storage); @@ -3155,9 +3178,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->local_storage != NULL ){ + if( print_zero_fields || ptr->local_storage != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,local_storage); @@ -3169,9 +3192,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->linkage_storage != NULL ){ + if( print_zero_fields || ptr->linkage_storage != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,linkage_storage); @@ -3183,9 +3206,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->screen_storage != NULL ){ + if( print_zero_fields || ptr->screen_storage != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,screen_storage); @@ -3197,9 +3220,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->report_storage != NULL ){ + if( print_zero_fields || ptr->report_storage != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,report_storage); @@ -3211,9 +3234,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->local_file_list != NULL ){ + if( print_zero_fields || ptr->local_file_list != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,local_file_list); @@ -3225,9 +3248,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->global_file_list != NULL ){ + if( print_zero_fields || ptr->global_file_list != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,global_file_list); @@ -3239,7 +3262,7 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } PRINT_STRUCT_FIELD_BEGIN(indent,global_handler); @@ -3259,7 +3282,7 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - if( ptr->collating_sequence != NULL ){ + if( print_zero_fields || ptr->collating_sequence != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,collating_sequence); @@ -3271,9 +3294,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->collating_sequence_n != NULL ){ + if( print_zero_fields || ptr->collating_sequence_n != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,collating_sequence_n); @@ -3285,9 +3308,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->classification != NULL ){ + if( print_zero_fields || ptr->classification != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,classification); @@ -3299,9 +3322,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->apply_commit != NULL ){ + if( print_zero_fields || ptr->apply_commit != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,apply_commit); @@ -3313,9 +3336,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->cursor_pos != NULL ){ + if( print_zero_fields || ptr->cursor_pos != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,cursor_pos); @@ -3327,9 +3350,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->crt_status != NULL ){ + if( print_zero_fields || ptr->crt_status != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,crt_status); @@ -3341,9 +3364,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->xml_code != NULL ){ + if( print_zero_fields || ptr->xml_code != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,xml_code); @@ -3355,9 +3378,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->xml_event != NULL ){ + if( print_zero_fields || ptr->xml_event != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,xml_event); @@ -3369,9 +3392,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->xml_information != NULL ){ + if( print_zero_fields || ptr->xml_information != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,xml_information); @@ -3383,9 +3406,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->xml_namespace != NULL ){ + if( print_zero_fields || ptr->xml_namespace != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,xml_namespace); @@ -3397,9 +3420,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->xml_nnamespace != NULL ){ + if( print_zero_fields || ptr->xml_nnamespace != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,xml_nnamespace); @@ -3411,9 +3434,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->xml_namespace_prefix != NULL ){ + if( print_zero_fields || ptr->xml_namespace_prefix != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,xml_namespace_prefix); @@ -3425,9 +3448,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->xml_nnamespace_prefix != NULL ){ + if( print_zero_fields || ptr->xml_nnamespace_prefix != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,xml_nnamespace_prefix); @@ -3439,9 +3462,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->xml_ntext != NULL ){ + if( print_zero_fields || ptr->xml_ntext != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,xml_ntext); @@ -3453,9 +3476,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->xml_text != NULL ){ + if( print_zero_fields || ptr->xml_text != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,xml_text); @@ -3467,9 +3490,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->json_code != NULL ){ + if( print_zero_fields || ptr->json_code != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,json_code); @@ -3481,9 +3504,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->json_status != NULL ){ + if( print_zero_fields || ptr->json_status != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,json_status); @@ -3495,9 +3518,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->returning != NULL ){ + if( print_zero_fields || ptr->returning != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,returning); @@ -3509,9 +3532,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->all_procedure != NULL ){ + if( print_zero_fields || ptr->all_procedure != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,all_procedure); @@ -3523,7 +3546,7 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } PRINT_STRUCT_FIELD_BEGIN(indent,call_xref); @@ -3531,7 +3554,7 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - if( ptr->ml_trees != NULL ){ + if( print_zero_fields || ptr->ml_trees != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,ml_trees); @@ -3543,9 +3566,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->extfh != NULL ){ + if( print_zero_fields || ptr->extfh != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,extfh); @@ -3553,9 +3576,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->last_source_line != 0 ){ + if( print_zero_fields || ptr->last_source_line != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,last_source_line); @@ -3563,9 +3586,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->loop_counter != 0 ){ + if( print_zero_fields || ptr->loop_counter != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,loop_counter); @@ -3573,9 +3596,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->decimal_index != 0 ){ + if( print_zero_fields || ptr->decimal_index != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,decimal_index); @@ -3583,9 +3606,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->decimal_index_max != 0 ){ + if( print_zero_fields || ptr->decimal_index_max != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,decimal_index_max); @@ -3593,9 +3616,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->nested_level != 0 ){ + if( print_zero_fields || ptr->nested_level != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,nested_level); @@ -3603,9 +3626,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->num_proc_params != 0 ){ + if( print_zero_fields || ptr->num_proc_params != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,num_proc_params); @@ -3613,9 +3636,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->toplev_count != 0 ){ + if( print_zero_fields || ptr->toplev_count != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,toplev_count); @@ -3623,9 +3646,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->max_call_param != 0 ){ + if( print_zero_fields || ptr->max_call_param != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,max_call_param); @@ -3633,9 +3656,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->decimal_point != 0 ){ + if( print_zero_fields || ptr->decimal_point != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,decimal_point); @@ -3643,9 +3666,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->currency_symbol != 0 ){ + if( print_zero_fields || ptr->currency_symbol != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,currency_symbol); @@ -3653,9 +3676,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->numeric_separator != 0 ){ + if( print_zero_fields || ptr->numeric_separator != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,numeric_separator); @@ -3663,7 +3686,7 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } PRINT_STRUCT_FIELD_BEGIN(indent,prog_type); @@ -3671,7 +3694,7 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - if( ptr->entry_convention != NULL ){ + if( print_zero_fields || ptr->entry_convention != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,entry_convention); @@ -3683,9 +3706,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->decimal_constants != NULL ){ + if( print_zero_fields || ptr->decimal_constants != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,decimal_constants); @@ -3697,9 +3720,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->procedure_list != NULL ){ + if( print_zero_fields || ptr->procedure_list != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,procedure_list); @@ -3711,9 +3734,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->procedure_list_last != NULL ){ + if( print_zero_fields || ptr->procedure_list_last != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,procedure_list_last); @@ -3725,9 +3748,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->procedure_list_len != 0 ){ + if( print_zero_fields || ptr->procedure_list_len != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,procedure_list_len); @@ -3735,9 +3758,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->prof_current_section != 0 ){ + if( print_zero_fields || ptr->prof_current_section != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,prof_current_section); @@ -3745,9 +3768,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->prof_current_paragraph != 0 ){ + if( print_zero_fields || ptr->prof_current_paragraph != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,prof_current_paragraph); @@ -3755,9 +3778,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->prof_current_call != 0 ){ + if( print_zero_fields || ptr->prof_current_call != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,prof_current_call); @@ -3765,9 +3788,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_main != 0 ){ + if( print_zero_fields || ptr->flag_main != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_main); @@ -3775,9 +3798,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_common != 0 ){ + if( print_zero_fields || ptr->flag_common != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_common); @@ -3785,9 +3808,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_initial != 0 ){ + if( print_zero_fields || ptr->flag_initial != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_initial); @@ -3795,9 +3818,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_recursive != 0 ){ + if( print_zero_fields || ptr->flag_recursive != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_recursive); @@ -3805,9 +3828,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_screen != 0 ){ + if( print_zero_fields || ptr->flag_screen != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_screen); @@ -3815,9 +3838,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_validated != 0 ){ + if( print_zero_fields || ptr->flag_validated != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_validated); @@ -3825,9 +3848,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_chained != 0 ){ + if( print_zero_fields || ptr->flag_chained != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_chained); @@ -3835,9 +3858,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_global_use != 0 ){ + if( print_zero_fields || ptr->flag_global_use != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_global_use); @@ -3845,9 +3868,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_gen_error != 0 ){ + if( print_zero_fields || ptr->flag_gen_error != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_gen_error); @@ -3855,9 +3878,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_file_global != 0 ){ + if( print_zero_fields || ptr->flag_file_global != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_file_global); @@ -3865,9 +3888,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_has_external != 0 ){ + if( print_zero_fields || ptr->flag_has_external != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_has_external); @@ -3875,9 +3898,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_segments != 0 ){ + if( print_zero_fields || ptr->flag_segments != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_segments); @@ -3885,9 +3908,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_trailing_separate != 0 ){ + if( print_zero_fields || ptr->flag_trailing_separate != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_trailing_separate); @@ -3895,9 +3918,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_console_is_crt != 0 ){ + if( print_zero_fields || ptr->flag_console_is_crt != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_console_is_crt); @@ -3905,9 +3928,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_debugging != 0 ){ + if( print_zero_fields || ptr->flag_debugging != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_debugging); @@ -3915,9 +3938,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_gen_debug != 0 ){ + if( print_zero_fields || ptr->flag_gen_debug != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_gen_debug); @@ -3925,9 +3948,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_save_exception != 0 ){ + if( print_zero_fields || ptr->flag_save_exception != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_save_exception); @@ -3935,9 +3958,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_report != 0 ){ + if( print_zero_fields || ptr->flag_report != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_report); @@ -3945,9 +3968,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_void != 0 ){ + if( print_zero_fields || ptr->flag_void != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_void); @@ -3955,9 +3978,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_decimal_comp != 0 ){ + if( print_zero_fields || ptr->flag_decimal_comp != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_decimal_comp); @@ -3965,9 +3988,9 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_prototype != 0 ){ + if( print_zero_fields || ptr->flag_prototype != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_prototype); @@ -3975,7 +3998,7 @@ static void print_struct_cb_program (int indent, int ptr_uid, struct cb_program PRINT_STRUCT_FIELD_END(indent); - } + } indent -= 2; PRINT_STRUCT_END(indent, ty); @@ -4009,7 +4032,7 @@ static void print_struct_cb_list (int indent, int ptr_uid, struct cb_list *ptr){ PRINT_STRUCT_FIELD_END(indent); - if( ptr->chain != NULL ){ + if( print_zero_fields || ptr->chain != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,chain); @@ -4021,9 +4044,9 @@ static void print_struct_cb_list (int indent, int ptr_uid, struct cb_list *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->value != NULL ){ + if( print_zero_fields || ptr->value != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,value); @@ -4035,9 +4058,9 @@ static void print_struct_cb_list (int indent, int ptr_uid, struct cb_list *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->purpose != NULL ){ + if( print_zero_fields || ptr->purpose != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,purpose); @@ -4049,9 +4072,9 @@ static void print_struct_cb_list (int indent, int ptr_uid, struct cb_list *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->sizes != 0 ){ + if( print_zero_fields || ptr->sizes != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,sizes); @@ -4059,7 +4082,7 @@ static void print_struct_cb_list (int indent, int ptr_uid, struct cb_list *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } indent -= 2; PRINT_STRUCT_END(indent, ty); @@ -4154,7 +4177,7 @@ static void print_struct_cb_exception (int indent, int ptr_uid, struct cb_except PRINT_STRUCT_BEGIN(indent, ty, ptr_uid); indent += 2; - if( ptr->name != NULL ){ + if( print_zero_fields || ptr->name != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,name); @@ -4162,9 +4185,9 @@ static void print_struct_cb_exception (int indent, int ptr_uid, struct cb_except PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->code != 0 ){ + if( print_zero_fields || ptr->code != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,code); @@ -4172,9 +4195,9 @@ static void print_struct_cb_exception (int indent, int ptr_uid, struct cb_except PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->enable != 0 ){ + if( print_zero_fields || ptr->enable != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,enable); @@ -4182,9 +4205,9 @@ static void print_struct_cb_exception (int indent, int ptr_uid, struct cb_except PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->fatal != 0 ){ + if( print_zero_fields || ptr->fatal != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,fatal); @@ -4192,7 +4215,7 @@ static void print_struct_cb_exception (int indent, int ptr_uid, struct cb_except PRINT_STRUCT_FIELD_END(indent); - } + } indent -= 2; PRINT_STRUCT_END(indent, ty); @@ -4209,7 +4232,7 @@ static void print_struct_cb_file (int indent, int ptr_uid, struct cb_file *ptr){ PRINT_STRUCT_FIELD_END(indent); - if( ptr->name != NULL ){ + if( print_zero_fields || ptr->name != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,name); @@ -4217,9 +4240,9 @@ static void print_struct_cb_file (int indent, int ptr_uid, struct cb_file *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->cname != NULL ){ + if( print_zero_fields || ptr->cname != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,cname); @@ -4227,9 +4250,9 @@ static void print_struct_cb_file (int indent, int ptr_uid, struct cb_file *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->assign != NULL ){ + if( print_zero_fields || ptr->assign != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,assign); @@ -4241,9 +4264,9 @@ static void print_struct_cb_file (int indent, int ptr_uid, struct cb_file *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->file_status != NULL ){ + if( print_zero_fields || ptr->file_status != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,file_status); @@ -4255,9 +4278,9 @@ static void print_struct_cb_file (int indent, int ptr_uid, struct cb_file *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->sharing != NULL ){ + if( print_zero_fields || ptr->sharing != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,sharing); @@ -4269,9 +4292,9 @@ static void print_struct_cb_file (int indent, int ptr_uid, struct cb_file *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->key != NULL ){ + if( print_zero_fields || ptr->key != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,key); @@ -4283,9 +4306,9 @@ static void print_struct_cb_file (int indent, int ptr_uid, struct cb_file *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->password != NULL ){ + if( print_zero_fields || ptr->password != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,password); @@ -4297,9 +4320,9 @@ static void print_struct_cb_file (int indent, int ptr_uid, struct cb_file *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->component_list != NULL ){ + if( print_zero_fields || ptr->component_list != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,component_list); @@ -4311,9 +4334,9 @@ static void print_struct_cb_file (int indent, int ptr_uid, struct cb_file *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->alt_key_list != NULL ){ + if( print_zero_fields || ptr->alt_key_list != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,alt_key_list); @@ -4325,9 +4348,9 @@ static void print_struct_cb_file (int indent, int ptr_uid, struct cb_file *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->collating_sequence_key != NULL ){ + if( print_zero_fields || ptr->collating_sequence_key != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,collating_sequence_key); @@ -4339,9 +4362,9 @@ static void print_struct_cb_file (int indent, int ptr_uid, struct cb_file *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->collating_sequence != NULL ){ + if( print_zero_fields || ptr->collating_sequence != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,collating_sequence); @@ -4353,9 +4376,9 @@ static void print_struct_cb_file (int indent, int ptr_uid, struct cb_file *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->collating_sequence_n != NULL ){ + if( print_zero_fields || ptr->collating_sequence_n != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,collating_sequence_n); @@ -4367,9 +4390,9 @@ static void print_struct_cb_file (int indent, int ptr_uid, struct cb_file *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->collating_sequence_keys != NULL ){ + if( print_zero_fields || ptr->collating_sequence_keys != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,collating_sequence_keys); @@ -4381,9 +4404,9 @@ static void print_struct_cb_file (int indent, int ptr_uid, struct cb_file *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->description_entry != NULL ){ + if( print_zero_fields || ptr->description_entry != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,description_entry); @@ -4395,9 +4418,9 @@ static void print_struct_cb_file (int indent, int ptr_uid, struct cb_file *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->record != NULL ){ + if( print_zero_fields || ptr->record != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,record); @@ -4409,9 +4432,9 @@ static void print_struct_cb_file (int indent, int ptr_uid, struct cb_file *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->record_depending != NULL ){ + if( print_zero_fields || ptr->record_depending != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,record_depending); @@ -4423,9 +4446,9 @@ static void print_struct_cb_file (int indent, int ptr_uid, struct cb_file *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->reports != NULL ){ + if( print_zero_fields || ptr->reports != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,reports); @@ -4437,9 +4460,9 @@ static void print_struct_cb_file (int indent, int ptr_uid, struct cb_file *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->linage != NULL ){ + if( print_zero_fields || ptr->linage != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,linage); @@ -4451,9 +4474,9 @@ static void print_struct_cb_file (int indent, int ptr_uid, struct cb_file *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->linage_ctr != NULL ){ + if( print_zero_fields || ptr->linage_ctr != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,linage_ctr); @@ -4465,9 +4488,9 @@ static void print_struct_cb_file (int indent, int ptr_uid, struct cb_file *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->latfoot != NULL ){ + if( print_zero_fields || ptr->latfoot != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,latfoot); @@ -4479,9 +4502,9 @@ static void print_struct_cb_file (int indent, int ptr_uid, struct cb_file *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->lattop != NULL ){ + if( print_zero_fields || ptr->lattop != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,lattop); @@ -4493,9 +4516,9 @@ static void print_struct_cb_file (int indent, int ptr_uid, struct cb_file *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->latbot != NULL ){ + if( print_zero_fields || ptr->latbot != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,latbot); @@ -4507,9 +4530,9 @@ static void print_struct_cb_file (int indent, int ptr_uid, struct cb_file *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->extfh != NULL ){ + if( print_zero_fields || ptr->extfh != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,extfh); @@ -4521,9 +4544,9 @@ static void print_struct_cb_file (int indent, int ptr_uid, struct cb_file *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->handler != NULL ){ + if( print_zero_fields || ptr->handler != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,handler); @@ -4535,9 +4558,9 @@ static void print_struct_cb_file (int indent, int ptr_uid, struct cb_file *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->handler_prog != NULL ){ + if( print_zero_fields || ptr->handler_prog != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,handler_prog); @@ -4549,9 +4572,9 @@ static void print_struct_cb_file (int indent, int ptr_uid, struct cb_file *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->debug_section != NULL ){ + if( print_zero_fields || ptr->debug_section != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,debug_section); @@ -4563,9 +4586,9 @@ static void print_struct_cb_file (int indent, int ptr_uid, struct cb_file *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->code_set != NULL ){ + if( print_zero_fields || ptr->code_set != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,code_set); @@ -4577,9 +4600,9 @@ static void print_struct_cb_file (int indent, int ptr_uid, struct cb_file *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->code_set_items != NULL ){ + if( print_zero_fields || ptr->code_set_items != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,code_set_items); @@ -4591,7 +4614,7 @@ static void print_struct_cb_file (int indent, int ptr_uid, struct cb_file *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } PRINT_STRUCT_FIELD_BEGIN(indent,xref); @@ -4599,7 +4622,7 @@ static void print_struct_cb_file (int indent, int ptr_uid, struct cb_file *ptr){ PRINT_STRUCT_FIELD_END(indent); - if( ptr->record_min != 0 ){ + if( print_zero_fields || ptr->record_min != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,record_min); @@ -4607,9 +4630,9 @@ static void print_struct_cb_file (int indent, int ptr_uid, struct cb_file *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->record_max != 0 ){ + if( print_zero_fields || ptr->record_max != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,record_max); @@ -4617,9 +4640,9 @@ static void print_struct_cb_file (int indent, int ptr_uid, struct cb_file *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->optional != 0 ){ + if( print_zero_fields || ptr->optional != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,optional); @@ -4627,7 +4650,7 @@ static void print_struct_cb_file (int indent, int ptr_uid, struct cb_file *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } PRINT_STRUCT_FIELD_BEGIN(indent,organization); @@ -4641,7 +4664,7 @@ static void print_struct_cb_file (int indent, int ptr_uid, struct cb_file *ptr){ PRINT_STRUCT_FIELD_END(indent); - if( ptr->lock_mode != 0 ){ + if( print_zero_fields || ptr->lock_mode != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,lock_mode); @@ -4649,9 +4672,9 @@ static void print_struct_cb_file (int indent, int ptr_uid, struct cb_file *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->special != 0 ){ + if( print_zero_fields || ptr->special != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,special); @@ -4659,9 +4682,9 @@ static void print_struct_cb_file (int indent, int ptr_uid, struct cb_file *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->same_clause != 0 ){ + if( print_zero_fields || ptr->same_clause != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,same_clause); @@ -4669,7 +4692,7 @@ static void print_struct_cb_file (int indent, int ptr_uid, struct cb_file *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } PRINT_STRUCT_FIELD_BEGIN(indent,assign_type); @@ -4677,7 +4700,7 @@ static void print_struct_cb_file (int indent, int ptr_uid, struct cb_file *ptr){ PRINT_STRUCT_FIELD_END(indent); - if( ptr->flag_finalized != 0 ){ + if( print_zero_fields || ptr->flag_finalized != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_finalized); @@ -4685,9 +4708,9 @@ static void print_struct_cb_file (int indent, int ptr_uid, struct cb_file *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_external != 0 ){ + if( print_zero_fields || ptr->flag_external != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_external); @@ -4695,9 +4718,9 @@ static void print_struct_cb_file (int indent, int ptr_uid, struct cb_file *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_ext_assign != 0 ){ + if( print_zero_fields || ptr->flag_ext_assign != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_ext_assign); @@ -4705,9 +4728,9 @@ static void print_struct_cb_file (int indent, int ptr_uid, struct cb_file *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_fileid != 0 ){ + if( print_zero_fields || ptr->flag_fileid != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_fileid); @@ -4715,9 +4738,9 @@ static void print_struct_cb_file (int indent, int ptr_uid, struct cb_file *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_global != 0 ){ + if( print_zero_fields || ptr->flag_global != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_global); @@ -4725,9 +4748,9 @@ static void print_struct_cb_file (int indent, int ptr_uid, struct cb_file *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_fl_debug != 0 ){ + if( print_zero_fields || ptr->flag_fl_debug != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_fl_debug); @@ -4735,9 +4758,9 @@ static void print_struct_cb_file (int indent, int ptr_uid, struct cb_file *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_line_adv != 0 ){ + if( print_zero_fields || ptr->flag_line_adv != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_line_adv); @@ -4745,9 +4768,9 @@ static void print_struct_cb_file (int indent, int ptr_uid, struct cb_file *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_delimiter != 0 ){ + if( print_zero_fields || ptr->flag_delimiter != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_delimiter); @@ -4755,9 +4778,9 @@ static void print_struct_cb_file (int indent, int ptr_uid, struct cb_file *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_report != 0 ){ + if( print_zero_fields || ptr->flag_report != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_report); @@ -4765,9 +4788,9 @@ static void print_struct_cb_file (int indent, int ptr_uid, struct cb_file *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_check_record_varying_limits != 0 ){ + if( print_zero_fields || ptr->flag_check_record_varying_limits != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_check_record_varying_limits); @@ -4775,9 +4798,9 @@ static void print_struct_cb_file (int indent, int ptr_uid, struct cb_file *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_assign_no_keyword != 0 ){ + if( print_zero_fields || ptr->flag_assign_no_keyword != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_assign_no_keyword); @@ -4785,9 +4808,9 @@ static void print_struct_cb_file (int indent, int ptr_uid, struct cb_file *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->exception_table != NULL ){ + if( print_zero_fields || ptr->exception_table != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,exception_table); @@ -4799,7 +4822,7 @@ static void print_struct_cb_file (int indent, int ptr_uid, struct cb_file *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } indent -= 2; PRINT_STRUCT_END(indent, ty); @@ -4833,7 +4856,7 @@ static void print_struct_cb_cd (int indent, int ptr_uid, struct cb_cd *ptr){ PRINT_STRUCT_FIELD_END(indent); - if( ptr->name != NULL ){ + if( print_zero_fields || ptr->name != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,name); @@ -4841,9 +4864,9 @@ static void print_struct_cb_cd (int indent, int ptr_uid, struct cb_cd *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->record != NULL ){ + if( print_zero_fields || ptr->record != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,record); @@ -4855,9 +4878,9 @@ static void print_struct_cb_cd (int indent, int ptr_uid, struct cb_cd *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->debug_section != NULL ){ + if( print_zero_fields || ptr->debug_section != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,debug_section); @@ -4869,9 +4892,9 @@ static void print_struct_cb_cd (int indent, int ptr_uid, struct cb_cd *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_field_debug != 0 ){ + if( print_zero_fields || ptr->flag_field_debug != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_field_debug); @@ -4879,7 +4902,7 @@ static void print_struct_cb_cd (int indent, int ptr_uid, struct cb_cd *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } indent -= 2; PRINT_STRUCT_END(indent, ty); @@ -4907,7 +4930,7 @@ static void print_struct_cb_key (int indent, int ptr_uid, struct cb_key *ptr){ PRINT_STRUCT_BEGIN(indent, ty, ptr_uid); indent += 2; - if( ptr->key != NULL ){ + if( print_zero_fields || ptr->key != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,key); @@ -4919,9 +4942,9 @@ static void print_struct_cb_key (int indent, int ptr_uid, struct cb_key *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->ref != NULL ){ + if( print_zero_fields || ptr->ref != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,ref); @@ -4933,9 +4956,9 @@ static void print_struct_cb_key (int indent, int ptr_uid, struct cb_key *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->val != NULL ){ + if( print_zero_fields || ptr->val != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,val); @@ -4947,9 +4970,9 @@ static void print_struct_cb_key (int indent, int ptr_uid, struct cb_key *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->dir != 0 ){ + if( print_zero_fields || ptr->dir != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,dir); @@ -4957,7 +4980,7 @@ static void print_struct_cb_key (int indent, int ptr_uid, struct cb_key *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } indent -= 2; PRINT_STRUCT_END(indent, ty); @@ -5002,7 +5025,7 @@ static void print_struct___cob_pic_symbol (int indent, int ptr_uid, struct __cob PRINT_STRUCT_BEGIN(indent, ty, ptr_uid); indent += 2; - if( ptr->symbol != 0 ){ + if( print_zero_fields || ptr->symbol != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,symbol); @@ -5010,9 +5033,9 @@ static void print_struct___cob_pic_symbol (int indent, int ptr_uid, struct __cob PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->times_repeated != 0 ){ + if( print_zero_fields || ptr->times_repeated != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,times_repeated); @@ -5020,7 +5043,7 @@ static void print_struct___cob_pic_symbol (int indent, int ptr_uid, struct __cob PRINT_STRUCT_FIELD_END(indent); - } + } indent -= 2; PRINT_STRUCT_END(indent, ty); @@ -5037,7 +5060,7 @@ static void print_struct_cb_picture (int indent, int ptr_uid, struct cb_picture PRINT_STRUCT_FIELD_END(indent); - if( ptr->orig != NULL ){ + if( print_zero_fields || ptr->orig != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,orig); @@ -5045,9 +5068,9 @@ static void print_struct_cb_picture (int indent, int ptr_uid, struct cb_picture PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->str != NULL ){ + if( print_zero_fields || ptr->str != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,str); @@ -5059,9 +5082,9 @@ static void print_struct_cb_picture (int indent, int ptr_uid, struct cb_picture PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->size != 0 ){ + if( print_zero_fields || ptr->size != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,size); @@ -5069,9 +5092,9 @@ static void print_struct_cb_picture (int indent, int ptr_uid, struct cb_picture PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->lenstr != 0 ){ + if( print_zero_fields || ptr->lenstr != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,lenstr); @@ -5079,7 +5102,7 @@ static void print_struct_cb_picture (int indent, int ptr_uid, struct cb_picture PRINT_STRUCT_FIELD_END(indent); - } + } PRINT_STRUCT_FIELD_BEGIN(indent,category); @@ -5087,7 +5110,7 @@ static void print_struct_cb_picture (int indent, int ptr_uid, struct cb_picture PRINT_STRUCT_FIELD_END(indent); - if( ptr->digits != 0 ){ + if( print_zero_fields || ptr->digits != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,digits); @@ -5095,9 +5118,9 @@ static void print_struct_cb_picture (int indent, int ptr_uid, struct cb_picture PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->scale != 0 ){ + if( print_zero_fields || ptr->scale != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,scale); @@ -5105,9 +5128,9 @@ static void print_struct_cb_picture (int indent, int ptr_uid, struct cb_picture PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->have_sign != 0 ){ + if( print_zero_fields || ptr->have_sign != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,have_sign); @@ -5115,9 +5138,9 @@ static void print_struct_cb_picture (int indent, int ptr_uid, struct cb_picture PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_is_calculated != 0 ){ + if( print_zero_fields || ptr->flag_is_calculated != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_is_calculated); @@ -5125,9 +5148,9 @@ static void print_struct_cb_picture (int indent, int ptr_uid, struct cb_picture PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->variable_length != 0 ){ + if( print_zero_fields || ptr->variable_length != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,variable_length); @@ -5135,7 +5158,7 @@ static void print_struct_cb_picture (int indent, int ptr_uid, struct cb_picture PRINT_STRUCT_FIELD_END(indent); - } + } indent -= 2; PRINT_STRUCT_END(indent, ty); @@ -5169,7 +5192,7 @@ static void print_struct_cb_report (int indent, int ptr_uid, struct cb_report *p PRINT_STRUCT_FIELD_END(indent); - if( ptr->name != NULL ){ + if( print_zero_fields || ptr->name != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,name); @@ -5177,9 +5200,9 @@ static void print_struct_cb_report (int indent, int ptr_uid, struct cb_report *p PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->cname != NULL ){ + if( print_zero_fields || ptr->cname != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,cname); @@ -5187,9 +5210,9 @@ static void print_struct_cb_report (int indent, int ptr_uid, struct cb_report *p PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->file != NULL ){ + if( print_zero_fields || ptr->file != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,file); @@ -5201,9 +5224,9 @@ static void print_struct_cb_report (int indent, int ptr_uid, struct cb_report *p PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->line_counter != NULL ){ + if( print_zero_fields || ptr->line_counter != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,line_counter); @@ -5215,9 +5238,9 @@ static void print_struct_cb_report (int indent, int ptr_uid, struct cb_report *p PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->page_counter != NULL ){ + if( print_zero_fields || ptr->page_counter != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,page_counter); @@ -5229,9 +5252,9 @@ static void print_struct_cb_report (int indent, int ptr_uid, struct cb_report *p PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->code_clause != NULL ){ + if( print_zero_fields || ptr->code_clause != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,code_clause); @@ -5243,9 +5266,9 @@ static void print_struct_cb_report (int indent, int ptr_uid, struct cb_report *p PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->controls != NULL ){ + if( print_zero_fields || ptr->controls != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,controls); @@ -5257,9 +5280,9 @@ static void print_struct_cb_report (int indent, int ptr_uid, struct cb_report *p PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->t_lines != NULL ){ + if( print_zero_fields || ptr->t_lines != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,t_lines); @@ -5271,9 +5294,9 @@ static void print_struct_cb_report (int indent, int ptr_uid, struct cb_report *p PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->t_columns != NULL ){ + if( print_zero_fields || ptr->t_columns != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,t_columns); @@ -5285,9 +5308,9 @@ static void print_struct_cb_report (int indent, int ptr_uid, struct cb_report *p PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->t_heading != NULL ){ + if( print_zero_fields || ptr->t_heading != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,t_heading); @@ -5299,9 +5322,9 @@ static void print_struct_cb_report (int indent, int ptr_uid, struct cb_report *p PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->t_first_detail != NULL ){ + if( print_zero_fields || ptr->t_first_detail != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,t_first_detail); @@ -5313,9 +5336,9 @@ static void print_struct_cb_report (int indent, int ptr_uid, struct cb_report *p PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->t_last_control != NULL ){ + if( print_zero_fields || ptr->t_last_control != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,t_last_control); @@ -5327,9 +5350,9 @@ static void print_struct_cb_report (int indent, int ptr_uid, struct cb_report *p PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->t_last_detail != NULL ){ + if( print_zero_fields || ptr->t_last_detail != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,t_last_detail); @@ -5341,9 +5364,9 @@ static void print_struct_cb_report (int indent, int ptr_uid, struct cb_report *p PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->t_footing != NULL ){ + if( print_zero_fields || ptr->t_footing != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,t_footing); @@ -5355,9 +5378,9 @@ static void print_struct_cb_report (int indent, int ptr_uid, struct cb_report *p PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->lines != 0 ){ + if( print_zero_fields || ptr->lines != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,lines); @@ -5365,9 +5388,9 @@ static void print_struct_cb_report (int indent, int ptr_uid, struct cb_report *p PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->columns != 0 ){ + if( print_zero_fields || ptr->columns != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,columns); @@ -5375,9 +5398,9 @@ static void print_struct_cb_report (int indent, int ptr_uid, struct cb_report *p PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->heading != 0 ){ + if( print_zero_fields || ptr->heading != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,heading); @@ -5385,9 +5408,9 @@ static void print_struct_cb_report (int indent, int ptr_uid, struct cb_report *p PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->first_detail != 0 ){ + if( print_zero_fields || ptr->first_detail != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,first_detail); @@ -5395,9 +5418,9 @@ static void print_struct_cb_report (int indent, int ptr_uid, struct cb_report *p PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->last_control != 0 ){ + if( print_zero_fields || ptr->last_control != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,last_control); @@ -5405,9 +5428,9 @@ static void print_struct_cb_report (int indent, int ptr_uid, struct cb_report *p PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->last_detail != 0 ){ + if( print_zero_fields || ptr->last_detail != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,last_detail); @@ -5415,9 +5438,9 @@ static void print_struct_cb_report (int indent, int ptr_uid, struct cb_report *p PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->footing != 0 ){ + if( print_zero_fields || ptr->footing != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,footing); @@ -5425,9 +5448,9 @@ static void print_struct_cb_report (int indent, int ptr_uid, struct cb_report *p PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->records != NULL ){ + if( print_zero_fields || ptr->records != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,records); @@ -5439,9 +5462,9 @@ static void print_struct_cb_report (int indent, int ptr_uid, struct cb_report *p PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->num_lines != 0 ){ + if( print_zero_fields || ptr->num_lines != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,num_lines); @@ -5449,9 +5472,9 @@ static void print_struct_cb_report (int indent, int ptr_uid, struct cb_report *p PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->line_ids != NULL ){ + if( print_zero_fields || ptr->line_ids != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,line_ids); @@ -5459,9 +5482,9 @@ static void print_struct_cb_report (int indent, int ptr_uid, struct cb_report *p PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->num_sums != 0 ){ + if( print_zero_fields || ptr->num_sums != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,num_sums); @@ -5469,9 +5492,9 @@ static void print_struct_cb_report (int indent, int ptr_uid, struct cb_report *p PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->sums != NULL ){ + if( print_zero_fields || ptr->sums != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,sums); @@ -5479,9 +5502,9 @@ static void print_struct_cb_report (int indent, int ptr_uid, struct cb_report *p PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->rcsz != 0 ){ + if( print_zero_fields || ptr->rcsz != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,rcsz); @@ -5489,9 +5512,9 @@ static void print_struct_cb_report (int indent, int ptr_uid, struct cb_report *p PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->id != 0 ){ + if( print_zero_fields || ptr->id != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,id); @@ -5499,9 +5522,9 @@ static void print_struct_cb_report (int indent, int ptr_uid, struct cb_report *p PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->control_final != 0 ){ + if( print_zero_fields || ptr->control_final != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,control_final); @@ -5509,9 +5532,9 @@ static void print_struct_cb_report (int indent, int ptr_uid, struct cb_report *p PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->global != 0 ){ + if( print_zero_fields || ptr->global != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,global); @@ -5519,9 +5542,9 @@ static void print_struct_cb_report (int indent, int ptr_uid, struct cb_report *p PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->has_declarative != 0 ){ + if( print_zero_fields || ptr->has_declarative != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,has_declarative); @@ -5529,9 +5552,9 @@ static void print_struct_cb_report (int indent, int ptr_uid, struct cb_report *p PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->has_detail != 0 ){ + if( print_zero_fields || ptr->has_detail != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,has_detail); @@ -5539,9 +5562,9 @@ static void print_struct_cb_report (int indent, int ptr_uid, struct cb_report *p PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->has_source_move != 0 ){ + if( print_zero_fields || ptr->has_source_move != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,has_source_move); @@ -5549,9 +5572,9 @@ static void print_struct_cb_report (int indent, int ptr_uid, struct cb_report *p PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->was_checked != 0 ){ + if( print_zero_fields || ptr->was_checked != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,was_checked); @@ -5559,7 +5582,7 @@ static void print_struct_cb_report (int indent, int ptr_uid, struct cb_report *p PRINT_STRUCT_FIELD_END(indent); - } + } indent -= 2; PRINT_STRUCT_END(indent, ty); @@ -5717,7 +5740,7 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - if( ptr->name != NULL ){ + if( print_zero_fields || ptr->name != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,name); @@ -5725,9 +5748,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->ename != NULL ){ + if( print_zero_fields || ptr->ename != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,ename); @@ -5735,9 +5758,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->depending != NULL ){ + if( print_zero_fields || ptr->depending != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,depending); @@ -5749,9 +5772,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->values != NULL ){ + if( print_zero_fields || ptr->values != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,values); @@ -5763,9 +5786,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->false_88 != NULL ){ + if( print_zero_fields || ptr->false_88 != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,false_88); @@ -5777,9 +5800,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->index_list != NULL ){ + if( print_zero_fields || ptr->index_list != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,index_list); @@ -5791,9 +5814,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->external_form_identifier != NULL ){ + if( print_zero_fields || ptr->external_form_identifier != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,external_form_identifier); @@ -5805,9 +5828,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->parent != NULL ){ + if( print_zero_fields || ptr->parent != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,parent); @@ -5819,9 +5842,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->children != NULL ){ + if( print_zero_fields || ptr->children != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,children); @@ -5833,9 +5856,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->validation != NULL ){ + if( print_zero_fields || ptr->validation != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,validation); @@ -5847,9 +5870,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->sister != NULL ){ + if( print_zero_fields || ptr->sister != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,sister); @@ -5861,9 +5884,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->redefines != NULL ){ + if( print_zero_fields || ptr->redefines != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,redefines); @@ -5875,9 +5898,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->rename_thru != NULL ){ + if( print_zero_fields || ptr->rename_thru != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,rename_thru); @@ -5889,9 +5912,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->index_qual != NULL ){ + if( print_zero_fields || ptr->index_qual != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,index_qual); @@ -5903,9 +5926,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->file != NULL ){ + if( print_zero_fields || ptr->file != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,file); @@ -5917,9 +5940,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->cd != NULL ){ + if( print_zero_fields || ptr->cd != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,cd); @@ -5931,9 +5954,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->keys != NULL ){ + if( print_zero_fields || ptr->keys != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,keys); @@ -5945,9 +5968,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->pic != NULL ){ + if( print_zero_fields || ptr->pic != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,pic); @@ -5959,9 +5982,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->vsize != NULL ){ + if( print_zero_fields || ptr->vsize != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,vsize); @@ -5973,9 +5996,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->debug_section != NULL ){ + if( print_zero_fields || ptr->debug_section != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,debug_section); @@ -5987,9 +6010,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->report != NULL ){ + if( print_zero_fields || ptr->report != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,report); @@ -6001,7 +6024,7 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } PRINT_STRUCT_FIELD_BEGIN(indent,xref); @@ -6009,7 +6032,7 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - if( ptr->screen_line != NULL ){ + if( print_zero_fields || ptr->screen_line != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,screen_line); @@ -6021,9 +6044,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->screen_column != NULL ){ + if( print_zero_fields || ptr->screen_column != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,screen_column); @@ -6035,9 +6058,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->screen_from != NULL ){ + if( print_zero_fields || ptr->screen_from != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,screen_from); @@ -6049,9 +6072,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->screen_to != NULL ){ + if( print_zero_fields || ptr->screen_to != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,screen_to); @@ -6063,9 +6086,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->screen_foreg != NULL ){ + if( print_zero_fields || ptr->screen_foreg != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,screen_foreg); @@ -6077,9 +6100,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->screen_backg != NULL ){ + if( print_zero_fields || ptr->screen_backg != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,screen_backg); @@ -6091,9 +6114,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->screen_prompt != NULL ){ + if( print_zero_fields || ptr->screen_prompt != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,screen_prompt); @@ -6105,9 +6128,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->screen_control != NULL ){ + if( print_zero_fields || ptr->screen_control != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,screen_control); @@ -6119,9 +6142,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->screen_color != NULL ){ + if( print_zero_fields || ptr->screen_color != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,screen_color); @@ -6133,9 +6156,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->report_source != NULL ){ + if( print_zero_fields || ptr->report_source != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,report_source); @@ -6147,9 +6170,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->report_from != NULL ){ + if( print_zero_fields || ptr->report_from != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,report_from); @@ -6161,9 +6184,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->report_sum_counter != NULL ){ + if( print_zero_fields || ptr->report_sum_counter != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,report_sum_counter); @@ -6175,9 +6198,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->report_sum_list != NULL ){ + if( print_zero_fields || ptr->report_sum_list != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,report_sum_list); @@ -6189,9 +6212,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->report_sum_upon != NULL ){ + if( print_zero_fields || ptr->report_sum_upon != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,report_sum_upon); @@ -6203,9 +6226,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->report_reset != NULL ){ + if( print_zero_fields || ptr->report_reset != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,report_reset); @@ -6217,9 +6240,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->report_control != NULL ){ + if( print_zero_fields || ptr->report_control != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,report_control); @@ -6231,9 +6254,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->report_when != NULL ){ + if( print_zero_fields || ptr->report_when != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,report_when); @@ -6245,9 +6268,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->report_column_list != NULL ){ + if( print_zero_fields || ptr->report_column_list != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,report_column_list); @@ -6259,9 +6282,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->report_vary_list != NULL ){ + if( print_zero_fields || ptr->report_vary_list != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,report_vary_list); @@ -6273,9 +6296,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->same_as != NULL ){ + if( print_zero_fields || ptr->same_as != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,same_as); @@ -6287,9 +6310,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->external_definition != NULL ){ + if( print_zero_fields || ptr->external_definition != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,external_definition); @@ -6301,9 +6324,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->like_modifier != NULL ){ + if( print_zero_fields || ptr->like_modifier != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,like_modifier); @@ -6315,9 +6338,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->id != 0 ){ + if( print_zero_fields || ptr->id != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,id); @@ -6325,9 +6348,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->size != 0 ){ + if( print_zero_fields || ptr->size != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,size); @@ -6335,9 +6358,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->level != 0 ){ + if( print_zero_fields || ptr->level != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,level); @@ -6345,9 +6368,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->memory_size != 0 ){ + if( print_zero_fields || ptr->memory_size != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,memory_size); @@ -6355,9 +6378,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->offset != 0 ){ + if( print_zero_fields || ptr->offset != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,offset); @@ -6365,9 +6388,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->occurs_min != 0 ){ + if( print_zero_fields || ptr->occurs_min != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,occurs_min); @@ -6375,9 +6398,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->occurs_max != 0 ){ + if( print_zero_fields || ptr->occurs_max != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,occurs_max); @@ -6385,9 +6408,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->indexes != 0 ){ + if( print_zero_fields || ptr->indexes != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,indexes); @@ -6395,9 +6418,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->count != 0 ){ + if( print_zero_fields || ptr->count != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,count); @@ -6405,9 +6428,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->mem_offset != 0 ){ + if( print_zero_fields || ptr->mem_offset != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,mem_offset); @@ -6415,9 +6438,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->nkeys != 0 ){ + if( print_zero_fields || ptr->nkeys != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,nkeys); @@ -6425,9 +6448,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->param_num != 0 ){ + if( print_zero_fields || ptr->param_num != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,param_num); @@ -6435,9 +6458,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->screen_flag != 0 ){ + if( print_zero_fields || ptr->screen_flag != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,screen_flag); @@ -6445,9 +6468,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->report_flag != 0 ){ + if( print_zero_fields || ptr->report_flag != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,report_flag); @@ -6455,9 +6478,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->report_line != 0 ){ + if( print_zero_fields || ptr->report_line != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,report_line); @@ -6465,9 +6488,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->report_column != 0 ){ + if( print_zero_fields || ptr->report_column != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,report_column); @@ -6475,9 +6498,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->report_num_col != 0 ){ + if( print_zero_fields || ptr->report_num_col != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,report_num_col); @@ -6485,9 +6508,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->report_decl_id != 0 ){ + if( print_zero_fields || ptr->report_decl_id != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,report_decl_id); @@ -6495,9 +6518,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->step_count != 0 ){ + if( print_zero_fields || ptr->step_count != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,step_count); @@ -6505,9 +6528,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->next_group_line != 0 ){ + if( print_zero_fields || ptr->next_group_line != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,next_group_line); @@ -6515,9 +6538,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->vaddr != 0 ){ + if( print_zero_fields || ptr->vaddr != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,vaddr); @@ -6525,9 +6548,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->odo_level != 0 ){ + if( print_zero_fields || ptr->odo_level != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,odo_level); @@ -6535,7 +6558,7 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } PRINT_STRUCT_FIELD_BEGIN(indent,index_type); @@ -6555,7 +6578,7 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - if( ptr->flag_base != 0 ){ + if( print_zero_fields || ptr->flag_base != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_base); @@ -6563,9 +6586,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_external != 0 ){ + if( print_zero_fields || ptr->flag_external != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_external); @@ -6573,9 +6596,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_local_storage != 0 ){ + if( print_zero_fields || ptr->flag_local_storage != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_local_storage); @@ -6583,9 +6606,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_is_global != 0 ){ + if( print_zero_fields || ptr->flag_is_global != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_is_global); @@ -6593,9 +6616,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_local != 0 ){ + if( print_zero_fields || ptr->flag_local != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_local); @@ -6603,9 +6626,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_occurs != 0 ){ + if( print_zero_fields || ptr->flag_occurs != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_occurs); @@ -6613,9 +6636,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_sign_clause != 0 ){ + if( print_zero_fields || ptr->flag_sign_clause != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_sign_clause); @@ -6623,9 +6646,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_sign_separate != 0 ){ + if( print_zero_fields || ptr->flag_sign_separate != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_sign_separate); @@ -6633,9 +6656,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_sign_leading != 0 ){ + if( print_zero_fields || ptr->flag_sign_leading != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_sign_leading); @@ -6643,9 +6666,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_blank_zero != 0 ){ + if( print_zero_fields || ptr->flag_blank_zero != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_blank_zero); @@ -6653,9 +6676,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_justified != 0 ){ + if( print_zero_fields || ptr->flag_justified != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_justified); @@ -6663,9 +6686,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_binary_swap != 0 ){ + if( print_zero_fields || ptr->flag_binary_swap != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_binary_swap); @@ -6673,9 +6696,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_real_binary != 0 ){ + if( print_zero_fields || ptr->flag_real_binary != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_real_binary); @@ -6683,9 +6706,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_is_pointer != 0 ){ + if( print_zero_fields || ptr->flag_is_pointer != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_is_pointer); @@ -6693,9 +6716,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_item_78 != 0 ){ + if( print_zero_fields || ptr->flag_item_78 != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_item_78); @@ -6703,9 +6726,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_any_length != 0 ){ + if( print_zero_fields || ptr->flag_any_length != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_any_length); @@ -6713,9 +6736,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_item_based != 0 ){ + if( print_zero_fields || ptr->flag_item_based != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_item_based); @@ -6723,9 +6746,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_is_external_form != 0 ){ + if( print_zero_fields || ptr->flag_is_external_form != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_is_external_form); @@ -6733,9 +6756,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_filler != 0 ){ + if( print_zero_fields || ptr->flag_filler != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_filler); @@ -6743,9 +6766,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_synchronized != 0 ){ + if( print_zero_fields || ptr->flag_synchronized != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_synchronized); @@ -6753,9 +6776,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_invalid != 0 ){ + if( print_zero_fields || ptr->flag_invalid != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_invalid); @@ -6763,9 +6786,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_field != 0 ){ + if( print_zero_fields || ptr->flag_field != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_field); @@ -6773,9 +6796,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_chained != 0 ){ + if( print_zero_fields || ptr->flag_chained != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_chained); @@ -6783,9 +6806,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_anylen_done != 0 ){ + if( print_zero_fields || ptr->flag_anylen_done != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_anylen_done); @@ -6793,9 +6816,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_is_typedef != 0 ){ + if( print_zero_fields || ptr->flag_is_typedef != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_is_typedef); @@ -6803,9 +6826,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_is_c_long != 0 ){ + if( print_zero_fields || ptr->flag_is_c_long != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_is_c_long); @@ -6813,9 +6836,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_is_pdiv_parm != 0 ){ + if( print_zero_fields || ptr->flag_is_pdiv_parm != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_is_pdiv_parm); @@ -6823,9 +6846,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_is_pdiv_opt != 0 ){ + if( print_zero_fields || ptr->flag_is_pdiv_opt != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_is_pdiv_opt); @@ -6833,9 +6856,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_indexed_by != 0 ){ + if( print_zero_fields || ptr->flag_indexed_by != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_indexed_by); @@ -6843,9 +6866,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_local_alloced != 0 ){ + if( print_zero_fields || ptr->flag_local_alloced != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_local_alloced); @@ -6853,9 +6876,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_no_init != 0 ){ + if( print_zero_fields || ptr->flag_no_init != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_no_init); @@ -6863,9 +6886,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_vsize_done != 0 ){ + if( print_zero_fields || ptr->flag_vsize_done != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_vsize_done); @@ -6873,9 +6896,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_vaddr_done != 0 ){ + if( print_zero_fields || ptr->flag_vaddr_done != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_vaddr_done); @@ -6883,9 +6906,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_odo_relative != 0 ){ + if( print_zero_fields || ptr->flag_odo_relative != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_odo_relative); @@ -6893,9 +6916,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_field_debug != 0 ){ + if( print_zero_fields || ptr->flag_field_debug != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_field_debug); @@ -6903,9 +6926,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_all_debug != 0 ){ + if( print_zero_fields || ptr->flag_all_debug != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_all_debug); @@ -6913,9 +6936,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_no_field != 0 ){ + if( print_zero_fields || ptr->flag_no_field != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_no_field); @@ -6923,9 +6946,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_any_numeric != 0 ){ + if( print_zero_fields || ptr->flag_any_numeric != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_any_numeric); @@ -6933,9 +6956,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_is_returning != 0 ){ + if( print_zero_fields || ptr->flag_is_returning != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_is_returning); @@ -6943,9 +6966,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_unbounded != 0 ){ + if( print_zero_fields || ptr->flag_unbounded != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_unbounded); @@ -6953,9 +6976,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_above_unbounded != 0 ){ + if( print_zero_fields || ptr->flag_above_unbounded != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_above_unbounded); @@ -6963,9 +6986,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_volatile != 0 ){ + if( print_zero_fields || ptr->flag_volatile != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_volatile); @@ -6973,9 +6996,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_constant != 0 ){ + if( print_zero_fields || ptr->flag_constant != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_constant); @@ -6983,9 +7006,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_internal_constant != 0 ){ + if( print_zero_fields || ptr->flag_internal_constant != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_internal_constant); @@ -6993,9 +7016,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_used_in_call != 0 ){ + if( print_zero_fields || ptr->flag_used_in_call != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_used_in_call); @@ -7003,9 +7026,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_sync_left != 0 ){ + if( print_zero_fields || ptr->flag_sync_left != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_sync_left); @@ -7013,9 +7036,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_sync_right != 0 ){ + if( print_zero_fields || ptr->flag_sync_right != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_sync_right); @@ -7023,9 +7046,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_internal_register != 0 ){ + if( print_zero_fields || ptr->flag_internal_register != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_internal_register); @@ -7033,9 +7056,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_picture_l != 0 ){ + if( print_zero_fields || ptr->flag_picture_l != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_picture_l); @@ -7043,9 +7066,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_comp_1 != 0 ){ + if( print_zero_fields || ptr->flag_comp_1 != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_comp_1); @@ -7053,9 +7076,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_is_verified != 0 ){ + if( print_zero_fields || ptr->flag_is_verified != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_is_verified); @@ -7063,9 +7086,9 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_had_definition_note != 0 ){ + if( print_zero_fields || ptr->flag_had_definition_note != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_had_definition_note); @@ -7073,7 +7096,7 @@ static void print_struct_cb_field (int indent, int ptr_uid, struct cb_field *ptr PRINT_STRUCT_FIELD_END(indent); - } + } indent -= 2; PRINT_STRUCT_END(indent, ty); @@ -7346,7 +7369,7 @@ static void print_struct_cb_reference (int indent, int ptr_uid, struct cb_refere PRINT_STRUCT_FIELD_END(indent); - if( ptr->chain != NULL ){ + if( print_zero_fields || ptr->chain != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,chain); @@ -7358,9 +7381,9 @@ static void print_struct_cb_reference (int indent, int ptr_uid, struct cb_refere PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->value != NULL ){ + if( print_zero_fields || ptr->value != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,value); @@ -7372,9 +7395,9 @@ static void print_struct_cb_reference (int indent, int ptr_uid, struct cb_refere PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->subs != NULL ){ + if( print_zero_fields || ptr->subs != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,subs); @@ -7386,9 +7409,9 @@ static void print_struct_cb_reference (int indent, int ptr_uid, struct cb_refere PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->offset != NULL ){ + if( print_zero_fields || ptr->offset != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,offset); @@ -7400,9 +7423,9 @@ static void print_struct_cb_reference (int indent, int ptr_uid, struct cb_refere PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->length != NULL ){ + if( print_zero_fields || ptr->length != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,length); @@ -7414,9 +7437,9 @@ static void print_struct_cb_reference (int indent, int ptr_uid, struct cb_refere PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->check != NULL ){ + if( print_zero_fields || ptr->check != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,check); @@ -7428,7 +7451,7 @@ static void print_struct_cb_reference (int indent, int ptr_uid, struct cb_refere PRINT_STRUCT_FIELD_END(indent); - } + } PRINT_STRUCT_FIELD_BEGIN(indent,statement); @@ -7436,7 +7459,7 @@ static void print_struct_cb_reference (int indent, int ptr_uid, struct cb_refere PRINT_STRUCT_FIELD_END(indent); - if( ptr->word != NULL ){ + if( print_zero_fields || ptr->word != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,word); @@ -7448,9 +7471,9 @@ static void print_struct_cb_reference (int indent, int ptr_uid, struct cb_refere PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->section != NULL ){ + if( print_zero_fields || ptr->section != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,section); @@ -7462,9 +7485,9 @@ static void print_struct_cb_reference (int indent, int ptr_uid, struct cb_refere PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->paragraph != NULL ){ + if( print_zero_fields || ptr->paragraph != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,paragraph); @@ -7476,9 +7499,9 @@ static void print_struct_cb_reference (int indent, int ptr_uid, struct cb_refere PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->debug_section != NULL ){ + if( print_zero_fields || ptr->debug_section != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,debug_section); @@ -7490,7 +7513,7 @@ static void print_struct_cb_reference (int indent, int ptr_uid, struct cb_refere PRINT_STRUCT_FIELD_END(indent); - } + } PRINT_STRUCT_FIELD_BEGIN(indent,hashval); @@ -7498,7 +7521,7 @@ static void print_struct_cb_reference (int indent, int ptr_uid, struct cb_refere PRINT_STRUCT_FIELD_END(indent); - if( ptr->flag_receiving != 0 ){ + if( print_zero_fields || ptr->flag_receiving != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_receiving); @@ -7506,9 +7529,9 @@ static void print_struct_cb_reference (int indent, int ptr_uid, struct cb_refere PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_all != 0 ){ + if( print_zero_fields || ptr->flag_all != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_all); @@ -7516,9 +7539,9 @@ static void print_struct_cb_reference (int indent, int ptr_uid, struct cb_refere PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_in_decl != 0 ){ + if( print_zero_fields || ptr->flag_in_decl != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_in_decl); @@ -7526,9 +7549,9 @@ static void print_struct_cb_reference (int indent, int ptr_uid, struct cb_refere PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_alter_code != 0 ){ + if( print_zero_fields || ptr->flag_alter_code != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_alter_code); @@ -7536,9 +7559,9 @@ static void print_struct_cb_reference (int indent, int ptr_uid, struct cb_refere PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_debug_code != 0 ){ + if( print_zero_fields || ptr->flag_debug_code != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_debug_code); @@ -7546,9 +7569,9 @@ static void print_struct_cb_reference (int indent, int ptr_uid, struct cb_refere PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_all_debug != 0 ){ + if( print_zero_fields || ptr->flag_all_debug != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_all_debug); @@ -7556,9 +7579,9 @@ static void print_struct_cb_reference (int indent, int ptr_uid, struct cb_refere PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_target != 0 ){ + if( print_zero_fields || ptr->flag_target != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_target); @@ -7566,9 +7589,9 @@ static void print_struct_cb_reference (int indent, int ptr_uid, struct cb_refere PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_optional != 0 ){ + if( print_zero_fields || ptr->flag_optional != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_optional); @@ -7576,9 +7599,9 @@ static void print_struct_cb_reference (int indent, int ptr_uid, struct cb_refere PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_ignored != 0 ){ + if( print_zero_fields || ptr->flag_ignored != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_ignored); @@ -7586,9 +7609,9 @@ static void print_struct_cb_reference (int indent, int ptr_uid, struct cb_refere PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_filler_ref != 0 ){ + if( print_zero_fields || ptr->flag_filler_ref != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_filler_ref); @@ -7596,9 +7619,9 @@ static void print_struct_cb_reference (int indent, int ptr_uid, struct cb_refere PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_duped != 0 ){ + if( print_zero_fields || ptr->flag_duped != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_duped); @@ -7606,7 +7629,7 @@ static void print_struct_cb_reference (int indent, int ptr_uid, struct cb_refere PRINT_STRUCT_FIELD_END(indent); - } + } indent -= 2; PRINT_STRUCT_END(indent, ty); @@ -7718,7 +7741,7 @@ static void print_struct_cb_binary_op (int indent, int ptr_uid, struct cb_binary PRINT_STRUCT_FIELD_END(indent); - if( ptr->x != NULL ){ + if( print_zero_fields || ptr->x != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,x); @@ -7730,9 +7753,9 @@ static void print_struct_cb_binary_op (int indent, int ptr_uid, struct cb_binary PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->y != NULL ){ + if( print_zero_fields || ptr->y != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,y); @@ -7744,7 +7767,7 @@ static void print_struct_cb_binary_op (int indent, int ptr_uid, struct cb_binary PRINT_STRUCT_FIELD_END(indent); - } + } PRINT_STRUCT_FIELD_BEGIN(indent,op); @@ -7790,7 +7813,7 @@ static void print_struct_cb_funcall (int indent, int ptr_uid, struct cb_funcall PRINT_STRUCT_FIELD_END(indent); - if( ptr->name != NULL ){ + if( print_zero_fields || ptr->name != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,name); @@ -7798,9 +7821,9 @@ static void print_struct_cb_funcall (int indent, int ptr_uid, struct cb_funcall PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->argv != NULL ){ + if( print_zero_fields || ptr->argv != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,argv); @@ -7824,9 +7847,9 @@ static void print_struct_cb_funcall (int indent, int ptr_uid, struct cb_funcall PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->argc != 0 ){ + if( print_zero_fields || ptr->argc != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,argc); @@ -7834,9 +7857,9 @@ static void print_struct_cb_funcall (int indent, int ptr_uid, struct cb_funcall PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->varcnt != 0 ){ + if( print_zero_fields || ptr->varcnt != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,varcnt); @@ -7844,9 +7867,9 @@ static void print_struct_cb_funcall (int indent, int ptr_uid, struct cb_funcall PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->screenptr != 0 ){ + if( print_zero_fields || ptr->screenptr != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,screenptr); @@ -7854,9 +7877,9 @@ static void print_struct_cb_funcall (int indent, int ptr_uid, struct cb_funcall PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->nolitcast != 0 ){ + if( print_zero_fields || ptr->nolitcast != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,nolitcast); @@ -7864,7 +7887,7 @@ static void print_struct_cb_funcall (int indent, int ptr_uid, struct cb_funcall PRINT_STRUCT_FIELD_END(indent); - } + } indent -= 2; PRINT_STRUCT_END(indent, ty); @@ -7927,7 +7950,7 @@ static void print_struct_cb_cast (int indent, int ptr_uid, struct cb_cast *ptr){ PRINT_STRUCT_FIELD_END(indent); - if( ptr->val != NULL ){ + if( print_zero_fields || ptr->val != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,val); @@ -7939,7 +7962,7 @@ static void print_struct_cb_cast (int indent, int ptr_uid, struct cb_cast *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } PRINT_STRUCT_FIELD_BEGIN(indent,cast_type); @@ -8252,7 +8275,7 @@ static void print_struct_cb_intrinsic_table (int indent, int ptr_uid, struct cb_ PRINT_STRUCT_BEGIN(indent, ty, ptr_uid); indent += 2; - if( ptr->name != NULL ){ + if( print_zero_fields || ptr->name != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,name); @@ -8260,9 +8283,9 @@ static void print_struct_cb_intrinsic_table (int indent, int ptr_uid, struct cb_ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->intr_routine != NULL ){ + if( print_zero_fields || ptr->intr_routine != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,intr_routine); @@ -8270,7 +8293,7 @@ static void print_struct_cb_intrinsic_table (int indent, int ptr_uid, struct cb_ PRINT_STRUCT_FIELD_END(indent); - } + } PRINT_STRUCT_FIELD_BEGIN(indent,intr_enum); @@ -8278,7 +8301,7 @@ static void print_struct_cb_intrinsic_table (int indent, int ptr_uid, struct cb_ PRINT_STRUCT_FIELD_END(indent); - if( ptr->token != 0 ){ + if( print_zero_fields || ptr->token != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,token); @@ -8286,7 +8309,7 @@ static void print_struct_cb_intrinsic_table (int indent, int ptr_uid, struct cb_ PRINT_STRUCT_FIELD_END(indent); - } + } PRINT_STRUCT_FIELD_BEGIN(indent,active); @@ -8294,7 +8317,7 @@ static void print_struct_cb_intrinsic_table (int indent, int ptr_uid, struct cb_ PRINT_STRUCT_FIELD_END(indent); - if( ptr->args != 0 ){ + if( print_zero_fields || ptr->args != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,args); @@ -8302,9 +8325,9 @@ static void print_struct_cb_intrinsic_table (int indent, int ptr_uid, struct cb_ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->min_args != 0 ){ + if( print_zero_fields || ptr->min_args != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,min_args); @@ -8312,7 +8335,7 @@ static void print_struct_cb_intrinsic_table (int indent, int ptr_uid, struct cb_ PRINT_STRUCT_FIELD_END(indent); - } + } PRINT_STRUCT_FIELD_BEGIN(indent,category); @@ -8320,7 +8343,7 @@ static void print_struct_cb_intrinsic_table (int indent, int ptr_uid, struct cb_ PRINT_STRUCT_FIELD_END(indent); - if( ptr->refmod != 0 ){ + if( print_zero_fields || ptr->refmod != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,refmod); @@ -8328,7 +8351,7 @@ static void print_struct_cb_intrinsic_table (int indent, int ptr_uid, struct cb_ PRINT_STRUCT_FIELD_END(indent); - } + } indent -= 2; PRINT_STRUCT_END(indent, ty); @@ -8345,7 +8368,7 @@ static void print_struct_cb_intrinsic (int indent, int ptr_uid, struct cb_intrin PRINT_STRUCT_FIELD_END(indent); - if( ptr->name != NULL ){ + if( print_zero_fields || ptr->name != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,name); @@ -8357,9 +8380,9 @@ static void print_struct_cb_intrinsic (int indent, int ptr_uid, struct cb_intrin PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->args != NULL ){ + if( print_zero_fields || ptr->args != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,args); @@ -8371,9 +8394,9 @@ static void print_struct_cb_intrinsic (int indent, int ptr_uid, struct cb_intrin PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->intr_field != NULL ){ + if( print_zero_fields || ptr->intr_field != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,intr_field); @@ -8385,9 +8408,9 @@ static void print_struct_cb_intrinsic (int indent, int ptr_uid, struct cb_intrin PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->intr_tab != NULL ){ + if( print_zero_fields || ptr->intr_tab != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,intr_tab); @@ -8399,9 +8422,9 @@ static void print_struct_cb_intrinsic (int indent, int ptr_uid, struct cb_intrin PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->offset != NULL ){ + if( print_zero_fields || ptr->offset != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,offset); @@ -8413,9 +8436,9 @@ static void print_struct_cb_intrinsic (int indent, int ptr_uid, struct cb_intrin PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->length != NULL ){ + if( print_zero_fields || ptr->length != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,length); @@ -8427,9 +8450,9 @@ static void print_struct_cb_intrinsic (int indent, int ptr_uid, struct cb_intrin PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->isuser != 0 ){ + if( print_zero_fields || ptr->isuser != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,isuser); @@ -8437,7 +8460,7 @@ static void print_struct_cb_intrinsic (int indent, int ptr_uid, struct cb_intrin PRINT_STRUCT_FIELD_END(indent); - } + } indent -= 2; PRINT_STRUCT_END(indent, ty); @@ -8471,7 +8494,7 @@ static void print_struct_cb_assign (int indent, int ptr_uid, struct cb_assign *p PRINT_STRUCT_FIELD_END(indent); - if( ptr->var != NULL ){ + if( print_zero_fields || ptr->var != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,var); @@ -8483,9 +8506,9 @@ static void print_struct_cb_assign (int indent, int ptr_uid, struct cb_assign *p PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->val != NULL ){ + if( print_zero_fields || ptr->val != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,val); @@ -8497,7 +8520,7 @@ static void print_struct_cb_assign (int indent, int ptr_uid, struct cb_assign *p PRINT_STRUCT_FIELD_END(indent); - } + } indent -= 2; PRINT_STRUCT_END(indent, ty); @@ -8531,7 +8554,7 @@ static void print_struct_cb_initialize (int indent, int ptr_uid, struct cb_initi PRINT_STRUCT_FIELD_END(indent); - if( ptr->var != NULL ){ + if( print_zero_fields || ptr->var != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,var); @@ -8543,9 +8566,9 @@ static void print_struct_cb_initialize (int indent, int ptr_uid, struct cb_initi PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->val != NULL ){ + if( print_zero_fields || ptr->val != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,val); @@ -8557,9 +8580,9 @@ static void print_struct_cb_initialize (int indent, int ptr_uid, struct cb_initi PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->rep != NULL ){ + if( print_zero_fields || ptr->rep != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,rep); @@ -8571,7 +8594,7 @@ static void print_struct_cb_initialize (int indent, int ptr_uid, struct cb_initi PRINT_STRUCT_FIELD_END(indent); - } + } PRINT_STRUCT_FIELD_BEGIN(indent,statement); @@ -8579,7 +8602,7 @@ static void print_struct_cb_initialize (int indent, int ptr_uid, struct cb_initi PRINT_STRUCT_FIELD_END(indent); - if( ptr->flag_default != 0 ){ + if( print_zero_fields || ptr->flag_default != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_default); @@ -8587,9 +8610,9 @@ static void print_struct_cb_initialize (int indent, int ptr_uid, struct cb_initi PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_no_filler_init != 0 ){ + if( print_zero_fields || ptr->flag_no_filler_init != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_no_filler_init); @@ -8597,9 +8620,9 @@ static void print_struct_cb_initialize (int indent, int ptr_uid, struct cb_initi PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->padding != 0 ){ + if( print_zero_fields || ptr->padding != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,padding); @@ -8607,7 +8630,7 @@ static void print_struct_cb_initialize (int indent, int ptr_uid, struct cb_initi PRINT_STRUCT_FIELD_END(indent); - } + } indent -= 2; PRINT_STRUCT_END(indent, ty); @@ -8641,7 +8664,7 @@ static void print_struct_cb_search (int indent, int ptr_uid, struct cb_search *p PRINT_STRUCT_FIELD_END(indent); - if( ptr->table != NULL ){ + if( print_zero_fields || ptr->table != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,table); @@ -8653,9 +8676,9 @@ static void print_struct_cb_search (int indent, int ptr_uid, struct cb_search *p PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->var != NULL ){ + if( print_zero_fields || ptr->var != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,var); @@ -8667,9 +8690,9 @@ static void print_struct_cb_search (int indent, int ptr_uid, struct cb_search *p PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->at_end != NULL ){ + if( print_zero_fields || ptr->at_end != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,at_end); @@ -8681,9 +8704,9 @@ static void print_struct_cb_search (int indent, int ptr_uid, struct cb_search *p PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->whens != NULL ){ + if( print_zero_fields || ptr->whens != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,whens); @@ -8695,9 +8718,9 @@ static void print_struct_cb_search (int indent, int ptr_uid, struct cb_search *p PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_all != 0 ){ + if( print_zero_fields || ptr->flag_all != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_all); @@ -8705,7 +8728,7 @@ static void print_struct_cb_search (int indent, int ptr_uid, struct cb_search *p PRINT_STRUCT_FIELD_END(indent); - } + } indent -= 2; PRINT_STRUCT_END(indent, ty); @@ -8739,7 +8762,7 @@ static void print_struct_cb_call (int indent, int ptr_uid, struct cb_call *ptr){ PRINT_STRUCT_FIELD_END(indent); - if( ptr->name != NULL ){ + if( print_zero_fields || ptr->name != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,name); @@ -8751,9 +8774,9 @@ static void print_struct_cb_call (int indent, int ptr_uid, struct cb_call *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->args != NULL ){ + if( print_zero_fields || ptr->args != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,args); @@ -8765,9 +8788,9 @@ static void print_struct_cb_call (int indent, int ptr_uid, struct cb_call *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->stmt1 != NULL ){ + if( print_zero_fields || ptr->stmt1 != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,stmt1); @@ -8779,9 +8802,9 @@ static void print_struct_cb_call (int indent, int ptr_uid, struct cb_call *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->stmt2 != NULL ){ + if( print_zero_fields || ptr->stmt2 != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,stmt2); @@ -8793,9 +8816,9 @@ static void print_struct_cb_call (int indent, int ptr_uid, struct cb_call *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->call_returning != NULL ){ + if( print_zero_fields || ptr->call_returning != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,call_returning); @@ -8807,9 +8830,9 @@ static void print_struct_cb_call (int indent, int ptr_uid, struct cb_call *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->is_system != 0 ){ + if( print_zero_fields || ptr->is_system != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,is_system); @@ -8817,9 +8840,9 @@ static void print_struct_cb_call (int indent, int ptr_uid, struct cb_call *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->convention != 0 ){ + if( print_zero_fields || ptr->convention != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,convention); @@ -8827,7 +8850,7 @@ static void print_struct_cb_call (int indent, int ptr_uid, struct cb_call *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } indent -= 2; PRINT_STRUCT_END(indent, ty); @@ -8861,7 +8884,7 @@ static void print_struct_cb_goto (int indent, int ptr_uid, struct cb_goto *ptr){ PRINT_STRUCT_FIELD_END(indent); - if( ptr->target != NULL ){ + if( print_zero_fields || ptr->target != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,target); @@ -8873,9 +8896,9 @@ static void print_struct_cb_goto (int indent, int ptr_uid, struct cb_goto *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->depending != NULL ){ + if( print_zero_fields || ptr->depending != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,depending); @@ -8887,9 +8910,9 @@ static void print_struct_cb_goto (int indent, int ptr_uid, struct cb_goto *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flags != 0 ){ + if( print_zero_fields || ptr->flags != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flags); @@ -8897,7 +8920,7 @@ static void print_struct_cb_goto (int indent, int ptr_uid, struct cb_goto *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } indent -= 2; PRINT_STRUCT_END(indent, ty); @@ -8931,7 +8954,7 @@ static void print_struct_cb_if (int indent, int ptr_uid, struct cb_if *ptr){ PRINT_STRUCT_FIELD_END(indent); - if( ptr->test != NULL ){ + if( print_zero_fields || ptr->test != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,test); @@ -8943,9 +8966,9 @@ static void print_struct_cb_if (int indent, int ptr_uid, struct cb_if *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->stmt1 != NULL ){ + if( print_zero_fields || ptr->stmt1 != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,stmt1); @@ -8957,9 +8980,9 @@ static void print_struct_cb_if (int indent, int ptr_uid, struct cb_if *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->stmt2 != NULL ){ + if( print_zero_fields || ptr->stmt2 != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,stmt2); @@ -8971,7 +8994,7 @@ static void print_struct_cb_if (int indent, int ptr_uid, struct cb_if *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } PRINT_STRUCT_FIELD_BEGIN(indent,statement); @@ -9034,7 +9057,7 @@ static void print_struct_cb_perform (int indent, int ptr_uid, struct cb_perform PRINT_STRUCT_FIELD_END(indent); - if( ptr->test != NULL ){ + if( print_zero_fields || ptr->test != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,test); @@ -9046,9 +9069,9 @@ static void print_struct_cb_perform (int indent, int ptr_uid, struct cb_perform PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->body != NULL ){ + if( print_zero_fields || ptr->body != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,body); @@ -9060,9 +9083,9 @@ static void print_struct_cb_perform (int indent, int ptr_uid, struct cb_perform PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->data != NULL ){ + if( print_zero_fields || ptr->data != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,data); @@ -9074,9 +9097,9 @@ static void print_struct_cb_perform (int indent, int ptr_uid, struct cb_perform PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->varying != NULL ){ + if( print_zero_fields || ptr->varying != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,varying); @@ -9088,9 +9111,9 @@ static void print_struct_cb_perform (int indent, int ptr_uid, struct cb_perform PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->exit_label != NULL ){ + if( print_zero_fields || ptr->exit_label != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,exit_label); @@ -9102,9 +9125,9 @@ static void print_struct_cb_perform (int indent, int ptr_uid, struct cb_perform PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->cycle_label != NULL ){ + if( print_zero_fields || ptr->cycle_label != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,cycle_label); @@ -9116,7 +9139,7 @@ static void print_struct_cb_perform (int indent, int ptr_uid, struct cb_perform PRINT_STRUCT_FIELD_END(indent); - } + } PRINT_STRUCT_FIELD_BEGIN(indent,perform_type); @@ -9167,7 +9190,7 @@ static void print_struct_cb_attr_struct (int indent, int ptr_uid, struct cb_attr PRINT_STRUCT_BEGIN(indent, ty, ptr_uid); indent += 2; - if( ptr->fgc != NULL ){ + if( print_zero_fields || ptr->fgc != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,fgc); @@ -9179,9 +9202,9 @@ static void print_struct_cb_attr_struct (int indent, int ptr_uid, struct cb_attr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->bgc != NULL ){ + if( print_zero_fields || ptr->bgc != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,bgc); @@ -9193,9 +9216,9 @@ static void print_struct_cb_attr_struct (int indent, int ptr_uid, struct cb_attr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->scroll != NULL ){ + if( print_zero_fields || ptr->scroll != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,scroll); @@ -9207,9 +9230,9 @@ static void print_struct_cb_attr_struct (int indent, int ptr_uid, struct cb_attr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->timeout != NULL ){ + if( print_zero_fields || ptr->timeout != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,timeout); @@ -9221,9 +9244,9 @@ static void print_struct_cb_attr_struct (int indent, int ptr_uid, struct cb_attr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->prompt != NULL ){ + if( print_zero_fields || ptr->prompt != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,prompt); @@ -9235,9 +9258,9 @@ static void print_struct_cb_attr_struct (int indent, int ptr_uid, struct cb_attr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->size_is != NULL ){ + if( print_zero_fields || ptr->size_is != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,size_is); @@ -9249,9 +9272,9 @@ static void print_struct_cb_attr_struct (int indent, int ptr_uid, struct cb_attr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->control != NULL ){ + if( print_zero_fields || ptr->control != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,control); @@ -9263,9 +9286,9 @@ static void print_struct_cb_attr_struct (int indent, int ptr_uid, struct cb_attr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->color != NULL ){ + if( print_zero_fields || ptr->color != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,color); @@ -9277,9 +9300,9 @@ static void print_struct_cb_attr_struct (int indent, int ptr_uid, struct cb_attr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->cursor != NULL ){ + if( print_zero_fields || ptr->cursor != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,cursor); @@ -9291,9 +9314,9 @@ static void print_struct_cb_attr_struct (int indent, int ptr_uid, struct cb_attr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->dispattrs != 0 ){ + if( print_zero_fields || ptr->dispattrs != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,dispattrs); @@ -9301,7 +9324,7 @@ static void print_struct_cb_attr_struct (int indent, int ptr_uid, struct cb_attr PRINT_STRUCT_FIELD_END(indent); - } + } indent -= 2; PRINT_STRUCT_END(indent, ty); @@ -9359,7 +9382,7 @@ static void print_struct_cb_statement (int indent, int ptr_uid, struct cb_statem PRINT_STRUCT_FIELD_END(indent); - if( ptr->body != NULL ){ + if( print_zero_fields || ptr->body != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,body); @@ -9371,9 +9394,9 @@ static void print_struct_cb_statement (int indent, int ptr_uid, struct cb_statem PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->file != NULL ){ + if( print_zero_fields || ptr->file != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,file); @@ -9385,9 +9408,9 @@ static void print_struct_cb_statement (int indent, int ptr_uid, struct cb_statem PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->ex_handler != NULL ){ + if( print_zero_fields || ptr->ex_handler != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,ex_handler); @@ -9399,9 +9422,9 @@ static void print_struct_cb_statement (int indent, int ptr_uid, struct cb_statem PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->not_ex_handler != NULL ){ + if( print_zero_fields || ptr->not_ex_handler != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,not_ex_handler); @@ -9413,9 +9436,9 @@ static void print_struct_cb_statement (int indent, int ptr_uid, struct cb_statem PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->handler3 != NULL ){ + if( print_zero_fields || ptr->handler3 != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,handler3); @@ -9427,9 +9450,9 @@ static void print_struct_cb_statement (int indent, int ptr_uid, struct cb_statem PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->null_check != NULL ){ + if( print_zero_fields || ptr->null_check != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,null_check); @@ -9441,9 +9464,9 @@ static void print_struct_cb_statement (int indent, int ptr_uid, struct cb_statem PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->debug_check != NULL ){ + if( print_zero_fields || ptr->debug_check != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,debug_check); @@ -9455,9 +9478,9 @@ static void print_struct_cb_statement (int indent, int ptr_uid, struct cb_statem PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->debug_nodups != NULL ){ + if( print_zero_fields || ptr->debug_nodups != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,debug_nodups); @@ -9469,9 +9492,9 @@ static void print_struct_cb_statement (int indent, int ptr_uid, struct cb_statem PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->attr_ptr != NULL ){ + if( print_zero_fields || ptr->attr_ptr != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,attr_ptr); @@ -9483,7 +9506,7 @@ static void print_struct_cb_statement (int indent, int ptr_uid, struct cb_statem PRINT_STRUCT_FIELD_END(indent); - } + } PRINT_STRUCT_FIELD_BEGIN(indent,handler_type); @@ -9491,7 +9514,7 @@ static void print_struct_cb_statement (int indent, int ptr_uid, struct cb_statem PRINT_STRUCT_FIELD_END(indent); - if( ptr->flag_no_based != 0 ){ + if( print_zero_fields || ptr->flag_no_based != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_no_based); @@ -9499,9 +9522,9 @@ static void print_struct_cb_statement (int indent, int ptr_uid, struct cb_statem PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_in_debug != 0 ){ + if( print_zero_fields || ptr->flag_in_debug != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_in_debug); @@ -9509,9 +9532,9 @@ static void print_struct_cb_statement (int indent, int ptr_uid, struct cb_statem PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_callback != 0 ){ + if( print_zero_fields || ptr->flag_callback != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_callback); @@ -9519,9 +9542,9 @@ static void print_struct_cb_statement (int indent, int ptr_uid, struct cb_statem PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_implicit != 0 ){ + if( print_zero_fields || ptr->flag_implicit != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_implicit); @@ -9529,7 +9552,7 @@ static void print_struct_cb_statement (int indent, int ptr_uid, struct cb_statem PRINT_STRUCT_FIELD_END(indent); - } + } indent -= 2; PRINT_STRUCT_END(indent, ty); @@ -9595,7 +9618,7 @@ static void print_struct_cb_cancel (int indent, int ptr_uid, struct cb_cancel *p PRINT_STRUCT_FIELD_END(indent); - if( ptr->target != NULL ){ + if( print_zero_fields || ptr->target != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,target); @@ -9607,7 +9630,7 @@ static void print_struct_cb_cancel (int indent, int ptr_uid, struct cb_cancel *p PRINT_STRUCT_FIELD_END(indent); - } + } indent -= 2; PRINT_STRUCT_END(indent, ty); @@ -9641,7 +9664,7 @@ static void print_struct_cb_alter (int indent, int ptr_uid, struct cb_alter *ptr PRINT_STRUCT_FIELD_END(indent); - if( ptr->source != NULL ){ + if( print_zero_fields || ptr->source != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,source); @@ -9653,9 +9676,9 @@ static void print_struct_cb_alter (int indent, int ptr_uid, struct cb_alter *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->target != NULL ){ + if( print_zero_fields || ptr->target != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,target); @@ -9667,7 +9690,7 @@ static void print_struct_cb_alter (int indent, int ptr_uid, struct cb_alter *ptr PRINT_STRUCT_FIELD_END(indent); - } + } indent -= 2; PRINT_STRUCT_END(indent, ty); @@ -9701,7 +9724,7 @@ static void print_struct_cb_set_attr (int indent, int ptr_uid, struct cb_set_att PRINT_STRUCT_FIELD_END(indent); - if( ptr->fld != NULL ){ + if( print_zero_fields || ptr->fld != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,fld); @@ -9713,9 +9736,9 @@ static void print_struct_cb_set_attr (int indent, int ptr_uid, struct cb_set_att PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->val_on != 0 ){ + if( print_zero_fields || ptr->val_on != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,val_on); @@ -9723,9 +9746,9 @@ static void print_struct_cb_set_attr (int indent, int ptr_uid, struct cb_set_att PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->val_off != 0 ){ + if( print_zero_fields || ptr->val_off != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,val_off); @@ -9733,7 +9756,7 @@ static void print_struct_cb_set_attr (int indent, int ptr_uid, struct cb_set_att PRINT_STRUCT_FIELD_END(indent); - } + } indent -= 2; PRINT_STRUCT_END(indent, ty); @@ -9767,7 +9790,7 @@ static void print_struct_cb_xml_parse (int indent, int ptr_uid, struct cb_xml_pa PRINT_STRUCT_FIELD_END(indent); - if( ptr->data != NULL ){ + if( print_zero_fields || ptr->data != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,data); @@ -9779,9 +9802,9 @@ static void print_struct_cb_xml_parse (int indent, int ptr_uid, struct cb_xml_pa PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->proc != NULL ){ + if( print_zero_fields || ptr->proc != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,proc); @@ -9793,9 +9816,9 @@ static void print_struct_cb_xml_parse (int indent, int ptr_uid, struct cb_xml_pa PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->encoding != NULL ){ + if( print_zero_fields || ptr->encoding != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,encoding); @@ -9807,9 +9830,9 @@ static void print_struct_cb_xml_parse (int indent, int ptr_uid, struct cb_xml_pa PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->validating != NULL ){ + if( print_zero_fields || ptr->validating != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,validating); @@ -9821,9 +9844,9 @@ static void print_struct_cb_xml_parse (int indent, int ptr_uid, struct cb_xml_pa PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->returning_national != 0 ){ + if( print_zero_fields || ptr->returning_national != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,returning_national); @@ -9831,7 +9854,7 @@ static void print_struct_cb_xml_parse (int indent, int ptr_uid, struct cb_xml_pa PRINT_STRUCT_FIELD_END(indent); - } + } indent -= 2; PRINT_STRUCT_END(indent, ty); @@ -9865,7 +9888,7 @@ static void print_struct_cb_perform_varying (int indent, int ptr_uid, struct cb_ PRINT_STRUCT_FIELD_END(indent); - if( ptr->name != NULL ){ + if( print_zero_fields || ptr->name != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,name); @@ -9877,9 +9900,9 @@ static void print_struct_cb_perform_varying (int indent, int ptr_uid, struct cb_ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->from != NULL ){ + if( print_zero_fields || ptr->from != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,from); @@ -9891,9 +9914,9 @@ static void print_struct_cb_perform_varying (int indent, int ptr_uid, struct cb_ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->step != NULL ){ + if( print_zero_fields || ptr->step != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,step); @@ -9905,9 +9928,9 @@ static void print_struct_cb_perform_varying (int indent, int ptr_uid, struct cb_ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->until != NULL ){ + if( print_zero_fields || ptr->until != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,until); @@ -9919,7 +9942,7 @@ static void print_struct_cb_perform_varying (int indent, int ptr_uid, struct cb_ PRINT_STRUCT_FIELD_END(indent); - } + } indent -= 2; PRINT_STRUCT_END(indent, ty); @@ -9953,7 +9976,7 @@ static void print_struct_cb_direct (int indent, int ptr_uid, struct cb_direct *p PRINT_STRUCT_FIELD_END(indent); - if( ptr->line != NULL ){ + if( print_zero_fields || ptr->line != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,line); @@ -9961,9 +9984,9 @@ static void print_struct_cb_direct (int indent, int ptr_uid, struct cb_direct *p PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_is_direct != 0 ){ + if( print_zero_fields || ptr->flag_is_direct != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_is_direct); @@ -9971,9 +9994,9 @@ static void print_struct_cb_direct (int indent, int ptr_uid, struct cb_direct *p PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->flag_new_line != 0 ){ + if( print_zero_fields || ptr->flag_new_line != 0 ){ PRINT_STRUCT_FIELD_BEGIN(indent,flag_new_line); @@ -9981,7 +10004,7 @@ static void print_struct_cb_direct (int indent, int ptr_uid, struct cb_direct *p PRINT_STRUCT_FIELD_END(indent); - } + } indent -= 2; PRINT_STRUCT_END(indent, ty); @@ -10015,7 +10038,7 @@ static void print_struct_cb_debug (int indent, int ptr_uid, struct cb_debug *ptr PRINT_STRUCT_FIELD_END(indent); - if( ptr->target != NULL ){ + if( print_zero_fields || ptr->target != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,target); @@ -10027,9 +10050,9 @@ static void print_struct_cb_debug (int indent, int ptr_uid, struct cb_debug *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->value != NULL ){ + if( print_zero_fields || ptr->value != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,value); @@ -10037,9 +10060,9 @@ static void print_struct_cb_debug (int indent, int ptr_uid, struct cb_debug *ptr PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->fld != NULL ){ + if( print_zero_fields || ptr->fld != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,fld); @@ -10051,7 +10074,7 @@ static void print_struct_cb_debug (int indent, int ptr_uid, struct cb_debug *ptr PRINT_STRUCT_FIELD_END(indent); - } + } PRINT_STRUCT_FIELD_BEGIN(indent,size); @@ -10091,7 +10114,7 @@ static void print_struct_cb_debug_call (int indent, int ptr_uid, struct cb_debug PRINT_STRUCT_FIELD_END(indent); - if( ptr->target != NULL ){ + if( print_zero_fields || ptr->target != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,target); @@ -10103,7 +10126,7 @@ static void print_struct_cb_debug_call (int indent, int ptr_uid, struct cb_debug PRINT_STRUCT_FIELD_END(indent); - } + } indent -= 2; PRINT_STRUCT_END(indent, ty); @@ -10137,7 +10160,7 @@ static void print_struct_cb_prototype (int indent, int ptr_uid, struct cb_protot PRINT_STRUCT_FIELD_END(indent); - if( ptr->name != NULL ){ + if( print_zero_fields || ptr->name != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,name); @@ -10145,9 +10168,9 @@ static void print_struct_cb_prototype (int indent, int ptr_uid, struct cb_protot PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->ext_name != NULL ){ + if( print_zero_fields || ptr->ext_name != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,ext_name); @@ -10155,7 +10178,7 @@ static void print_struct_cb_prototype (int indent, int ptr_uid, struct cb_protot PRINT_STRUCT_FIELD_END(indent); - } + } PRINT_STRUCT_FIELD_BEGIN(indent,type); @@ -10239,7 +10262,7 @@ static void print_struct_cb_ml_suppress_clause (int indent, int ptr_uid, struct PRINT_STRUCT_FIELD_END(indent); - if( ptr->identifier != NULL ){ + if( print_zero_fields || ptr->identifier != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,identifier); @@ -10251,9 +10274,9 @@ static void print_struct_cb_ml_suppress_clause (int indent, int ptr_uid, struct PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->when_list != NULL ){ + if( print_zero_fields || ptr->when_list != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,when_list); @@ -10265,7 +10288,7 @@ static void print_struct_cb_ml_suppress_clause (int indent, int ptr_uid, struct PRINT_STRUCT_FIELD_END(indent); - } + } PRINT_STRUCT_FIELD_BEGIN(indent,ml_type); @@ -10311,7 +10334,7 @@ static void print_struct_cb_ml_suppress_checks (int indent, int ptr_uid, struct PRINT_STRUCT_FIELD_END(indent); - if( ptr->tree != NULL ){ + if( print_zero_fields || ptr->tree != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,tree); @@ -10323,7 +10346,7 @@ static void print_struct_cb_ml_suppress_checks (int indent, int ptr_uid, struct PRINT_STRUCT_FIELD_END(indent); - } + } indent -= 2; PRINT_STRUCT_END(indent, ty); @@ -10357,7 +10380,7 @@ static void print_struct_cb_vary (int indent, int ptr_uid, struct cb_vary *ptr){ PRINT_STRUCT_FIELD_END(indent); - if( ptr->var != NULL ){ + if( print_zero_fields || ptr->var != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,var); @@ -10369,9 +10392,9 @@ static void print_struct_cb_vary (int indent, int ptr_uid, struct cb_vary *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->from != NULL ){ + if( print_zero_fields || ptr->from != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,from); @@ -10383,9 +10406,9 @@ static void print_struct_cb_vary (int indent, int ptr_uid, struct cb_vary *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->by != NULL ){ + if( print_zero_fields || ptr->by != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,by); @@ -10397,7 +10420,7 @@ static void print_struct_cb_vary (int indent, int ptr_uid, struct cb_vary *ptr){ PRINT_STRUCT_FIELD_END(indent); - } + } indent -= 2; PRINT_STRUCT_END(indent, ty); @@ -10431,7 +10454,7 @@ static void print_struct_cb_table_values (int indent, int ptr_uid, struct cb_tab PRINT_STRUCT_FIELD_END(indent); - if( ptr->values != NULL ){ + if( print_zero_fields || ptr->values != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,values); @@ -10443,9 +10466,9 @@ static void print_struct_cb_table_values (int indent, int ptr_uid, struct cb_tab PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->from != NULL ){ + if( print_zero_fields || ptr->from != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,from); @@ -10457,9 +10480,9 @@ static void print_struct_cb_table_values (int indent, int ptr_uid, struct cb_tab PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->to != NULL ){ + if( print_zero_fields || ptr->to != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,to); @@ -10471,9 +10494,9 @@ static void print_struct_cb_table_values (int indent, int ptr_uid, struct cb_tab PRINT_STRUCT_FIELD_END(indent); - } + } - if( ptr->repeat_times != NULL ){ + if( print_zero_fields || ptr->repeat_times != NULL ){ PRINT_STRUCT_FIELD_BEGIN(indent,repeat_times); @@ -10485,7 +10508,7 @@ static void print_struct_cb_table_values (int indent, int ptr_uid, struct cb_tab PRINT_STRUCT_FIELD_END(indent); - } + } indent -= 2; PRINT_STRUCT_END(indent, ty); @@ -10493,6 +10516,7 @@ static void print_struct_cb_table_values (int indent, int ptr_uid, struct cb_tab static void print_struct_cb_tree_common_ptr (int indent, cb_tree cb){ + const char* ty = "cb_tree"; if (cb == NULL){ PRINT_NULL(indent,ty); @@ -10608,5 +10632,3 @@ static void cb_print_tree (cb_tree cb){ } - - diff --git a/cobc/dump_tree.c b/cobc/dump_tree.c deleted file mode 100644 index 1fea25cbf..000000000 --- a/cobc/dump_tree.c +++ /dev/null @@ -1,568 +0,0 @@ -/* - Copyright (C) 2023-2024 Free Software Foundation, Inc. - Written by Fabrice Le Fessant - - This file is part of GnuCOBOL. - - The GnuCOBOL compiler is free software: you can redistribute it - and/or modify it under the terms of the GNU General Public License - as published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - GnuCOBOL is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GnuCOBOL. If not, see . -*/ - - -#include "config.h" - -#include -#include -#include -#include -#ifdef HAVE_STRINGS_H -#include -#endif -#include -#include -#include - -#include "cobc.h" -#include "../libcob/coblocal.h" -#include "tree.h" - -/* field descriptor of tree dump */ -static FILE* fd = NULL; - -/* flag: whether we should print cb_tree_common header */ -int cb_dump_tree_with_common = 0; - -/* flag: whether we should print locations, only in with_common=1 mode */ -int cb_dump_tree_with_loc = 0; - -/* flag: whether we should print types */ -int cb_dump_tree_with_type = 0; - -/* flag: whether we should add a field with record pointer address */ -int cb_dump_tree_with_pointer = 0; - -/* flag: whether we should indent the file */ -int cb_dump_tree_with_indent = 1; - -/* flag: whether we should print newlines in the file */ -int cb_dump_tree_with_newlines = 1; - -/* flag: print a message at the end */ -int cb_dump_tree_print_message = 1; - -enum formatter_kind { - FORMAT_JSON, - FORMAT_OCAML -}; - -typedef struct formatter { - enum formatter_kind format_kind; - const char* format_header ; - const char* format_trailer ; - - const char* format_begin_field ; - const char* format_end_field ; - - const char* format_begin_record ; - const char* format_delim_record ; - const char* format_last_delim_record ; - const char* format_end_record ; - - const char* format_begin_list ; - const char* format_delim_list ; - const char* format_last_delim_list ; - const char* format_end_list ; - - const char* format_begin_flags; - const char* format_begin_flag; - const char* format_end_flag; - const char* format_end_flags; - - const char* format_null ; - const char* format_begin_constr ; - const char* format_delim_constr ; - const char* format_end_constr ; - const char* format_begin_pointer ; - const char* format_end_pointer ; - const char* format_begin_char ; - const char* format_end_char ; - const char* format_begin_string ; - const char* format_end_string ; - const char* format_begin_int ; - const char* format_end_int ; -} formatter; - -static struct formatter fmt; - - - -static void print_struct_cb_tree_common (int indent, int ptr_uid, struct cb_tree_common *ptr); -static void print_struct_cb_tree_common_ptr (int indent, cb_tree cb); -static void print_int_array (int indent, int n, int * tab); -/* static void print_char_array (int indent, int n, char * tab);*/ - -static const char * get_indent (int indent){ - static int current_indent = 0; - static char* indent_string = NULL; - static int current_size ; - if (indent == 0) return ""; - - if (indent >= current_size){ - int i; - if (indent_string != NULL) free (indent_string); - current_size = indent + 100 ; - indent_string = (char*) malloc ( current_size ); - current_indent = current_size-1; - for (i=0; i MB%03d)", ty, ptr_uid) -#define PRINT_STRUCT_TY(s) \ - const char* ty = s -#define PRINT_STRUCT_PTR_TY(s) \ - const char* ty = s -#define PRINT_STRUCT_BEGIN(indent,ty, ptr_uid) \ - if (ptr_uid != 0) \ - fprintf (fd, "// MEMORY_BLOCK(MB%03d):\n", ptr_uid); \ - else \ - fprintf (fd, "// INLINE_BLOCK:\n"); \ - fprintf (fd, "%s{ //[%s]\n", get_indent (indent), ty) -#define PRINT_STRUCT_END(indent,ty) \ - fprintf (fd, "%s} //[%s]", get_indent (indent), ty) -#define PRINT_VOID(indent) \ - fprintf(fd, "") -#define PRINT_FUNCTION(indent) \ - fprintf(fd, "") -#define PRINT_STRUCT_FIELD_BEGIN(indent,name) \ - fprintf (fd, "%s " #name ": ", get_indent (indent) ) -#define PRINT_STRUCT_FIELD_END(indent) \ - fprintf (fd, ";\n") -#define PRINT_STRUCT_FIELD_END(indent) \ - fprintf (fd, ";\n") - - -#define PRINT_ARRAY_BEGIN(indent) \ - fprintf (fd, "[\n%s", get_indent (indent)) -#define PRINT_ARRAY_SEP(indent) \ - fprintf (fd, ",\n%s", get_indent (indent)) -#define PRINT_ARRAY_END(indent) \ - fprintf (fd, "]") - - - -#define PRINT_UNKNOWN_SELECTOR(indent,ty, tag) \ - fprintf (fd, "%s UNKNOWN %s(%d)\n", get_indent(indent), ty, tag); - - -static void print_size_t (int indent, size_t x) -{ - fprintf (fd, "%ld", x); -} - -static void print_int (int indent, int x) -{ - fprintf (fd, "%d", x); -} - -static void print_char (int indent, char x) -{ - fprintf (fd, "'%c'(%d)", x, x); -} - -static void print_uchar (int indent, unsigned char x) -{ - fprintf (fd, "%d", x); -} - -static void print_uint (int indent, unsigned int x) -{ - fprintf (fd, "%d", x); -} - -static void print_char_ptr (int indent, const char* x) -{ - if (x == NULL){ - PRINT_NULL(indent,ty); - } else { - fprintf (fd, "\"%s\"", x); - } -} - -static void print_uchar_ptr (int indent, const unsigned char* x) -{ - if (x == NULL){ - PRINT_NULL(indent,ty); - } else { - fprintf (fd, "%s", x); - } -} - -static void print_FILE_ptr (int indent, const FILE* x) -{ - if (x == NULL){ - PRINT_NULL(indent,ty); - } else { - fprintf (fd, ""); - } -} - -static void print_int_ptr (int indent, const int* x) -{ - if (x == NULL){ - PRINT_NULL(indent,ty); - } else { - fprintf (fd, ""); - } -} - -static void print_int_array (int indent, int n, int *x) -{ - if (x == NULL){ - PRINT_NULL(indent,ty); - } else { - fprintf (fd, ""); - } -} - -static void print_cb_word_ptr2 (int indent, struct cb_word** x) -{ - if (x == NULL){ - PRINT_NULL(indent,ty); - } else { - fprintf (fd, ""); - } -} - -static void print_cb_field_ptr2 (int indent, struct cb_field** x) -{ - if (x == NULL){ - PRINT_NULL(indent,ty); - } else { - fprintf (fd, ""); - } -} - - -#include "dump_tree_gen.c" - -static void print_struct_cb_tree_common (int indent, int ptr_uid, struct cb_tree_common *ptr){ - - print_enum_cb_tag (indent+2, ptr->tag); - fprintf (fd, "/"); - print_enum_cb_category (indent+2, ptr->category); - fprintf (fd, "@"); - print_char_ptr (indent+2, ptr->source_file); - fprintf (fd, ":"); - print_int (indent+2, ptr->source_line); - - #if 0 - - PRINT_STRUCT_TY("struct cb_tree_common"); - PRINT_STRUCT_BEGIN(indent, ty, ptr_uid); - indent += 2; - - PRINT_STRUCT_FIELD_BEGIN(indent,tag); - - print_enum_cb_tag (indent+2, ptr->tag); - - PRINT_STRUCT_FIELD_END(indent); - - PRINT_STRUCT_FIELD_BEGIN(indent,category); - - print_enum_cb_category (indent+2, ptr->category); - - PRINT_STRUCT_FIELD_END(indent); - - if( ptr->source_file != NULL ){ - - PRINT_STRUCT_FIELD_BEGIN(indent,source_file); - - print_char_ptr (indent+2, ptr->source_file); - - PRINT_STRUCT_FIELD_END(indent); - - } - - if( ptr->source_line != 0 ){ - - PRINT_STRUCT_FIELD_BEGIN(indent,source_line); - - print_int (indent+2, ptr->source_line); - - PRINT_STRUCT_FIELD_END(indent); - - } - - if( ptr->source_column != 0 ){ - - PRINT_STRUCT_FIELD_BEGIN(indent,source_column); - - print_int (indent+2, ptr->source_column); - - PRINT_STRUCT_FIELD_END(indent); - - } - - indent -= 2; - PRINT_STRUCT_END(indent, ty); - - #endif -} - -static void set_ocaml_format(void) -{ - /* OCaml format. Suitable to load inside the OCaml - interpreter for automated processing. - - If you change the format of type in format_header, you should also - modify the format_date variable. - */ - - fmt.format_kind = FORMAT_OCAML; - fmt.format_header = "\n" - "type t =\n" - "| NULL\n" - "| INT of int\n" - "| CHAR of char\n" - "| STRING of string\n" - "| CONSTR of string * t\n" - "| LIST of t list\n" - "| RECORD of ( string * t) list\n" - "| POINTER of int64\n" - "| FLAGS of string list\n" - "let format_date = \"GNUCOBOL-2023-07-15\"\n" - "\n" - "let tree =\n" - ; - - fmt.format_trailer = "\n" - "let () =\n" - " let oc = open_out_bin \"tree.cbb\" in\n" - " output_value oc ( format_date : string );\n" - " output_value oc ( tree : t);\n" - " close_out oc\n" - "\n"; - fmt.format_begin_field = "\""; - fmt.format_end_field = "\", "; - - fmt.format_begin_record = "RECORD ["; - fmt.format_delim_record = ";" ; - fmt.format_last_delim_record = ";"; - fmt.format_end_record = "]"; - - fmt.format_begin_list = "LIST ["; - fmt.format_delim_list = ";"; - fmt.format_last_delim_list = ";"; - fmt.format_end_list = "]"; - - fmt.format_null = "NULL"; - fmt.format_begin_constr = "CONSTR (\""; - fmt.format_delim_constr = "\", "; - fmt.format_end_constr = ")"; - fmt.format_begin_pointer = "POINTER "; - fmt.format_end_pointer = "L"; - fmt.format_begin_char = "CHAR '"; - fmt.format_end_char = "'"; - fmt.format_begin_string = "STRING \""; - fmt.format_end_string = "\""; - fmt.format_begin_int = "INT( "; - fmt.format_end_int = ")"; - - fmt.format_begin_flags = "FLAGS ["; - fmt.format_begin_flag = "\""; - fmt.format_end_flag = "\";"; - fmt.format_end_flags = "]"; -} - -static void set_json_format (void) -{ - /* Default is to use JSON */ - /* Standard JSON format. Tests validated by jsonlint-php. */ - - fmt.format_kind = FORMAT_JSON; - fmt.format_header = ""; - fmt.format_trailer = ""; - - fmt.format_begin_field = "\""; - fmt.format_end_field = "\": "; - - fmt.format_begin_record = "{"; - fmt.format_delim_record = ","; - fmt.format_last_delim_record = ""; - fmt.format_end_record = "}"; - - fmt.format_begin_list = "["; - fmt.format_delim_list = ","; - fmt.format_last_delim_list = ""; - fmt.format_end_list = "]"; - - fmt.format_begin_flags = "["; - fmt.format_begin_flag = "\""; - fmt.format_end_flag = "\","; - fmt.format_end_flags = " NULL]"; - - fmt.format_null = "null"; - fmt.format_begin_constr = "{ \"type_\": \""; - fmt.format_delim_constr = "\", \"value_\": "; - fmt.format_end_constr = " }"; - fmt.format_begin_pointer = "\""; - fmt.format_end_pointer = "\""; - fmt.format_begin_char = "\""; - fmt.format_end_char = "\""; - fmt.format_begin_string = "\""; - fmt.format_end_string = "\""; - fmt.format_begin_int = ""; - fmt.format_end_int = ""; -} - -static -void set_format_by_file_ext (const char* filename) -{ - const char *arg = filename + strlen(filename); - - while ( arg > filename && *arg != '.' ) arg--; - - if (!strcasecmp(arg, ".ml")){ - - set_ocaml_format (); - - cb_dump_tree_with_common = 1; - cb_dump_tree_with_loc = 1; - cb_dump_tree_with_type = 1; - cb_dump_tree_with_pointer = 1; - cb_dump_tree_with_indent = 1; - cb_dump_tree_with_newlines = 1; - - return; - } - - set_json_format (); -} - -static -void set_flags (const char* flags) -{ - int sign = 1; - int i; - int len = strlen(flags); - - for(i=0; i< len; i++){ - switch(flags[i]){ - case '+': sign = 1; break; - case '-': sign = 0; break; - case 'c': - cb_dump_tree_with_common = sign; - break; - case 'l': - cb_dump_tree_with_loc = sign; - if (cb_dump_tree_with_loc){ - cb_dump_tree_with_common = 1; - } - break; - case 't': - cb_dump_tree_with_type = sign; - break; - case 'p': - cb_dump_tree_with_pointer = sign; - break; - case 'i': - cb_dump_tree_with_indent = sign; - if (cb_dump_tree_with_indent) - cb_dump_tree_with_newlines = 1; - break; - case 'n': - cb_dump_tree_with_newlines = sign; - if (!cb_dump_tree_with_newlines) - cb_dump_tree_with_indent = 0; - break; - case 'm': - cb_dump_tree_print_message = sign; - case 'J': - set_json_format (); - break; - case 'O': - set_ocaml_format (); - break; - case 'A': - cb_dump_tree_with_loc = sign; - cb_dump_tree_with_common = sign; - cb_dump_tree_with_type = sign; - cb_dump_tree_with_pointer = sign; - cb_dump_tree_with_indent = 1-sign; - cb_dump_tree_with_newlines = 1-sign; - break; - default: - cobc_err_exit ("--dump-tree-flags: unknown flag '%c', expecting '+-cltpinA'", flags[i]); - } - } -} - -void cb_dump_tree_to_file (struct cb_program *prog, const char *filename, const char* flags) -{ - char *env; - int close_fd = 1; - - set_format_by_file_ext (filename); - env = getenv ("COB_DUMP_TREE_FLAGS"); - if (env) set_flags (env); - if (flags) set_flags (flags); - - if (!strcmp(filename, COB_DASH) || !strcmp(filename, "stdout")){ - close_fd = 0; - fd = stdout; - } else - if (!strcmp(filename, "stderr")){ - close_fd = 0; - fd = stderr; - } else { - int len = strlen (filename); - struct stat st; - if (len > 0 && filename[len-1] == '/'){ - filename = cobc_main_stradd_dup (filename, prog->program_id); - } - if (!stat (filename, &st)) unlink(filename); - fd = fopen (filename, "w"); - } - if (!fd){ - cb_perror (0, "cobc: %s: %s", filename, cb_get_strerror ()); - } - - fprintf (fd, "%s", fmt.format_header); - cb_print_tree ( (cb_tree) prog); - fprintf (fd, "%s", fmt.format_trailer); - - if (close_fd) { - fclose (fd); - if (cb_dump_tree_print_message){ - fprintf (stderr, "File \"%s\" generated\n", filename); - } - } -} diff --git a/cobc/flag.def b/cobc/flag.def index 927d27317..5e1a09333 100644 --- a/cobc/flag.def +++ b/cobc/flag.def @@ -282,12 +282,12 @@ CB_FLAG (cb_diagnostics_absolute_paths, 1, "diagnostics-absolute-paths", CB_FLAG (cb_flag_prof, 1, "prof", _(" -fprof enable profiling of the COBOL program")) -CB_FLAG_NQ (1, "dump-tree", CB_FLAG_DUMP_TREE, - _(" -fdump-tree= dump parsed AST to , format is JSON unless\n" +CB_FLAG_NQ (1, "dump-ast", CB_FLAG_DUMP_AST, + _(" -fdump-ast= dump parsed AST to , format is JSON unless\n" " the file has a .ml extension for OCaml format.")) -CB_FLAG_NQ (1, "dump-tree-flags", CB_FLAG_DUMP_TREE_FLAGS, - _(" -fdump-tree-flags= set flags used when dumping the parsed AST\n" +CB_FLAG_NQ (1, "dump-ast-flags", CB_FLAG_DUMP_AST_FLAGS, + _(" -fdump-ast-flags= set flags used when dumping the parsed AST\n" " '+/-' to enable/disable, 'l' for locations,\n" " 't' for types, 'p' for pointers, 'i' for indent.")) diff --git a/cobc/parser.y b/cobc/parser.y index 44371fb42..6293848c0 100644 --- a/cobc/parser.y +++ b/cobc/parser.y @@ -12958,7 +12958,7 @@ cancel_body: { const char *all_name = "CANCEL ALL"; struct cb_literal *all = build_literal (CB_CATEGORY_ALPHANUMERIC, all_name, strlen (all_name)); - cb_emit_cancel (all); + cb_emit_cancel (CB_TREE(all)); } ;