From e7813d204f33ed551f1313aae5c52042c46a5322 Mon Sep 17 00:00:00 2001 From: Matt Birkholz Date: Fri, 16 Sep 2011 12:16:12 -0700 Subject: [PATCH] Removed useless thunkification in %trace. IF is sufficient. --- src/gtk/fix-demo.scm | 10 +++++++--- src/gtk/fix-layout.scm | 6 ++++-- src/gtk/gio.scm | 10 ++++++---- src/gtk/gobject.scm | 3 ++- src/gtk/gtk-ev.scm | 6 ++++-- src/gtk/gtk-object.scm | 3 ++- src/gtk/gtk.scm | 4 ++-- src/gtk/swat.scm | 6 ++++-- src/gtk/thread.scm | 4 ++-- 9 files changed, 33 insertions(+), 19 deletions(-) diff --git a/src/gtk/fix-demo.scm b/src/gtk/fix-demo.scm index 1960c56bd..c91dbb545 100644 --- a/src/gtk/fix-demo.scm +++ b/src/gtk/fix-demo.scm @@ -249,11 +249,15 @@ USA. (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 d16f89ed8..fe51b033b 100644 --- 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 8dded5a72..9c813b3a7 100644 --- 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 b1d4d9316..6ab1af590 100644 --- 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 4ea34a337..9f2fe8b2e 100644 --- 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 ae6214627..e9ae02d38 100644 --- 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 87e4af9c1..d1885ea86 100644 --- 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 5ab9bedcd..0d875fd8f 100644 --- 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 84f4ad269..538d4b327 100644 --- 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 -- 2.25.1