Address PR feedback: move to analyzers/private, fix struct, remove bound-by-phase

Co-authored-by: jackfirth <[email protected]>

Author: Copilot

default-recommendations/analyzers/identifier-usage.rkt

@@ -9,13 +9,12 @@
   [identifier-usage-analyzer expansion-analyzer?]))
 
 
-(require racket/hash
-         racket/list
+(require racket/list
          racket/stream
          rebellion/collection/entry
          rebellion/streaming/transducer
+         resyntax/default-recommendations/analyzers/private/expanded-id-table
          resyntax/private/analyzer
-         resyntax/private/expanded-id-table
          resyntax/private/syntax-path
          resyntax/private/syntax-property-bundle
          resyntax/private/syntax-traversal
@@ -160,24 +159,19 @@
   ;; Create expanded-id-table to track bound identifiers with empty usage lists
   (define table (make-expanded-id-table))
 
-  ;; Group bound identifiers by phase for efficient lookup
-  (define bound-by-phase (make-hash))
-  
   ;; Initialize all bound identifiers with empty usage lists
   (for ([id (in-stream (binding-site-identifiers labeled-stx))])
     (define id-phase (syntax-property id 'phase))
-    (define expanded-id (expanded-identifier id id-phase))
-    (expanded-id-table-set! table expanded-id '())
-    (hash-update! bound-by-phase id-phase (λ (lst) (cons expanded-id lst)) '()))
+    (expanded-id-table-set! table (expanded-identifier id id-phase) '()))
 
   ;; For each usage, find its binding within the same phase and add it to the usage list
   (for ([used-id (in-stream (usage-site-identifiers labeled-stx))])
     (define used-phase (syntax-property used-id 'phase))
-    (define bound-at-phase (hash-ref bound-by-phase used-phase '()))
-    (for ([bound-expanded-id bound-at-phase])
+    (for ([bound-entry (in-expanded-id-table-phase table used-phase)])
+      (define bound-expanded-id (entry-key bound-entry))
       (define bound-id (expanded-identifier-syntax bound-expanded-id))
       (when (free-identifier=? bound-id used-id)
-        (define current-usages (expanded-id-table-ref table bound-expanded-id '()))
+        (define current-usages (entry-value bound-entry))
         (expanded-id-table-set! table bound-expanded-id (cons used-id current-usages)))))
 
   table)

private/expanded-id-table.rkt …/analyzers/private/expanded-id-table.rktprivate/expanded-id-table.rkt renamed to default-recommendations/analyzers/private/expanded-id-table.rkt private/expanded-id-table.rkt renamed to default-recommendations/analyzers/private/expanded-id-table.rkt

@@ -13,7 +13,9 @@
    (->* (expanded-id-table? expanded-identifier?) (failure-result/c) any/c)]
   [expanded-id-table-set! (-> expanded-id-table? expanded-identifier? any/c void?)]
   [in-expanded-id-table
-   (-> expanded-id-table? (sequence/c (entry/c expanded-identifier? any/c)))]))
+   (-> expanded-id-table? (sequence/c (entry/c expanded-identifier? any/c)))]
+  [in-expanded-id-table-phase
+   (-> expanded-id-table? (or/c exact-nonnegative-integer? #false) (sequence/c (entry/c expanded-identifier? any/c)))]))
 
 
 (require guard
@@ -40,9 +42,7 @@
   #:guard (struct-guard/c identifier? (or/c exact-nonnegative-integer? #false)))
 
 
-(struct expanded-id-table (table)
-  #:transparent
-  #:mutable)
+(struct expanded-id-table (table))
 
 
 (define (make-expanded-id-table)
@@ -76,6 +76,14 @@
     (entry (expanded-identifier stx phase) value)))
 
 
+(define (in-expanded-id-table-phase table phase)
+  (define phase-table (hash-ref (expanded-id-table-table table) phase #false))
+  (if phase-table
+      (for/stream ([(stx value) (in-free-id-table phase-table)])
+        (entry (expanded-identifier stx phase) value))
+      (stream)))
+
+
 ;@----------------------------------------------------------------------------------------------------
 
 

default-recommendations/analyzers/variable-mutability.rkt

@@ -14,8 +14,8 @@
          racket/stream
          rebellion/collection/entry
          rebellion/streaming/transducer
+         resyntax/default-recommendations/analyzers/private/expanded-id-table
          resyntax/private/analyzer
-         resyntax/private/expanded-id-table
          resyntax/private/syntax-path
          resyntax/private/syntax-property-bundle
          resyntax/private/syntax-traversal