[slime-cvs] CVS slime/contrib

[CVS User heller]

Update of /project/slime/cvsroot/slime/contrib
In directory tiger.common-lisp.net:/tmp/cvs-serv1836/contrib

Modified Files:
	ChangeLog swank-kawa.scm 
Log Message:
* swank-kawa.scm (%macroexpand): Use Kawa's syntaxutils.

--- /project/slime/cvsroot/slime/contrib/ChangeLog	2012/03/10 00:04:12	1.536
+++ /project/slime/cvsroot/slime/contrib/ChangeLog	2012/03/14 17:13:15	1.537
@@ -10,6 +10,10 @@
 	the arglist is a local definition from FLET, some parts may be
 	represented as ARGLIST-DUMMY, handle them.
 
+2012-03-14  Helmut Eller  <heller at common-lisp.net>
+
+	* swank-kawa.scm (%macroexpand): Use Kawa's syntaxutils.
+
 2012-03-06  Helmut Eller  <heller at common-lisp.net>
 
 	* swank-kawa.scm (module-method>meth-ref):  Slightly better
--- /project/slime/cvsroot/slime/contrib/swank-kawa.scm	2012/03/06 20:55:19	1.27
+++ /project/slime/cvsroot/slime/contrib/swank-kawa.scm	2012/03/14 17:13:15	1.28
@@ -17,6 +17,7 @@
 ;; You also need to start the debug agent.
 (setq slime-lisp-implementations
       '((kawa ("java"
+               "-Xss450k" ; compiler needs more stack
 	       "-cp" "/opt/kawa/kawa-svn:/opt/java/jdk1.6.0/lib/tools.jar"
 	       "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n"
 	       "kawa.repl" "-s")
@@ -36,14 +37,15 @@
 
 (module-export start-swank create-swank-server swank-java-source-path break)
 
-(module-static #t)
-
 (module-compile-options
+ warn-unknown-member: #t
  warn-invoke-unknown-method: #t
  warn-undefined-variable: #t
  )
 
+;;(import (rnrs hashtables))
 (require 'hash-table)
+(import (only (gnu kawa slib syntaxutils) expand))
 
 
 ;;;; Macros ()
@@ -1106,16 +1108,14 @@
 
 ;;;; Macroexpansion
 
-(defslimefun swank-expand-1 (env s) (%swank-macroexpand s))
-(defslimefun swank-expand (env s) (%swank-macroexpand s))
-(defslimefun swank-expand-all (env s) (%swank-macroexpand s))
-
-(df %swank-macroexpand (string)
-  (pprint-to-string (%macroexpand (read-from-string string))))
-
-(df %macroexpand (sexp)
-  (let ((tr :: kawa.lang.Translator (gnu.expr.Compilation:getCurrent)))
-    (! rewrite tr `(begin ,sexp))))
+(defslimefun swank-expand-1 (env s) (%swank-macroexpand s env))
+(defslimefun swank-expand (env s) (%swank-macroexpand s env))
+(defslimefun swank-expand-all (env s) (%swank-macroexpand s env))
+
+(df %swank-macroexpand (string env)
+  (pprint-to-string (%macroexpand (read-from-string string) env)))
+
+(df %macroexpand (sexp env) (expand sexp env: env))
 
 
 ;;;; Inspector
@@ -2034,6 +2034,11 @@
 (df del (tab key) (hash-table-delete! tab key) tab)
 (df tab () (make-hash-table))
 
+;;(df put (tab key value) (hashtable-set! tab key value) tab)
+;;(df get (tab key default) (hashtable-ref tab key default))
+;;(df del (tab key) (hashtable-delete! tab key) tab)
+;;(df tab () (make-eqv-hashtable))
+
 (df equal (x y => <boolean>) (equal? x y))
 
 (df current-thread (=> <thread>) (java.lang.Thread:currentThread))