From 7274791b7d8efcad79d70b0d86138ba61c328294 Mon Sep 17 00:00:00 2001
From: Alex Knauth <alexander@knauth.org>
Date: Thu, 28 Jul 2016 14:29:14 -0400
Subject: [PATCH] use the struct-update package instead of alexis/util/struct
 (#277)

---
 info.rkt                       |  5 +++--
 lens/private/struct/field.rkt  |  2 +-
 lens/private/struct/struct.rkt | 28 ++++++++++++----------------
 3 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/info.rkt b/info.rkt
index 4cc0345..b6df132 100644
--- a/info.rkt
+++ b/info.rkt
@@ -14,8 +14,9 @@
     "unstable-list-lib"
     "unstable-contract-lib"
     "fancy-app"
-    "alexis-util"
-    "sweet-exp"
+    "syntax-classes-lib"
+    "struct-update-lib"
+    "sweet-exp-lib"
     "kw-make-struct"
     "reprovide-lang"
     "scribble-lib"))
diff --git a/lens/private/struct/field.rkt b/lens/private/struct/field.rkt
index ec4285f..533b366 100644
--- a/lens/private/struct/field.rkt
+++ b/lens/private/struct/field.rkt
@@ -2,7 +2,7 @@
 
 (require racket/local
          syntax/parse/define
-         alexis/util/struct
+         struct-update
          "../base/main.rkt"
          (for-syntax racket/base
                      syntax/parse
diff --git a/lens/private/struct/struct.rkt b/lens/private/struct/struct.rkt
index c5ef31d..874b2d7 100644
--- a/lens/private/struct/struct.rkt
+++ b/lens/private/struct/struct.rkt
@@ -1,12 +1,12 @@
 #lang racket/base
 
 (require syntax/parse/define
-         alexis/util/struct
+         struct-update
          racket/provide-syntax
          "../base/main.rkt"
-         (submod alexis/util/struct get-struct-accessors)
          (for-syntax racket/base
                      syntax/parse
+                     syntax/parse/class/struct-id
                      racket/syntax
                      racket/struct-info))
 
@@ -21,14 +21,10 @@
          struct+lenses-out)
 
 
-(define-for-syntax (get-struct-field-ids struct-info failure-context)
-  (define-values (_ field-ids)
-    (get-struct-accessors struct-info failure-context))
-  field-ids)
-
-(define-for-syntax (get-struct-id-field-ids struct-id-stx)
-  (define info (extract-struct-info (syntax-local-value struct-id-stx)))
-  (get-struct-field-ids info struct-id-stx))
+(define-for-syntax (get-struct-own-accessor-ids struct-id-stx)
+  (syntax-parse struct-id-stx
+    [s:struct-id
+     (attribute s.own-accessor-id)]))
 
 (define-for-syntax (map-format-id lex-context format-str ids)
   (define (format-one-id id)
@@ -36,10 +32,10 @@
   (map format-one-id ids))
 
 (define-for-syntax (struct-get-set-lens-ids struct-id-stx)
-  (define field-ids (get-struct-id-field-ids struct-id-stx))
-  (define set-ids (map-format-id struct-id-stx "~a-set" field-ids))
-  (define lens-ids (map-format-id struct-id-stx "~a-lens" field-ids))
-  (list field-ids set-ids lens-ids))
+  (define accessor-ids (get-struct-own-accessor-ids struct-id-stx))
+  (define set-ids (map-format-id struct-id-stx "~a-set" accessor-ids))
+  (define lens-ids (map-format-id struct-id-stx "~a-lens" accessor-ids))
+  (list accessor-ids set-ids lens-ids))
 
 (define-syntax define-struct-lenses
   (syntax-parser
@@ -61,8 +57,8 @@
 (define-provide-syntax struct-lenses-out
   (syntax-parser
     [(struct-lenses-out struct-type:id)
-     #:do [(define field-ids (get-struct-id-field-ids #'struct-type))]
-     #:with [lens-id ...] (map-format-id #'struct-type "~a-lens" field-ids)
+     #:do [(define accessor-ids (get-struct-own-accessor-ids #'struct-type))]
+     #:with [lens-id ...] (map-format-id #'struct-type "~a-lens" accessor-ids)
      #'(combine-out lens-id ...)]))
 
 (define-provide-syntax struct+lenses-out