From dfa2b7b076235a93068d405f0a9305864c20406a Mon Sep 17 00:00:00 2001
From: Jay McCarthy <jay.mccarthy@gmail.com>
Date: Sat, 20 Feb 2016 16:57:27 -0500
Subject: [PATCH] port layout

---
 remix/layout0.rkt | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/remix/layout0.rkt b/remix/layout0.rkt
index 76aa16d..f5ed314 100644
--- a/remix/layout0.rkt
+++ b/remix/layout0.rkt
@@ -111,8 +111,8 @@
                            (match-define (vector the-name-f the-dt the-f-idx) v)
                            (list the-f the-name-f
                                  (if the-dt
-                                     (list the-name-f '#:is the-dt)
-                                     (list the-name-f))
+                                     #`(remix:#%brackets #,the-dt #,the-name-f)
+                                     the-name-f)
                                  the-f-idx))]
                         [stx-the-planner-id the-planner-id]
                         [stx-f->acc f->acc]
@@ -124,8 +124,12 @@
                              (list #'vector
                                    #'unsafe-vector*-ref
                                    #'unsafe-vector*-set!
-                                   #'((remix:#%brackets #:set! name-set!)
-                                      (remix:#%brackets #:! name-set!)))
+                                   #'((remix:def
+                                       (remix:#%brackets static-interface-member #:set!)
+                                       name-set!)
+                                      (remix:def
+                                       (remix:#%brackets static-interface-member #:!)
+                                       name-set!)))
                              (list #'vector-immutable
                                    #'unsafe-vector*-ref
                                    #'void
@@ -225,18 +229,22 @@
                  ...)
                (remix:def
                 (remix:#%brackets static-interface name)
-                (remix:#%brackets #:alloc name-alloc)
-                (remix:#%brackets #:set name-set)
-                (remix:#%brackets #:= name-set)
+                (remix:def (remix:#%brackets static-interface-member #:alloc)
+                           name-alloc)
+                (remix:def (remix:#%brackets static-interface-member #:set)
+                           name-set)
+                (remix:def (remix:#%brackets static-interface-member #:=)
+                           name-set)
                 mutation-interface ...
-                (remix:#%brackets all-f . all-f-si-rhs)
+                (remix:def (remix:#%brackets static-interface-member all-f)
+                           all-f-si-rhs)
                 ...
-                #:extensions
-                #:methods gen:layout
-                [(define (layout-planner-id _)
-                   #'stx-the-planner-id)
-                 (define (layout-field->acc _)
-                   f->acc)]))))]))]))
+                (remix:def (remix:#%brackets static-interface-extension)
+                           #:methods gen:layout
+                           [(define (layout-planner-id _)
+                              #'stx-the-planner-id)
+                            (define (layout-field->acc _)
+                              f->acc)])))))]))]))
 
 (provide (rename-out [phase0:layout layout])
          (for-syntax gen:layout