-Wwrite-strings: The Rest

[deliverable/binutils-gdb.git] / gdb / language.h

diff --git a/gdb/language.h b/gdb/language.h
index 9306a82a2041c5a7e2235eafb88a31f8469904b8..58bcbe8faec0f948000c7f4698a487d20b6f546c 100644 (file)
--- a/gdb/language.h
+++ b/gdb/language.h
@@ -1,7 +1,6 @@
 /* Source-language-related definitions for GDB.
 
 /* Source-language-related definitions for GDB.
 

-   Copyright (C) 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2000, 2003, 2004,
-   2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1991-2017 Free Software Foundation, Inc.

 
    Contributed by the Department of Computer Science at the State University
    of New York at Buffalo.
 
    Contributed by the Department of Computer Science at the State University
    of New York at Buffalo.


@@ -24,15 +23,22 @@
 #if !defined (LANGUAGE_H)
 #define LANGUAGE_H 1
 
 #if !defined (LANGUAGE_H)
 #define LANGUAGE_H 1
 

-/* Forward decls for prototypes */
+#include "symtab.h"
+#include "common/function-view.h"
+
+/* Forward decls for prototypes.  */

 struct value;
 struct objfile;
 struct frame_info;
 struct expression;
 struct ui_file;
 struct value_print_options;
 struct value;
 struct objfile;
 struct frame_info;
 struct expression;
 struct ui_file;
 struct value_print_options;

+struct type_print_options;
+struct lang_varobj_ops;
+struct parser_state;
+struct compile_instance;

 
 

-#define MAX_FORTRAN_DIMS  7    /* Maximum number of F77 array dims */
+#define MAX_FORTRAN_DIMS  7    /* Maximum number of F77 array dims.  */

 
 /* range_mode ==
    range_mode_auto:   range_check set automatically to default of language.
 
 /* range_mode ==
    range_mode_auto:   range_check set automatically to default of language.


@@ -55,29 +61,8 @@ extern enum range_check
   }
 range_check;
 
   }
 range_check;
 

-/* type_mode ==
-   type_mode_auto:   type_check set automatically to default of language
-   type_mode_manual: type_check set manually by user. */
-
-extern enum type_mode
-  {
-    type_mode_auto, type_mode_manual
-  }
-type_mode;
-
-/* type_check ==
-   type_check_on:    Types are checked in GDB expressions, producing errors.
-   type_check_warn:  Types are checked, producing warnings.
-   type_check_off:   Types are not checked in GDB expressions.  */
-
-extern enum type_check
-  {
-    type_check_off, type_check_warn, type_check_on
-  }
-type_check;
-

 /* case_mode ==
 /* case_mode ==

-   case_mode_auto:   case_sensitivity set upon selection of scope 
+   case_mode_auto:   case_sensitivity set upon selection of scope.

    case_mode_manual: case_sensitivity set only by user.  */
 
 extern enum case_mode
    case_mode_manual: case_sensitivity set only by user.  */
 
 extern enum case_mode


@@ -87,8 +72,8 @@ extern enum case_mode
 case_mode;
 
 /* array_ordering ==
 case_mode;
 
 /* array_ordering ==

-   array_row_major:     Arrays are in row major order
-   array_column_major:  Arrays are in column major order.*/
+   array_row_major:     Arrays are in row major order.
+   array_column_major:  Arrays are in column major order.  */

 
 extern enum array_ordering
   {
 
 extern enum array_ordering
   {


@@ -98,8 +83,8 @@ array_ordering;
 
 
 /* case_sensitivity ==
 
 
 /* case_sensitivity ==

-   case_sensitive_on:   Case sensitivity in name matching is used
-   case_sensitive_off:  Case sensitivity in name matching is not used  */
+   case_sensitive_on:   Case sensitivity in name matching is used.
+   case_sensitive_off:  Case sensitivity in name matching is not used.  */

 
 extern enum case_sensitivity
   {
 
 extern enum case_sensitivity
   {


@@ -109,8 +94,8 @@ case_sensitivity;
 
 
 /* macro_expansion ==
 
 
 /* macro_expansion ==

-   macro_expansion_no:  No macro expansion is available
-   macro_expansion_c:   C-like macro expansion is available  */
+   macro_expansion_no:  No macro expansion is available.
+   macro_expansion_c:   C-like macro expansion is available.  */

 
 enum macro_expansion
   {
 
 enum macro_expansion
   {


@@ -127,7 +112,12 @@ struct language_arch_info
      expressions, regardless of whether the program being debugged
      actually defines such a type.  */
   struct type **primitive_type_vector;
      expressions, regardless of whether the program being debugged
      actually defines such a type.  */
   struct type **primitive_type_vector;

-  /* Type of elements of strings. */
+
+  /* Symbol wrappers around primitive_type_vector, so that the symbol lookup
+     machinery can return them.  */
+  struct symbol **primitive_type_symbols;
+
+  /* Type of elements of strings.  */

   struct type *string_char_type;
 
   /* Symbol name of type to use as boolean type, if defined.  */
   struct type *string_char_type;
 
   /* Symbol name of type to use as boolean type, if defined.  */


@@ -136,47 +126,64 @@ struct language_arch_info
   struct type *bool_type_default;
 };
 
   struct type *bool_type_default;
 };
 

+/* A pointer to a function expected to return nonzero if
+   SYMBOL_SEARCH_NAME matches the given LOOKUP_NAME.
+
+   SYMBOL_SEARCH_NAME should be a symbol's "search" name.
+   LOOKUP_NAME should be the name of an entity after it has been
+   transformed for lookup.  */
+
+typedef int (*symbol_name_cmp_ftype) (const char *symbol_search_name,
+                                         const char *lookup_name);
+

 /* Structure tying together assorted information about a language.  */
 
 struct language_defn
   {
 /* Structure tying together assorted information about a language.  */
 
 struct language_defn
   {

-    /* Name of the language */
+    /* Name of the language.  */

 
 

-    char *la_name;
+    const char *la_name;

 
 

-    /* its symtab language-enum (defs.h) */
+    /* Natural or official name of the language.  */

 
 

-    enum language la_language;
+    const char *la_natural_name;

 
 

-    /* Default range checking */
+    /* its symtab language-enum (defs.h).  */

 
 

-    enum range_check la_range_check;
+    enum language la_language;

 
 

-    /* Default type checking */
+    /* Default range checking.  */

 
 

-    enum type_check la_type_check;
+    enum range_check la_range_check;

 
 

-    /* Default case sensitivity */
+    /* Default case sensitivity.  */

     enum case_sensitivity la_case_sensitivity;
 
     enum case_sensitivity la_case_sensitivity;
 

-    /* Multi-dimensional array ordering */
+    /* Multi-dimensional array ordering.  */

     enum array_ordering la_array_ordering;
 
     /* Style of macro expansion, if any, supported by this language.  */
     enum macro_expansion la_macro_expansion;
 
     enum array_ordering la_array_ordering;
 
     /* Style of macro expansion, if any, supported by this language.  */
     enum macro_expansion la_macro_expansion;
 

+    /* A NULL-terminated array of file extensions for this language.
+       The extension must include the ".", like ".c".  If this
+       language doesn't need to provide any filename extensions, this
+       may be NULL.  */
+
+    const char *const *la_filename_extensions;
+

     /* Definitions related to expression printing, prefixifying, and
     /* Definitions related to expression printing, prefixifying, and

-       dumping */
+       dumping.  */

 
     const struct exp_descriptor *la_exp_desc;
 
 
     const struct exp_descriptor *la_exp_desc;
 

-    /* Parser function. */
+    /* Parser function.  */

 
 

-    int (*la_parser) (void);
+    int (*la_parser) (struct parser_state *);

 
 

-    /* Parser error function */
+    /* Parser error function.  */

 
 

-    void (*la_error) (char *);
+    void (*la_error) (const char *);

 
     /* Given an expression *EXPP created by prefixifying the result of
        la_parser, perform any remaining processing necessary to complete
 
     /* Given an expression *EXPP created by prefixifying the result of
        la_parser, perform any remaining processing necessary to complete


@@ -186,7 +193,8 @@ struct language_defn
 
     void (*la_post_parser) (struct expression ** expp, int void_context_p);
 
 
     void (*la_post_parser) (struct expression ** expp, int void_context_p);
 

-    void (*la_printchar) (int ch, struct type *chtype, struct ui_file * stream);
+    void (*la_printchar) (int ch, struct type *chtype,
+                         struct ui_file * stream);

 
     void (*la_printstr) (struct ui_file * stream, struct type *elttype,
                         const gdb_byte *string, unsigned int length,
 
     void (*la_printstr) (struct ui_file * stream, struct type *elttype,
                         const gdb_byte *string, unsigned int length,


@@ -196,10 +204,10 @@ struct language_defn
     void (*la_emitchar) (int ch, struct type *chtype,
                         struct ui_file * stream, int quoter);
 
     void (*la_emitchar) (int ch, struct type *chtype,
                         struct ui_file * stream, int quoter);
 

-    /* Print a type using syntax appropriate for this language. */
+    /* Print a type using syntax appropriate for this language.  */

 
 

-    void (*la_print_type) (struct type *, char *, struct ui_file *, int,
-                          int);
+    void (*la_print_type) (struct type *, const char *, struct ui_file *, int,
+                          int, const struct type_print_options *);

 
     /* Print a typedef using syntax appropriate for this language.
        TYPE is the underlying type.  NEW_SYMBOL is the symbol naming
 
     /* Print a typedef using syntax appropriate for this language.
        TYPE is the underlying type.  NEW_SYMBOL is the symbol naming


@@ -212,9 +220,6 @@ struct language_defn
        
        TYPE is the type of the sub-object to be printed.
 
        
        TYPE is the type of the sub-object to be printed.
 

-       CONTENTS holds the bits of the value.  This holds the entire
-       enclosing object.
-

        EMBEDDED_OFFSET is the offset into the outermost object of the
        sub-object represented by TYPE.  This is the object which this
        call should print.  Note that the enclosing type is not
        EMBEDDED_OFFSET is the offset into the outermost object of the
        sub-object represented by TYPE.  This is the object which this
        call should print.  Note that the enclosing type is not


@@ -229,16 +234,31 @@ struct language_defn
        OPTIONS are the formatting options to be used when
        printing.  */
 
        OPTIONS are the formatting options to be used when
        printing.  */
 

-    int (*la_val_print) (struct type *type,
-                        const gdb_byte *contents,
-                        int embedded_offset, CORE_ADDR address,
-                        struct ui_file *stream, int recurse,
-                        const struct value_print_options *options);
+    void (*la_val_print) (struct type *type,
+                         int embedded_offset, CORE_ADDR address,
+                         struct ui_file *stream, int recurse,
+                         struct value *val,
+                         const struct value_print_options *options);
+
+    /* Print a top-level value using syntax appropriate for this language.  */
+
+    void (*la_value_print) (struct value *, struct ui_file *,
+                           const struct value_print_options *);
+
+    /* Given a symbol VAR, the corresponding block VAR_BLOCK (if any) and a
+       stack frame id FRAME, read the value of the variable and return (pointer
+       to a) struct value containing the value.

 
 

-    /* Print a top-level value using syntax appropriate for this language. */
+       VAR_BLOCK is needed if there's a possibility for VAR to be outside
+       FRAME.  This is what happens if FRAME correspond to a nested function
+       and VAR is defined in the outer function.  If callers know that VAR is
+       located in FRAME or is global/static, NULL can be passed as VAR_BLOCK.

 
 

-    int (*la_value_print) (struct value *, struct ui_file *,
-                          const struct value_print_options *);
+       Throw an error if the variable cannot be found.  */
+
+    struct value *(*la_read_var_value) (struct symbol *var,
+                                       const struct block *var_block,
+                                       struct frame_info *frame);

 
     /* PC is possibly an unknown languages trampoline.
        If that PC falls in a trampoline belonging to this language,
 
     /* PC is possibly an unknown languages trampoline.
        If that PC falls in a trampoline belonging to this language,


@@ -251,15 +271,17 @@ struct language_defn
     /* If this is non-NULL, specifies the name that of the implicit
        local variable that refers to the current object instance.  */
 
     /* If this is non-NULL, specifies the name that of the implicit
        local variable that refers to the current object instance.  */
 

-    char *la_name_of_this;
+    const char *la_name_of_this;

 
     /* This is a function that lookup_symbol will call when it gets to
        the part of symbol lookup where C looks up static and global
        variables.  */
 
 
     /* This is a function that lookup_symbol will call when it gets to
        the part of symbol lookup where C looks up static and global
        variables.  */
 

-    struct symbol *(*la_lookup_symbol_nonlocal) (const char *,
-                                                const struct block *,
-                                                const domain_enum);
+    struct block_symbol (*la_lookup_symbol_nonlocal)
+      (const struct language_defn *,
+       const char *,
+       const struct block *,
+       const domain_enum);

 
     /* Find the definition of the type with the given name.  */
     struct type *(*la_lookup_transparent_type) (const char *);
 
     /* Find the definition of the type with the given name.  */
     struct type *(*la_lookup_transparent_type) (const char *);


@@ -267,28 +289,48 @@ struct language_defn
     /* Return demangled language symbol, or NULL.  */
     char *(*la_demangle) (const char *mangled, int options);
 
     /* Return demangled language symbol, or NULL.  */
     char *(*la_demangle) (const char *mangled, int options);
 

+    /* Demangle a symbol according to this language's rules.  Unlike
+       la_demangle, this does not take any options.
+
+       *DEMANGLED will be set by this function.
+       
+       If this function returns 0, then *DEMANGLED must always be set
+       to NULL.
+
+       If this function returns 1, the implementation may set this to
+       a xmalloc'd string holding the demangled form.  However, it is
+       not required to.  The string, if any, is owned by the caller.
+
+       The resulting string should be of the form that will be
+       installed into a symbol.  */
+    int (*la_sniff_from_mangled_name) (const char *mangled, char **demangled);
+

     /* Return class name of a mangled method name or NULL.  */
     char *(*la_class_name_from_physname) (const char *physname);
 
     /* Return class name of a mangled method name or NULL.  */
     char *(*la_class_name_from_physname) (const char *physname);
 

-    /* Table for printing expressions */
+    /* Table for printing expressions.  */

 
     const struct op_print *la_op_print_tab;
 
     /* Zero if the language has first-class arrays.  True if there are no
 
     const struct op_print *la_op_print_tab;
 
     /* Zero if the language has first-class arrays.  True if there are no

-       array values, and array objects decay to pointers, as in C. */
+       array values, and array objects decay to pointers, as in C.  */

 
     char c_style_arrays;
 
 
     char c_style_arrays;
 

-    /* Index to use for extracting the first element of a string. */
+    /* Index to use for extracting the first element of a string.  */

     char string_lower_bound;
 
     /* The list of characters forming word boundaries.  */
     char string_lower_bound;
 
     /* The list of characters forming word boundaries.  */

-    char *(*la_word_break_characters) (void);
+    const char *(*la_word_break_characters) (void);

 
 

-    /* Should return a NULL terminated array of all symbols which
-       are possible completions for TEXT.  WORD is the entire command
-       on which the completion is being made.  */
-    char **(*la_make_symbol_completion_list) (char *text, char *word);
+    /* Should return a vector of all symbols which are possible
+       completions for TEXT.  WORD is the entire command on which the
+       completion is being made.  If CODE is TYPE_CODE_UNDEF, then all
+       symbols should be examined; otherwise, only STRUCT_DOMAIN
+       symbols whose type has a code of CODE should be matched.  */
+    VEC (char_ptr) *(*la_make_symbol_completion_list) (const char *text,
+                                                      const char *word,
+                                                      enum type_code code);

 
     /* The per-architecture (OS/ABI) language information.  */
     void (*la_language_arch_info) (struct gdbarch *,
 
     /* The per-architecture (OS/ABI) language information.  */
     void (*la_language_arch_info) (struct gdbarch *,


@@ -316,8 +358,66 @@ struct language_defn
     void (*la_get_string) (struct value *value, gdb_byte **buffer, int *length,
                           struct type **chartype, const char **charset);
 
     void (*la_get_string) (struct value *value, gdb_byte **buffer, int *length,
                           struct type **chartype, const char **charset);
 

-    /* Add fields above this point, so the magic number is always last. */
-    /* Magic number for compat checking */
+    /* Return a pointer to the function that should be used to match
+       a symbol name against LOOKUP_NAME. This is mostly for languages
+       such as Ada where the matching algorithm depends on LOOKUP_NAME.
+
+       This field may be NULL, in which case strcmp_iw will be used
+       to perform the matching.  */
+    symbol_name_cmp_ftype (*la_get_symbol_name_cmp) (const char *lookup_name);
+
+    /* Find all symbols in the current program space matching NAME in
+       DOMAIN, according to this language's rules.
+
+       The search is done in BLOCK only.
+       The caller is responsible for iterating up through superblocks
+       if desired.
+
+       For each one, call CALLBACK with the symbol.  If CALLBACK
+       returns false, the iteration ends at that point.
+
+       This field may not be NULL.  If the language does not need any
+       special processing here, 'iterate_over_symbols' should be
+       used as the definition.  */
+    void (*la_iterate_over_symbols)
+      (const struct block *block, const char *name, domain_enum domain,
+       gdb::function_view<symbol_found_callback_ftype> callback);
+
+    /* Various operations on varobj.  */
+    const struct lang_varobj_ops *la_varobj_ops;
+
+    /* If this language allows compilation from the gdb command line,
+       this method should be non-NULL.  When called it should return
+       an instance of struct gcc_context appropriate to the language.
+       When defined this method must never return NULL; instead it
+       should throw an exception on failure.  The returned compiler
+       instance is owned by its caller and must be deallocated by
+       calling its 'destroy' method.  */
+
+    struct compile_instance *(*la_get_compile_instance) (void);
+
+    /* This method must be defined if 'la_get_gcc_context' is defined.
+       If 'la_get_gcc_context' is not defined, then this method is
+       ignored.
+
+       This takes the user-supplied text and returns a new bit of code
+       to compile.
+
+       INST is the compiler instance being used.
+       INPUT is the user's input text.
+       GDBARCH is the architecture to use.
+       EXPR_BLOCK is the block in which the expression is being
+       parsed.
+       EXPR_PC is the PC at which the expression is being parsed.  */
+
+    std::string (*la_compute_program) (struct compile_instance *inst,
+                                      const char *input,
+                                      struct gdbarch *gdbarch,
+                                      const struct block *expr_block,
+                                      CORE_ADDR expr_pc);
+
+    /* Add fields above this point, so the magic number is always last.  */
+    /* Magic number for compat checking.  */

 
     long la_magic;
 
 
     long la_magic;
 


@@ -365,22 +465,30 @@ struct type *language_bool_type (const struct language_defn *l,
 struct type *language_string_char_type (const struct language_defn *l,
                                        struct gdbarch *gdbarch);
 
 struct type *language_string_char_type (const struct language_defn *l,
                                        struct gdbarch *gdbarch);
 

-struct type *language_lookup_primitive_type_by_name (const struct language_defn *l,
-                                                    struct gdbarch *gdbarch,
-                                                    const char *name);
+/* Look up type NAME in language L, and return its definition for architecture
+   GDBARCH.  Returns NULL if not found.  */
+
+struct type *language_lookup_primitive_type (const struct language_defn *l,
+                                            struct gdbarch *gdbarch,
+                                            const char *name);
+
+/* Wrapper around language_lookup_primitive_type to return the
+   corresponding symbol.  */
+
+struct symbol *
+  language_lookup_primitive_type_as_symbol (const struct language_defn *l,
+                                           struct gdbarch *gdbarch,
+                                           const char *name);

 
 \f
 /* These macros define the behaviour of the expression 
    evaluator.  */
 
 
 \f
 /* These macros define the behaviour of the expression 
    evaluator.  */
 

-/* Should we strictly type check expressions? */
-#define STRICT_TYPE (type_check != type_check_off)
-
-/* Should we range check values against the domain of their type? */
+/* Should we range check values against the domain of their type?  */

 #define RANGE_CHECK (range_check != range_check_off)
 
 #define RANGE_CHECK (range_check != range_check_off)
 

-/* "cast" really means conversion */
-/* FIXME -- should be a setting in language_defn */
+/* "cast" really means conversion.  */
+/* FIXME -- should be a setting in language_defn.  */

 #define CAST_IS_CONVERSION(LANG) ((LANG)->la_language == language_c  || \
                                  (LANG)->la_language == language_cplus || \
                                  (LANG)->la_language == language_objc)
 #define CAST_IS_CONVERSION(LANG) ((LANG)->la_language == language_c  || \
                                  (LANG)->la_language == language_cplus || \
                                  (LANG)->la_language == language_objc)


@@ -393,23 +501,20 @@ extern enum language set_language (enum language);
 /* This page contains functions that return things that are
    specific to languages.  Each of these functions is based on
    the current setting of working_lang, which the user sets
 /* This page contains functions that return things that are
    specific to languages.  Each of these functions is based on
    the current setting of working_lang, which the user sets

-   with the "set language" command. */
+   with the "set language" command.  */

 
 

-#define LA_PRINT_TYPE(type,varstring,stream,show,level) \
-  (current_language->la_print_type(type,varstring,stream,show,level))
+#define LA_PRINT_TYPE(type,varstring,stream,show,level,flags)          \
+  (current_language->la_print_type(type,varstring,stream,show,level,flags))

 
 #define LA_PRINT_TYPEDEF(type,new_symbol,stream) \
   (current_language->la_print_typedef(type,new_symbol,stream))
 
 
 #define LA_PRINT_TYPEDEF(type,new_symbol,stream) \
   (current_language->la_print_typedef(type,new_symbol,stream))
 

-#define LA_VAL_PRINT(type,valaddr,offset,addr,stream,recurse,options) \
-  (current_language->la_val_print(type,valaddr,offset,addr,stream, \
-                                 recurse,options))

 #define LA_VALUE_PRINT(val,stream,options) \
   (current_language->la_value_print(val,stream,options))
 
 #define LA_PRINT_CHAR(ch, type, stream) \
   (current_language->la_printchar(ch, type, stream))
 #define LA_VALUE_PRINT(val,stream,options) \
   (current_language->la_value_print(val,stream,options))
 
 #define LA_PRINT_CHAR(ch, type, stream) \
   (current_language->la_printchar(ch, type, stream))

-#define LA_PRINT_STRING(stream, elttype, string, length, encoding, force_ellipses,options) \
+#define LA_PRINT_STRING(stream, elttype, string, length, encoding, force_ellipses, options) \

   (current_language->la_printstr(stream, elttype, string, length, \
                                 encoding, force_ellipses,options))
 #define LA_EMIT_CHAR(ch, type, stream, quoter) \
   (current_language->la_printstr(stream, elttype, string, length, \
                                 encoding, force_ellipses,options))
 #define LA_EMIT_CHAR(ch, type, stream, quoter) \


@@ -417,14 +522,17 @@ extern enum language set_language (enum language);
 #define LA_GET_STRING(value, buffer, length, chartype, encoding) \
   (current_language->la_get_string(value, buffer, length, chartype, encoding))
 
 #define LA_GET_STRING(value, buffer, length, chartype, encoding) \
   (current_language->la_get_string(value, buffer, length, chartype, encoding))
 

-#define LA_PRINT_ARRAY_INDEX(index_value, stream, optins) \
+#define LA_PRINT_ARRAY_INDEX(index_value, stream, options) \

   (current_language->la_print_array_index(index_value, stream, options))
 
   (current_language->la_print_array_index(index_value, stream, options))
 

+#define LA_ITERATE_OVER_SYMBOLS(BLOCK, NAME, DOMAIN, CALLBACK) \
+  (current_language->la_iterate_over_symbols (BLOCK, NAME, DOMAIN, CALLBACK))
+

 /* Test a character to decide whether it can be printed in literal form
    or needs to be printed in another representation.  For example,
    in C the literal form of the character with octal value 141 is 'a'
    and the "other representation" is '\141'.  The "other representation"
 /* Test a character to decide whether it can be printed in literal form
    or needs to be printed in another representation.  For example,
    in C the literal form of the character with octal value 141 is 'a'
    and the "other representation" is '\141'.  The "other representation"

-   is program language dependent. */
+   is program language dependent.  */

 
 #define PRINT_LITERAL_FORM(c)          \
   ((c) >= 0x20                         \
 
 #define PRINT_LITERAL_FORM(c)          \
   ((c) >= 0x20                         \


@@ -433,36 +541,10 @@ extern enum language set_language (enum language);
 
 /* Type predicates */
 
 
 /* Type predicates */
 

-extern int simple_type (struct type *);
-
-extern int ordered_type (struct type *);
-
-extern int same_type (struct type *, struct type *);
-
-extern int integral_type (struct type *);
-
-extern int numeric_type (struct type *);
-
-extern int character_type (struct type *);
-
-extern int boolean_type (struct type *);
-
-extern int float_type (struct type *);
-

 extern int pointer_type (struct type *);
 
 extern int pointer_type (struct type *);
 

-extern int structured_type (struct type *);
-
-/* Checks Binary and Unary operations for semantic type correctness */
-/* FIXME:  Does not appear to be used */
-#define unop_type_check(v,o) binop_type_check((v),NULL,(o))
-
-extern void binop_type_check (struct value *, struct value *, int);
-

 /* Error messages */
 
 /* Error messages */
 

-extern void type_error (const char *, ...) ATTRIBUTE_PRINTF (1, 2);
-

 extern void range_error (const char *, ...) ATTRIBUTE_PRINTF (1, 2);
 
 /* Data:  Does this value represent "truth" to the current language?  */
 extern void range_error (const char *, ...) ATTRIBUTE_PRINTF (1, 2);
 
 /* Data:  Does this value represent "truth" to the current language?  */


@@ -475,15 +557,13 @@ extern enum language language_enum (char *str);
 
 extern const struct language_defn *language_def (enum language);
 
 
 extern const struct language_defn *language_def (enum language);
 

-extern char *language_str (enum language);
+extern const char *language_str (enum language);

 
 /* Add a language to the set known by GDB (at initialization time).  */
 
 extern void add_language (const struct language_defn *);
 
 
 /* Add a language to the set known by GDB (at initialization time).  */
 
 extern void add_language (const struct language_defn *);
 

-extern enum language get_frame_language (void);        /* In stack.c */
-
-/* Check for a language-specific trampoline. */
+/* Check for a language-specific trampoline.  */

 
 extern CORE_ADDR skip_language_trampoline (struct frame_info *, CORE_ADDR pc);
 
 
 extern CORE_ADDR skip_language_trampoline (struct frame_info *, CORE_ADDR pc);
 


@@ -491,12 +571,19 @@ extern CORE_ADDR skip_language_trampoline (struct frame_info *, CORE_ADDR pc);
 extern char *language_demangle (const struct language_defn *current_language, 
                                const char *mangled, int options);
 
 extern char *language_demangle (const struct language_defn *current_language, 
                                const char *mangled, int options);
 

+/* A wrapper for la_sniff_from_mangled_name.  The arguments and result
+   are as for the method.  */
+
+extern int language_sniff_from_mangled_name (const struct language_defn *lang,
+                                            const char *mangled,
+                                            char **demangled);
+

 /* Return class name from physname, or NULL.  */
 extern char *language_class_name_from_physname (const struct language_defn *,
                                                const char *physname);
 
 /* Splitting strings into words.  */
 /* Return class name from physname, or NULL.  */
 extern char *language_class_name_from_physname (const struct language_defn *,
                                                const char *physname);
 
 /* Splitting strings into words.  */

-extern char *default_word_break_characters (void);
+extern const char *default_word_break_characters (void);

 
 /* Print the index of an array element using the C99 syntax.  */
 extern void default_print_array_index (struct value *index_value,
 
 /* Print the index of an array element using the C99 syntax.  */
 extern void default_print_array_index (struct value *index_value,