[m-rev.] diff: mercury_trace_internal.c cleanup
Zoltan Somogyi
zs at cs.mu.OZ.AU
Mon Jun 9 12:47:55 AEST 2003
trace/mercury_trace_internal.c:
Clean up formatting.
Zoltan.
cvs diff: Diffing .
cvs diff: Diffing analysis
cvs diff: Diffing bindist
cvs diff: Diffing boehm_gc
cvs diff: Diffing boehm_gc/Mac_files
cvs diff: Diffing boehm_gc/cord
cvs diff: Diffing boehm_gc/cord/private
cvs diff: Diffing boehm_gc/doc
cvs diff: Diffing boehm_gc/include
cvs diff: Diffing boehm_gc/include/private
cvs diff: Diffing boehm_gc/tests
cvs diff: Diffing browser
cvs diff: Diffing bytecode
cvs diff: Diffing compiler
cvs diff: Diffing compiler/notes
cvs diff: Diffing debian
cvs diff: Diffing deep_profiler
cvs diff: Diffing deep_profiler/notes
cvs diff: Diffing doc
cvs diff: Diffing extras
cvs diff: Diffing extras/aditi
cvs diff: Diffing extras/cgi
cvs diff: Diffing extras/complex_numbers
cvs diff: Diffing extras/complex_numbers/samples
cvs diff: Diffing extras/complex_numbers/tests
cvs diff: Diffing extras/concurrency
cvs diff: Diffing extras/curs
cvs diff: Diffing extras/curs/samples
cvs diff: Diffing extras/curses
cvs diff: Diffing extras/curses/sample
cvs diff: Diffing extras/dynamic_linking
cvs diff: Diffing extras/error
cvs diff: Diffing extras/graphics
cvs diff: Diffing extras/graphics/mercury_opengl
cvs diff: Diffing extras/graphics/mercury_tcltk
cvs diff: Diffing extras/graphics/samples
cvs diff: Diffing extras/graphics/samples/calc
cvs diff: Diffing extras/graphics/samples/maze
cvs diff: Diffing extras/graphics/samples/pent
cvs diff: Diffing extras/lazy_evaluation
cvs diff: Diffing extras/lex
cvs diff: Diffing extras/lex/samples
cvs diff: Diffing extras/lex/tests
cvs diff: Diffing extras/logged_output
cvs diff: Diffing extras/moose
cvs diff: Diffing extras/moose/samples
cvs diff: Diffing extras/morphine
cvs diff: Diffing extras/morphine/non-regression-tests
cvs diff: Diffing extras/morphine/scripts
cvs diff: Diffing extras/morphine/source
cvs diff: Diffing extras/odbc
cvs diff: Diffing extras/posix
cvs diff: Diffing extras/quickcheck
cvs diff: Diffing extras/quickcheck/tutes
cvs diff: Diffing extras/references
cvs diff: Diffing extras/references/samples
cvs diff: Diffing extras/references/tests
cvs diff: Diffing extras/stream
cvs diff: Diffing extras/trailed_update
cvs diff: Diffing extras/trailed_update/samples
cvs diff: Diffing extras/trailed_update/tests
cvs diff: Diffing extras/xml
cvs diff: Diffing extras/xml/samples
cvs diff: Diffing java
cvs diff: Diffing java/library
cvs diff: Diffing java/runtime
cvs diff: Diffing library
cvs diff: Diffing profiler
cvs diff: Diffing robdd
cvs diff: Diffing runtime
cvs diff: Diffing runtime/GETOPT
cvs diff: Diffing runtime/machdeps
cvs diff: Diffing samples
cvs diff: Diffing samples/c_interface
cvs diff: Diffing samples/c_interface/c_calls_mercury
cvs diff: Diffing samples/c_interface/cplusplus_calls_mercury
cvs diff: Diffing samples/c_interface/mercury_calls_c
cvs diff: Diffing samples/c_interface/mercury_calls_cplusplus
cvs diff: Diffing samples/c_interface/mercury_calls_fortran
cvs diff: Diffing samples/c_interface/simpler_c_calls_mercury
cvs diff: Diffing samples/c_interface/simpler_cplusplus_calls_mercury
cvs diff: Diffing samples/diff
cvs diff: Diffing samples/muz
cvs diff: Diffing samples/rot13
cvs diff: Diffing samples/solutions
cvs diff: Diffing samples/tests
cvs diff: Diffing samples/tests/c_interface
cvs diff: Diffing samples/tests/c_interface/c_calls_mercury
cvs diff: Diffing samples/tests/c_interface/cplusplus_calls_mercury
cvs diff: Diffing samples/tests/c_interface/mercury_calls_c
cvs diff: Diffing samples/tests/c_interface/mercury_calls_cplusplus
cvs diff: Diffing samples/tests/c_interface/mercury_calls_fortran
cvs diff: Diffing samples/tests/c_interface/simpler_c_calls_mercury
cvs diff: Diffing samples/tests/c_interface/simpler_cplusplus_calls_mercury
cvs diff: Diffing samples/tests/diff
cvs diff: Diffing samples/tests/muz
cvs diff: Diffing samples/tests/rot13
cvs diff: Diffing samples/tests/solutions
cvs diff: Diffing samples/tests/toplevel
cvs diff: Diffing scripts
cvs diff: Diffing tests
cvs diff: Diffing tests/benchmarks
cvs diff: Diffing tests/debugger
cvs diff: Diffing tests/debugger/declarative
cvs diff: Diffing tests/dppd
cvs diff: Diffing tests/general
cvs diff: Diffing tests/general/accumulator
cvs diff: Diffing tests/general/string_format
cvs diff: Diffing tests/general/structure_reuse
cvs diff: Diffing tests/grade_subdirs
cvs diff: Diffing tests/hard_coded
cvs diff: Diffing tests/hard_coded/exceptions
cvs diff: Diffing tests/hard_coded/purity
cvs diff: Diffing tests/hard_coded/sub-modules
cvs diff: Diffing tests/hard_coded/typeclasses
cvs diff: Diffing tests/invalid
cvs diff: Diffing tests/invalid/purity
cvs diff: Diffing tests/misc_tests
cvs diff: Diffing tests/mmc_make
cvs diff: Diffing tests/mmc_make/lib
cvs diff: Diffing tests/recompilation
cvs diff: Diffing tests/tabling
cvs diff: Diffing tests/term
cvs diff: Diffing tests/valid
cvs diff: Diffing tests/warnings
cvs diff: Diffing tools
cvs diff: Diffing trace
Index: trace/mercury_trace_internal.c
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/trace/mercury_trace_internal.c,v
retrieving revision 1.156
diff -u -b -r1.156 mercury_trace_internal.c
--- trace/mercury_trace_internal.c 16 Apr 2003 12:38:10 -0000 1.156
+++ trace/mercury_trace_internal.c 7 Jun 2003 16:52:47 -0000
@@ -2072,18 +2072,16 @@
MR_Word pretty_format;
if (! MR_trace_options_param_set(&print_set, &browse_set,
- &print_all_set, &flat_format,
- &raw_pretty_format, &verbose_format,
- &pretty_format, &words, &word_count, "browsing",
- "set"))
+ &print_all_set, &flat_format, &raw_pretty_format,
+ &verbose_format, &pretty_format, &words, &word_count,
+ "browsing", "set"))
{
; /* the usage message has already been printed */
}
else if (word_count != 3 ||
- ! MR_trace_set_browser_param(print_set,
- browse_set, print_all_set, flat_format,
- raw_pretty_format, verbose_format,
- pretty_format, words[1], words[2]))
+ ! MR_trace_set_browser_param(print_set, browse_set,
+ print_all_set, flat_format, raw_pretty_format,
+ verbose_format, pretty_format, words[1], words[2]))
{
MR_trace_usage("browsing", "set");
}
@@ -2106,10 +2104,9 @@
MR_bool close_window = MR_FALSE;
const char *msg;
- if (! MR_trace_options_view(&window_cmd, &server_cmd,
- &server_name, &timeout, &force, &verbose,
- &split, &close_window, &words, &word_count,
- "browsing", "view"))
+ if (! MR_trace_options_view(&window_cmd, &server_cmd, &server_name,
+ &timeout, &force, &verbose, &split, &close_window,
+ &words, &word_count, "browsing", "view"))
{
; /* the usage message has already been printed */
} else if (word_count != 1) {
@@ -2211,8 +2208,7 @@
layout->MR_sll_entry, layout,
&problem);
MR_maybe_print_spy_point(slot, problem);
- } else if (word_count == 2 && MR_parse_proc_spec(words[1], &spec))
- {
+ } else if (word_count == 2 && MR_parse_proc_spec(words[1], &spec)) {
MR_Matches_Info matches;
int slot;
@@ -2410,6 +2406,7 @@
MR_Code **jumpaddr)
{
int n;
+
if (word_count == 2 && MR_trace_is_natural_number(words[1], &n)) {
if (0 <= n && n < MR_spy_point_next
&& MR_spy_points[n]->spy_exists)
@@ -6147,60 +6144,61 @@
}
static const char *const MR_trace_movement_cmd_args[] =
- {"-N", "-S", "-a", "-n", "-s",
- "--none", "--some", "--all", "--strict", "--no-strict", NULL};
+ { "-N", "-S", "-a", "-i", "-n", "-s",
+ "--none", "--some", "--all", "--integrity",
+ "--strict", "--no-strict", NULL };
/*
** "retry --assume-all-io-is-tabled" is deliberately not documented as
** it is for developers only.
*/
static const char *const MR_trace_retry_cmd_args[] =
- {"--force", "--interactive", "--only-if-safe", NULL};
+ { "--force", "--interactive", "--only-if-safe", NULL };
static const char *const MR_trace_print_cmd_args[] =
- {"-f", "-p", "-v", "--flat", "--pretty", "--verbose",
- "exception", "goal", "*", NULL};
+ { "-f", "-p", "-v", "--flat", "--pretty", "--verbose",
+ "exception", "goal", "*", NULL };
- /*
- ** It's better to have a single completion where possible,
- ** so don't include `-d' here.
- */
+/*
+** It's better to have a single completion where possible,
+** so don't include `-d' here.
+*/
static const char *const MR_trace_stack_cmd_args[] =
- {"--detailed", NULL};
+ { "--detailed", NULL };
static const char *const MR_trace_set_cmd_args[] =
- {"-A", "-B", "-P", "-f", "-p", "-v",
+ { "-A", "-B", "-P", "-f", "-p", "-v",
"--print-all", "--print", "--browse",
"--flat", "--pretty", "--verbose",
"format", "depth", "size", "width", "lines",
- "flat", "pretty", "verbose", NULL};
+ "flat", "pretty", "verbose", NULL };
static const char *const MR_trace_view_cmd_args[] =
- {"-c", "-f", "-n", "-s", "-t", "-v", "-w", "-2",
+ { "-c", "-f", "-n", "-s", "-t", "-v", "-w", "-2",
"--close", "--verbose", "--force", "--split-screen",
"--window-command", "--server-command", "--server-name",
- "--timeout", NULL};
+ "--timeout", NULL };
static const char *const MR_trace_break_cmd_args[] =
- {"-A", "-E", "-I", "-O", "-P", "-S", "-a", "-e", "-i",
+ { "-A", "-E", "-I", "-O", "-P", "-S", "-a", "-e", "-i",
"--all", "--entry", "--ignore-entry", "--ignore-interface",
"--interface", "--print", "--select-all", "--select-one",
- "--stop", "here", "info", NULL};
+ "--stop", "here", "info", NULL };
static const char *const MR_trace_ignore_cmd_args[] =
- {"-E", "-I", "--ignore-entry", "--ignore-interface", NULL};
+ { "-E", "-I", "--ignore-entry", "--ignore-interface", NULL };
static const char *const MR_trace_printlevel_cmd_args[] =
- {"none", "some", "all", NULL};
+ { "none", "some", "all", NULL };
static const char *const MR_trace_on_off_args[] =
- {"on", "off", NULL};
+ { "on", "off", NULL };
static const char *const MR_trace_context_cmd_args[] =
- {"none", "before", "after", "prevline", "nextline", NULL};
+ { "none", "before", "after", "prevline", "nextline", NULL };
static const char *const MR_trace_scope_cmd_args[] =
- {"all", "interface", "entry", NULL};
+ { "all", "interface", "entry", NULL };
/*
** "table_io allow" is deliberately not documented as it is developer only
@@ -6208,17 +6206,17 @@
** effort to encourage consistent use of start/stop.
*/
static const char *const MR_trace_table_io_cmd_args[] =
- {"stats", "start", "stop", NULL};
+ { "stats", "start", "stop", NULL };
- /*
- ** It's better to have a single completion where possible,
- ** so don't include `-i' here.
- */
+/*
+** It's better to have a single completion where possible,
+** so don't include `-i' here.
+*/
static const char *const MR_trace_source_cmd_args[] =
- {"--ignore-errors", NULL};
+ { "--ignore-errors", NULL };
static const char *const MR_trace_quit_cmd_args[] =
- {"-y", NULL};
+ { "-y", NULL };
static const MR_Trace_Command_Info MR_trace_command_infos[] =
{
@@ -6332,9 +6330,9 @@
{ "misc", "save", MR_trace_cmd_save,
NULL, MR_trace_filename_completer },
{ "misc", "dd", MR_trace_cmd_dd,
- NULL, MR_trace_null_completer},
+ NULL, MR_trace_null_completer },
{ "misc", "quit", MR_trace_cmd_quit,
- MR_trace_quit_cmd_args, NULL},
+ MR_trace_quit_cmd_args, NULL },
{ "exp", "histogram_all", MR_trace_cmd_histogram_all,
NULL, MR_trace_filename_completer },
@@ -6372,7 +6370,7 @@
{ "developer", "unhide_events", MR_trace_cmd_unhide_events,
MR_trace_on_off_args, MR_trace_null_completer },
{ "developer", "dd_dd", MR_trace_cmd_dd_dd,
- NULL, MR_trace_filename_completer},
+ NULL, MR_trace_filename_completer },
{ "developer", "table", MR_trace_cmd_table,
NULL, MR_trace_null_completer },
cvs diff: Diffing util
cvs diff: Diffing vim
cvs diff: Diffing vim/after
cvs diff: Diffing vim/ftplugin
cvs diff: Diffing vim/syntax
--------------------------------------------------------------------------
mercury-reviews mailing list
post: mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------
More information about the reviews
mailing list