From d093a22f14e8f669b08ac407b4a2d6fc32d1e2ae Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Wed, 26 Jan 2011 08:52:30 +0000
Subject: 	* interp/g-util.boot (expandListlit): Tidy.

---
 src/interp/g-util.boot | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/interp')

diff --git a/src/interp/g-util.boot b/src/interp/g-util.boot
index 95b36c06..50846d50 100644
--- a/src/interp/g-util.boot
+++ b/src/interp/g-util.boot
@@ -250,8 +250,13 @@ expandCollect ['%collect,:iters,body] ==
 expandListlit(x is ['%listlit,:args]) ==
   args := [expandToVMForm arg for arg in args]
   args = nil => nil
-  and/[integer? arg or string? arg for arg in args] => quoteForm args
-  ['LIST,:args]
+  args' := [simpleValue? arg or leave 'failed for arg in args]
+     where simpleValue? arg ==
+             integer? arg or string? arg => arg
+             arg is ['QUOTE,form] => form
+             nil
+  args' = 'failed => ['LIST,:args]
+  quoteForm args'
 
 expandReturn(x is ['%return,.,y]) ==
   $FUNNAME = nil => systemErrorHere ['expandReturn,x]
-- 
cgit v1.2.3