From 9416b594a2dc895540cd121ed73965448ec37e53 Mon Sep 17 00:00:00 2001
From: jgarcia <jgarcia>
Date: Sun, 13 Apr 2008 08:53:32 +0000
Subject: [PATCH] LOAD-TIME-VALUE did not work with global variables

---
 src/CHANGELOG         | 3 +++
 src/cmp/cmptop.lsp    | 2 +-
 src/lsp/config.lsp.in | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/CHANGELOG b/src/CHANGELOG
index 47a36ca9d..d6f3a80b2 100644
--- a/src/CHANGELOG
+++ b/src/CHANGELOG
@@ -119,6 +119,9 @@ ECL 0.9k:
 	"/e/foo:bar"		DIR=(:ABSOLUTE "e"), NAME="foo:bar"
 	"/e/foo:bar/txt"	DIR=(:ABSOLUTE "e" "foo:bar"), NAME="txt"
 
+ - LOAD-TIME-VALUE would not work as expected when its argument was a variable
+   or a constant.
+
 * System design:
 
  - We introduce a new kind of lisp objects, the stack frames. These are objects
diff --git a/src/cmp/cmptop.lsp b/src/cmp/cmptop.lsp
index b259a375a..41b88a93a 100644
--- a/src/cmp/cmptop.lsp
+++ b/src/cmp/cmptop.lsp
@@ -448,7 +448,7 @@
   (check-args-number 'LOAD-TIME-VALUE args 1 2)
   (let ((form (first args))
 	loc)
-    (cond ((listp form)
+    (cond ((typep form '(or list symbol))
 	   (setf loc (data-empty-loc))
 	   (push (make-c1form* 'LOAD-TIME-VALUE :args loc (c1expr form))
 		 *load-time-values*))
diff --git a/src/lsp/config.lsp.in b/src/lsp/config.lsp.in
index 820b0b8c7..2663dd1a9 100644
--- a/src/lsp/config.lsp.in
+++ b/src/lsp/config.lsp.in
@@ -24,7 +24,7 @@ Returns, as a string, the location of the machine on which ECL runs."
 (defun lisp-implementation-version ()
   "Args:()
 Returns the version of your ECL as a string."
-  "@PACKAGE_VERSION@ (CVS 2008-04-08 08:29)")
+  "@PACKAGE_VERSION@ (CVS 2008-04-13 10:52)")
 
 (defun machine-type ()
   "Args: ()