another workaround for #577

JuliaLang · Mar 14, 2012 · 353e8bb · 353e8bb
1 parent 3eaf953
commit 353e8bb
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/jl/string.jl b/jl/string.jl
@@ -23,6 +23,7 @@ print(x...) = for i=x; print(i); end
 println(args...) = print(args..., '\n')
 
 show(s::String) = print_quoted(s)
+showln(x) = (show(x); println())
 
 (*)(s::String...) = strcat(s...)
 (^)(s::String, r::Integer) = repeat(s,r)

diff --git a/src/julia-syntax.scm b/src/julia-syntax.scm
@@ -284,17 +284,19 @@
 					  args
 					  field-names)))
 			      body)))
-  (pattern-replace
-   (pattern-set
-    (pattern-lambda (function (call name . sig) body)
-		    `(function ,(cadr __) ,(ctor-body body)))
-    (pattern-lambda (= (call name . sig) body)
-		    `(= ,(cadr __) ,(ctor-body body)))
-    (pattern-lambda (function (call (curly name . p) . sig) body)
-		    `(function ,(cadr __) ,(ctor-body body)))
-    (pattern-lambda (= (call (curly name . p) . sig) body)
-		    `(= ,(cadr __) ,(ctor-body body))))
-   ctor))
+  (let ((ctor2
+	 (pattern-replace
+	  (pattern-set
+	   (pattern-lambda (function (call name . sig) body)
+			   `(function ,(cadr __) ,(ctor-body body)))
+	   (pattern-lambda (= (call name . sig) body)
+			   `(= ,(cadr __) ,(ctor-body body)))
+	   (pattern-lambda (function (call (curly name . p) . sig) body)
+			   `(function ,(cadr __) ,(ctor-body body)))
+	   (pattern-lambda (= (call (curly name . p) . sig) body)
+			   `(= ,(cadr __) ,(ctor-body body))))
+	  ctor)))
+    ctor2))
 
 ;; remove line numbers and nested blocks
 (define (flatten-blocks e)