1 files changed, 80 insertions, 14 deletions
diff --git a/gdb/go-lang.h b/gdb/go-lang.h
index 1f07907..532b4eb 100644
--- a/gdb/go-lang.h
+++ b/gdb/go-lang.h
@@ -56,34 +56,100 @@ enum go_type
   GO_TYPE_STRING
 };
 
-/* Defined in go-exp.y.  */
-
-extern int go_parse (struct parser_state *);
-
 /* Defined in go-lang.c.  */
 
 extern const char *go_main_name (void);
 
 extern enum go_type go_classify_struct_type (struct type *type);
 
-extern char *go_demangle (const char *mangled, int options);
-
 extern char *go_symbol_package_name (const struct symbol *sym);
 
 extern char *go_block_package_name (const struct block *block);
 
 extern const struct builtin_go_type *builtin_go_type (struct gdbarch *);
 
-/* Defined in go-typeprint.c.  */
+/* Class representing the Go language.  */
+
+class go_language : public language_defn
+{
+public:
+  go_language ()
+    : language_defn (language_go)
+  { /* Nothing.  */ }
+
+  /* See language.h.  */
+
+  const char *name () const override
+  { return "go"; }
+
+  /* See language.h.  */
+
+  const char *natural_name () const override
+  { return "Go"; }
+
+  /* See language.h.  */
+
+  void language_arch_info (struct gdbarch *gdbarch,
+			   struct language_arch_info *lai) const override;
+
+  /* See language.h.  */
+
+  bool sniff_from_mangled_name (const char *mangled,
+				char **demangled) const override
+  {
+    *demangled = demangle_symbol (mangled, 0);
+    return *demangled != NULL;
+  }
+
+  /* See language.h.  */
+
+  char *demangle_symbol (const char *mangled, int options) const override;
+
+  /* See language.h.  */
 
-extern void go_print_type (struct type *type, const char *varstring,
-			   struct ui_file *stream, int show, int level,
-			   const struct type_print_options *flags);
+  void print_type (struct type *type, const char *varstring,
+		   struct ui_file *stream, int show, int level,
+		   const struct type_print_options *flags) const override;
 
-/* Implement la_value_print_inner for Go.  */
+  /* See language.h.  */
 
-extern void go_value_print_inner (struct value *value,
-				  struct ui_file *stream, int recurse,
-				  const struct value_print_options *options);
+  void value_print_inner
+	(struct value *val, struct ui_file *stream, int recurse,
+	 const struct value_print_options *options) const override;
+
+  /* See language.h.  */
+
+  int parser (struct parser_state *ps) const override;
+
+  /* See language.h.  */
+
+  bool is_string_type_p (struct type *type) const override
+  {
+    type = check_typedef (type);
+    return (type->code () == TYPE_CODE_STRUCT
+	    && go_classify_struct_type (type) == GO_TYPE_STRING);
+  }
+
+  /* See language.h.  */
+
+  bool store_sym_names_in_linkage_form_p () const override
+  { return true; }
+
+  /* See language.h.  */
+
+  const struct exp_descriptor *expression_ops () const override;
+
+  /* See language.h.  */
+
+  const struct op_print *opcode_print_table () const override
+  { return op_print_tab; }
+
+private:
+
+  /* Table of opcode data for use by OPCODE_PRINT_TABLE member function.  */
+
+  static const struct op_print op_print_tab[];
+
+};
 
 #endif /* !defined (GO_LANG_H) */