From d5c29fa0bc701ece460849cf1d3dbdf761250f86 Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Wed, 30 Jun 2010 11:30:50 +0000
Subject: 	* interp/c-util.boot (getRepresentation): Tidy. 	*
 interp/define.boot (checkRepresentation): Don't compile the base 	domain
 here yet.

---
 src/interp/c-util.boot | 3 ++-
 src/interp/define.boot | 5 +----
 2 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/interp')

diff --git a/src/interp/c-util.boot b/src/interp/c-util.boot
index e79aba6b..1403eaf8 100644
--- a/src/interp/c-util.boot
+++ b/src/interp/c-util.boot
@@ -132,7 +132,8 @@ substituteDollarIfRepHack m ==
 ++ current functor, if any.
 getRepresentation: %Env -> %Maybe %Mode
 getRepresentation e ==
-  (get("Rep","value",e) or return nil).expr
+  u := get('Rep,'value,e) => u.expr
+  get('Rep,'macro,e)
 
 
 ++ Returns true if the form `t' is an instance of the Tuple constructor.
diff --git a/src/interp/define.boot b/src/interp/define.boot
index d40033e0..ad52ec88 100644
--- a/src/interp/define.boot
+++ b/src/interp/define.boot
@@ -257,11 +257,8 @@ checkRepresentation(addForm,body,env) ==
           $subdomain := true
           dom
         addForm
-      base := compForMode(domainRep,$EmptyMode,env) or 
-        stackAndThrow('"1b is not a domain",[domainRep])
       $useRepresentationHack := false
-      env := put("Rep","value",removeEnv base,env)
-      -- ??? Maybe we should also make Rep available as macro?
+      env := put('Rep,'macro,domainRep,env)
   env
 
 
-- 
cgit v1.2.3