test: revert changes to name/sc, ...

keep list of flat names in a separate table,
 performance seems better ... 25s ?

Author: bennn

typed-racket-lib/typed-racket/static-contracts/combinators/name.rkt

@@ -17,6 +17,10 @@
          racket/match
          racket/syntax
          syntax/private/id-table
+         (only-in syntax/private/id-set
+           mutable-free-id-set
+           free-id-set-add!
+           free-id-set-member?)
          (for-syntax racket/base
                      syntax/parse))
 
@@ -41,12 +45,12 @@
 
 (define name-sc-table (make-parameter (make-hash)))
 (define name-defs-table (make-parameter (make-hash)))
+(define current-flat-names (make-parameter (mutable-free-id-set)))
 
 (define (set-flat-names! gen-names)
-  (for* ([ns (in-hash-values (name-sc-table))]
-         [n (in-list ns)]
-         #:when (member (name-combinator-gen-name n) gen-names))
-    (set-name-combinator-flat! n #true)))
+  (define cfn (current-flat-names))
+  (for ((stx (in-list gen-names)))
+    (free-id-set-add! cfn stx)))
 
 ;; Use this table to track whether a contract has already been
 ;; generated for this name type yet. Stores booleans.
@@ -63,7 +67,8 @@
 (define-syntax-rule (with-new-name-tables e)
   (parameterize ([name-sc-table (make-hash)]
                  [name-defs-table (make-hash)]
-                 [name-defined-table (make-free-id-table)])
+                 [name-defined-table (make-free-id-table)]
+                 [current-flat-names (mutable-free-id-set)])
     e))
 
 (define (get-all-name-defs)
@@ -98,7 +103,7 @@
              type
              (list typed-sc untyped-sc both-sc)))
 
-(struct name-combinator combinator (gen-name [flat #:auto #:mutable])
+(struct name-combinator combinator (gen-name)
   #:transparent
   #:property prop:combinator-name "name/sc"
   #:methods gen:sc
@@ -110,11 +115,11 @@
    (define (sc->constraints v f)
      (variable-contract-restrict (name-combinator-gen-name v)))
    (define (sc-terminal-kind v)
-     (if (name-combinator-flat v)
+     (if (free-id-set-member? (current-flat-names) (name-combinator-gen-name v))
        'flat
-       #f))])
+       #false))])
 
 (define-match-expander name/sc:
   (syntax-parser
-    [(_ var) #'(name-combinator _ var _)]))
+    [(_ var) #'(name-combinator _ var)]))
 

typed-racket-lib/typed-racket/static-contracts/instantiate.rkt

@@ -37,12 +37,6 @@
            compute-recursive-kinds
            instantiate/inner))
 
-(define (name/sc? v)
-  (printf "nmae? ~a~n" v)
-  (match v
-   [(name/sc: _) #true]
-   [_ #false]))
-
 (define (instantiate/optimize sc fail kind #:cache cache #:trusted-positive trusted-positive #:trusted-negative trusted-negative)
   (define recursive-kinds
     (with-handlers [(exn:fail:constraint-failure?