diff options
| author | Doug Evans <xdje42@gmail.com> | 2014-06-06 15:57:03 -0700 |
|---|---|---|
| committer | Doug Evans <dje@google.com> | 2014-06-06 15:57:03 -0700 |
| commit | d2929fdcf05bb14dc2484ee6918dbf67c5b46d75 (patch) | |
| tree | 031eb52397389646d26efdefa250bc0aa1157334 /gdb/guile/lib | |
| parent | 6da01dbef2535e333e2b26547d61e4684b8e4da7 (diff) | |
| download | gdb-d2929fdcf05bb14dc2484ee6918dbf67c5b46d75.zip gdb-d2929fdcf05bb14dc2484ee6918dbf67c5b46d75.tar.gz gdb-d2929fdcf05bb14dc2484ee6918dbf67c5b46d75.tar.bz2 | |
Add support for guile 2.0.5.
* guile/guile-internal.h (gdbscm_guile_major_version): Declare.
(gdbscm_guile_minor_version, gdbscm_guile_micro_version): Declare.
(gdbscm_guile_version_is_at_least): Declare.
(gdbscm_scm_string_to_int): Declare.
* guile/guile.c (gdbscm_guile_major_version): New global.
(gdbscm_guile_minor_version, gdbscm_guile_micro_version): New globals.
(guile_datadir): New static global.
(gdbscm_guile_data_directory): New function.
(initialize_scheme_side): Update.
(misc_guile_functions): Add guile-data-directory.
(initialize_gdb_module): Fetch guile version number.
* guile/lib/gdb.scm: Remove call to add-to-load-path.
* guile/lib/gdb/init.scm (%initialize!): Ditto.
* guile/lib/gdb/boot.scm: Use guile-data-directory.
* guile/scm-exception.c (gdbscm_print_exception_with_stack): Fix
comments.
* guile/scm-string.c (gdbscm_scm_string_to_int): New function.
* guile/scm-utils.c (gdbscm_guile_version_is_at_least): New function.
* guile/scm-value.c (gdbscm_value_to_string): Only call
scm_port_conversion_strategy if Guile version >= 2.0.6.
doc/
* guile.texi (Guile Configuration): Document guile-data-directory.
Diffstat (limited to 'gdb/guile/lib')
| -rw-r--r-- | gdb/guile/lib/gdb.scm | 4 | ||||
| -rw-r--r-- | gdb/guile/lib/gdb/boot.scm | 7 | ||||
| -rw-r--r-- | gdb/guile/lib/gdb/init.scm | 3 |
3 files changed, 3 insertions, 11 deletions
diff --git a/gdb/guile/lib/gdb.scm b/gdb/guile/lib/gdb.scm index d628f00..120fcc6 100644 --- a/gdb/guile/lib/gdb.scm +++ b/gdb/guile/lib/gdb.scm @@ -491,10 +491,6 @@ ) ;; Load the rest of the Scheme side. -;; data-directory is provided by the C code. - -(add-to-load-path - (string-append (data-directory) file-name-separator-string "guile")) (use-modules ((gdb init))) diff --git a/gdb/guile/lib/gdb/boot.scm b/gdb/guile/lib/gdb/boot.scm index cf7d305..8c0bb35 100644 --- a/gdb/guile/lib/gdb/boot.scm +++ b/gdb/guile/lib/gdb/boot.scm @@ -21,10 +21,9 @@ ;; loaded with it are not compiled. So we do very little here, and do ;; most of the initialization elsewhere. -;; data-directory is provided by the C code. -(load (string-append - (data-directory) file-name-separator-string "guile" - file-name-separator-string "gdb.scm")) +;; guile-data-directory is provided by the C code. +(add-to-load-path (guile-data-directory)) +(load-from-path "gdb.scm") ;; Now that the Scheme side support is loaded, initialize it. (let ((init-proc (@@ (gdb init) %initialize!))) diff --git a/gdb/guile/lib/gdb/init.scm b/gdb/guile/lib/gdb/init.scm index 1e90790..7607d49 100644 --- a/gdb/guile/lib/gdb/init.scm +++ b/gdb/guile/lib/gdb/init.scm @@ -155,9 +155,6 @@ ;; GDB+Guile. (define (%initialize!) - (add-to-load-path (string-append (data-directory) - file-name-separator-string "guile")) - (for-each (lambda (key) (set-exception-printer! key %exception-printer)) %exception-keys) |