[Gcl-devel] [ Task #1924] IN-PACKAGE form put out of order in compiled file

[Camm Maguire]

Greetings!  Paul, I think the patch below clears this issue up.  Am
planning to commit this with my other thus far local changes later
today.  Please check it out.

Separately, for the list, a few CVS questions:

What is the easy way to merge certain changes only from cvs HEAD into
the release branch?  Can I commit changes by group producing some
label which I can use in this merge?  Separately, I don't seem able to
edit the release branch without deleting the last tag and recreating
it as a branch tag.  I thought I could just have one 2.5 branch and
extend it linearly out through 2.5.4 -- no?

Take care,

Index: cmpnew/cmptop.lsp
===================================================================
RCS file: /cvsroot/gcl/gcl/cmpnew/cmptop.lsp,v
retrieving revision 1.7
diff -u -r1.7 cmptop.lsp
--- cmpnew/cmptop.lsp   26 Feb 2003 22:21:35 -0000      1.7
+++ cmpnew/cmptop.lsp   14 Jul 2003 17:08:15 -0000
@@ -109,6 +109,7 @@
 (si:putprop 'import t 'package-operation)
 (si:putprop 'provide t 'package-operation)
 (si:putprop 'require t 'package-operation)
+(si:putprop 'defpackage:defpackage t 'package-operation)
 
 ;;; Pass 1 top-levels.
 
@@ -193,8 +194,11 @@
                     (when *non-package-operation*
                       (cmpwarn "The package operation ~s was in a bad place."
                                form))
-                   (maybe-eval t form)
-                    (wt-data-package-operation form))
+                   (let ((res (if (setq fd (macro-function fun))
+                                  (cmp-expand-macro fd fun (copy-list (cdr 
form)))
+                                form)))
+                     (maybe-eval t res)
+                     (wt-data-package-operation res)))
                    ((setq fd (get fun 't1))
                     (when *compile-print* (print-current-form))
                     (funcall fd args))

-- 
Camm Maguire                                            address@hidden
==========================================================================
"The earth is but one country, and mankind its citizens."  --  Baha'u'llah