* source.c: Make global variables current_source_symtab and

        current_source_line static.
        (list_command): Moved to cli/cli-cmds.c.
        (ambiguous_line_spec): Moved to cli/cli-cmds.c.
        (get_first_line_listed): New accessor function.
        (get_lines_to_list): New accessor function.
        (get_current_source_symtab_and_line): New function. Retrieves the
        position in the source code that we consider current.
        (get_current_or_default_source_symtab_and_line): New function.
        Like the above but attempts to determine a default position if one
        is not currently defined.
        (set_current_source_symtab_and_line): New function. Sets the source
        code position considered current and returns the previously set one.
        (clear_current_source_symtab_and_line): Reset stored information about
        a current source line.
        (_initialize_source): Remove registration for the "list" command and
        its alias.
        * source.h: Add declarations for the new functions above.
        * symtab.h: Remove declarations for the global variables mentioned
        above.
        * breakpoint.c (parse_breakpoint_sals): Use accessor functions to
        obtain current source line.
        * linespec.c (decode_line_1): Ditto.
        * macroscope.c (default_macro_scope): Ditto.
        * scm-lang.c (scm_unpac): Ditto.
        * stack.c (print_frame_info_base): Ditto.
        * symfile.c (clear_symtab_users): Ditto.
        * symtab.c (decode_line_spec): Ditto.
        * cli/cli-cmds.c (list_command): Moved here from source.c.
        (ambiguous_line_spec): Moved here from source.c.
        (_init_cli_cmds): Add definition for "list" and its alias.
        * Makefile.in: Update dependencies.

1 files changed, 32 insertions, 0 deletions

diff --git a/gdb/source.h b/gdb/source.h
index 8dbf851..84cd0ff 100644
--- a/gdb/source.h
+++ b/gdb/source.h
@@ -31,4 +31,36 @@ extern int open_source_file (struct symtab *s);
    lines.  */
 extern void find_source_lines (struct symtab *s, int desc);
 
+/* Return the first line listed by print_source_lines.
+   Used by command interpreters to request listing from
+   a previous point. */
+extern int get_first_line_listed (void);
+
+/* Return the default number of lines to print with commands like the
+   cli "list".  The caller of print_source_lines must use this to
+   calculate the end line and use it in the call to print_source_lines
+   as it does not automatically use this value. */
+extern int get_lines_to_list (void);
+
+/* Return the current source file for listing and next line to list.
+   NOTE: The returned sal pc and end fields are not valid. */
+extern void clear_current_source_symtab_and_line (void);
+
+/* Return the current source file for listing and next line to list.
+   If a file is not set, try and get a default.
+   It may err out if a default cannot be determined.
+   Depending on where it is called, it can recurse as the process of
+   determining a new default may call the caler!
+   Use get_current_source_symtab_and_line instead to get whatever
+   we have without erroring out or trying to get a default.
+   NOTE: The returned sal pc and end fields are not valid. */
+extern struct symtab_and_line get_current_source_symtab_and_line (void);
+
+/* Return the current default file for listing and next line to list
+   (the returned sal pc and end fields are not valid.)
+   and set the surrent default to whatever is in SAL */
+extern struct symtab_and_line get_current_or_default_source_symtab_and_line (void);
+
+/* Reset any information stored about a default file and line to print. */
+extern struct symtab_and_line set_current_source_symtab_and_line (struct symtab_and_line *);
 #endif