Removed useless thunkification in %trace. IF is sufficient.

diff --git a/src/gtk/fix-demo.scm b/src/gtk/fix-demo.scm
index 1960c56bd0957bc2b48c6614986a69a4402b0e8e..c91dbb545ab951d44c2baa9f093bc47da37abee5 100644 (file)
--- a/src/gtk/fix-demo.scm
+++ b/src/gtk/fix-demo.scm
@@ -249,11 +249,15 @@ USA.
 \f
 
 (define %trace? #f)
-(define %trace2? #f)
 
 (define-syntax %trace
   (syntax-rules ()
-    ((_ . ARGS) (if %trace? ((lambda () (outf-error . ARGS)))))))
+    ((_ ARGS ...)
+     (if %trace? (outf-error ARGS ...)))))
+
+(define %trace2? #f)
+
 (define-syntax %trace2
   (syntax-rules ()
-    ((_ . ARGS) (if %trace2? ((lambda () (outf-error . ARGS)))))))
\ No newline at end of file
+    ((_ ARGS ...)
+     (if %trace2? (outf-error ARGS ...)))))
\ No newline at end of file

diff --git a/src/gtk/fix-layout.scm b/src/gtk/fix-layout.scm
index d16f89ed8425f2517b1a6277c63a75a44f36594f..fe51b033bfcbc58887602f9554a8d5347cb985b5 100644 (file)
--- a/src/gtk/fix-layout.scm
+++ b/src/gtk/fix-layout.scm
@@ -1901,10 +1901,12 @@ USA.
 
 (define-syntax %trace
   (syntax-rules ()
-    ((_ . ARGS) (if %trace? ((lambda () (outf-error . ARGS)))))))
+    ((_ ARGS ...)
+     (if %trace? (outf-error ARGS ...)))))
 
 (define %trace2? #f)
 
 (define-syntax %trace2
   (syntax-rules ()
-    ((_ . ARGS) (if %trace2? ((lambda () (outf-error . ARGS)))))))
\ No newline at end of file
+    ((_ ARGS ...)
+     (if %trace2? (outf-error ARGS ...)))))
\ No newline at end of file

diff --git a/src/gtk/gio.scm b/src/gtk/gio.scm
index 8dded5a72a12862de4df917d2cd23cb193a0ea58..9c813b3a76ca527e4a257a3f8b682076d174ed98 100644 (file)
--- a/src/gtk/gio.scm
+++ b/src/gtk/gio.scm
@@ -1234,12 +1234,14 @@ USA.
 
 (define %trace? #f)
 
-(define %trace-auth? #t)
-
 (define-syntax %trace
   (syntax-rules ()
-    ((_ . ARGS) (if %trace? ((lambda () (outf-error . ARGS)))))))
+    ((_ ARGS ...)
+     (if %trace? (outf-error ARGS ...)))))
+
+(define %trace-auth? #t)
 
 (define-syntax %trace-auth
   (syntax-rules ()
-    ((_ . ARGS) (if %trace? ((lambda () (outf-error . ARGS)))))))
\ No newline at end of file
+    ((_ ARGS ...)
+     (if %trace? (outf-error ARGS ...)))))
\ No newline at end of file

diff --git a/src/gtk/gobject.scm b/src/gtk/gobject.scm
index b1d4d9316ff81baae0c87a72f6bdb5f46f41c7bc..6ab1af5905e04eff2ab73bb42940a364c7e91232 100644 (file)
--- a/src/gtk/gobject.scm
+++ b/src/gtk/gobject.scm
@@ -634,6 +634,7 @@ USA.
 
 (define-syntax %trace
   (syntax-rules ()
-    ((_ . ARGS) (if %trace? ((lambda () (outf-error . ARGS)))))))
+    ((_ ARGS ...)
+     (if %trace? (outf-error ARGS ...)))))
 
 (initialize-package!)
\ No newline at end of file

diff --git a/src/gtk/gtk-ev.scm b/src/gtk/gtk-ev.scm
index 4ea34a337f3a29ba38319adcaa387cdf0139c882..9f2fe8b2ed030967ff48ece1f4fe59ffcdce02f2 100644 (file)
--- a/src/gtk/gtk-ev.scm
+++ b/src/gtk/gtk-ev.scm
@@ -440,10 +440,12 @@ USA.
 
 (define-syntax %trace
   (syntax-rules ()
-    ((_ . ARGS) (if %trace? ((lambda () (outf-error . ARGS)))))))
+    ((_ ARGS ...)
+     (if %trace? (outf-error ARGS ...)))))
 
 (define %trace2? #f)
 
 (define-syntax %trace2
   (syntax-rules ()
-    ((_ . ARGS) (if %trace2? ((lambda () (outf-error . ARGS)))))))
\ No newline at end of file
+    ((_ ARGS ...)
+     (if %trace2? (outf-error ARGS ...)))))
\ No newline at end of file

diff --git a/src/gtk/gtk-object.scm b/src/gtk/gtk-object.scm
index ae6214627753c90d440b8711bea342ee7fe20019..e9ae02d382e4b5f0de7e82046d6fb1de6f720400 100644 (file)
--- a/src/gtk/gtk-object.scm
+++ b/src/gtk/gtk-object.scm
@@ -905,4 +905,5 @@ USA.
 
 (define-syntax %trace
   (syntax-rules ()
-    ((_ . ARGS) (if %trace? ((lambda () (outf-error . ARGS)))))))
\ No newline at end of file
+    ((_ ARGS ...)
+     (if %trace? (outf-error ARGS ...)))))
\ No newline at end of file

diff --git a/src/gtk/gtk.scm b/src/gtk/gtk.scm
index 87e4af9c18550d40850467ab120f608da704db20..d1885ea864d5384508c32bc5c2385bb6b7b874ea 100644 (file)
--- a/src/gtk/gtk.scm
+++ b/src/gtk/gtk.scm
@@ -51,9 +51,9 @@ USA.
 
 (define-syntax error-if-null
   (syntax-rules ()
-    ((_ ALIEN . MESSAGE)
+    ((_ ALIEN MESSAGE ...)
      (if (alien-null? ALIEN)
-        ((lambda () (apply error . MESSAGE)))))))
+        (error MESSAGE ...)))))
 
 (define-integrable-operator (fix:max n m) (if (fix:> n m) n m))
 

diff --git a/src/gtk/swat.scm b/src/gtk/swat.scm
index 5ab9bedcdf910a115298b39f42c1e554feffe537..0d875fd8fcf9595c61b991230faa8f9ec883bf41 100644 (file)
--- a/src/gtk/swat.scm
+++ b/src/gtk/swat.scm
@@ -1224,12 +1224,14 @@ USA.
 
 (define-syntax %trace
   (syntax-rules ()
-    ((_ . ARGS) (if %trace? ((lambda () (outf-error . ARGS)))))))
+    ((_ ARGS ...)
+     (if %trace? (outf-error ARGS ...)))))
 
 (define %trace2? #f)
 
 (define-syntax %trace2
   (syntax-rules ()
-    ((_ . ARGS) (if %trace2? ((lambda () (outf-error . ARGS)))))))
+    ((_ ARGS ...)
+     (if %trace2? (outf-error ARGS ...)))))
 
 (initialize-package!)
\ No newline at end of file

diff --git a/src/gtk/thread.scm b/src/gtk/thread.scm
index 84f4ad269af2ff1cfcc06239cff825eaf019f98f..538d4b327213feb31bf60d847174fec2fe2dfbd1 100644 (file)
--- a/src/gtk/thread.scm
+++ b/src/gtk/thread.scm
@@ -102,5 +102,5 @@ USA.
 
 (define-syntax %trace
   (syntax-rules ()
-    ((_ . MSG)
-     (if %trace? ((lambda () (outf-error . MSG)))))))
\ No newline at end of file
+    ((_ ARGS ...)
+     (if %trace? (outf-error ARGS ...)))))
\ No newline at end of file