From de1f11dbf78f6e0a5be97fe6370028747d62f1d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Georges=20Dup=C3=A9ron?= Date: Wed, 28 Dec 2016 17:41:09 +0100 Subject: [PATCH] Switched flex records from thunks to delay/pure/stateless promises --- Graph-notes-copy2.vue | 401 ++++++++++++++++++++++++++++-------- flexible-with.hl.rkt | 119 ++++++----- test/test-flexible-with.rkt | 6 +- 3 files changed, 380 insertions(+), 146 deletions(-) diff --git a/Graph-notes-copy2.vue b/Graph-notes-copy2.vue index facf3d2..e73fd5f 100644 --- a/Graph-notes-copy2.vue +++ b/Graph-notes-copy2.vue @@ -1,14 +1,14 @@ - + - - + + - Graph-notes-copy2.vue @@ -2292,7 +2292,7 @@ label="A graph transformation lists its accepted input types, we have to make the code within work with all" layerID="1" created="1479345855459" x="2831.9707" y="421.74475" width="660.0" height="23.0" strokeWidth="1.0" autoSized="true" xsi:type="node"> - #F2AE45 + #C1F780 #776D6D #000000 SansSerif-plain-12 @@ -2380,24 +2380,24 @@ - #F2AE45 + #C1F780 #776D6D #000000 SansSerif-plain-12 http://vue.tufts.edu/rdf/resource/7002a307c0a80026616d9239fea067fb - #404040 #404040 SansSerif-plain-11 http://vue.tufts.edu/rdf/resource/7002a308c0a80026616d9239fd1b7118 - - + + 357 372 @@ -2405,7 +2405,7 @@ label="Provide a "with" form, so that mappings can extend or alter the inputs?" layerID="1" created="1479385905764" x="3414.6375" y="491.74475" width="473.0" height="23.0" strokeWidth="1.0" autoSized="true" xsi:type="node"> - #F2AE45 + #C1F780 #776D6D #000000 SansSerif-plain-12 @@ -2436,7 +2436,7 @@ label="Solution 1: hide the extra fields in the "raw" field" created="1479386144228" x="34.0" y="23.0" width="324.0" height="23.0" strokeWidth="1.0" autoSized="true" xsi:type="node"> - #F2AE45 + #A6A6A6 #776D6D #000000 SansSerif-plain-12 @@ -2447,7 +2447,7 @@ label="Solution 2: allow the use of split/with/merge, auto-insert a mergefor the + - ± cases" created="1479386844095" x="34.0" y="43.25" width="562.0" height="24.0" strokeWidth="1.0" autoSized="false" xsi:type="node"> - #F2AE45 + #FEFD8C #776D6D #000000 SansSerif-plain-12 @@ -2458,7 +2458,7 @@ label="Solution 3: in the mapping signature, explicitly indicate a row type variable" created="1479386922237" x="34.0" y="64.25" width="491.0" height="23.0" strokeWidth="1.0" autoSized="true" xsi:type="node"> - #F2AE45 + #E6F7FD #776D6D #000000 SansSerif-plain-12 @@ -2469,7 +2469,7 @@ label="Partial solution: for mappings which specify a derived type (with + - ±) for their output, auto-copy the remaining fields?" created="1479385818415" x="34.0" y="84.5" width="782.0" height="23.0" strokeWidth="1.0" autoSized="true" xsi:type="node"> - #FCDBD9 + #E6F7FD #776D6D #000000 SansSerif-plain-12 @@ -2480,7 +2480,7 @@ label="Allow limited-field mappings (mappings from n to m fields of a node, keeping the rest intact)" created="1479387268964" x="34.0" y="104.75" width="604.0" height="23.0" strokeWidth="1.0" autoSized="true" xsi:type="node"> - #F2AE45 + #E6F7FD #776D6D #000000 SansSerif-plain-12 @@ -2506,7 +2506,7 @@ label="Problem: these operations need to explicitly specify the possible types for the auto-insertion, it's okay (we know them statically), but for user code it's a bit too verbose" layerID="1" created="1479387124402" x="3501.6375" y="581.24475" width="645.0" height="38.0" strokeWidth="1.0" autoSized="true" xsi:type="node"> - #F2AE45 + #FC938D #776D6D #000000 SansSerif-plain-12 @@ -2529,7 +2529,7 @@ label="Could we define some sort of "with" macro which just acts like cons, and leave the fusion of fields to be done outside of the graph? It then becomes possible to combine the return type info with the input type info to limit the number of cases to handle" layerID="1" created="1479387466709" x="3503.6375" y="652.74475" width="870.0" height="38.0" strokeWidth="1.0" autoSized="true" xsi:type="node"> - #F2AE45 + #A6A6A6 #776D6D #000000 SansSerif-plain-12 @@ -2696,7 +2696,7 @@ label="1. record the fields added via node-with+, node-with! and node-with!! 2. The types which may have been added are therefore: (difference input-types output-types) ∩ fields-mentionned-in-with*" layerID="1" created="1479390037236" x="3858.6375" y="740.74475" width="466.0" height="53.0" strokeWidth="1.0" autoSized="true" xsi:type="node"> - #F2AE45 + #A6A6A6 #776D6D #000000 SansSerif-plain-12 @@ -2719,7 +2719,7 @@ label="This does not allowof mixing the explicit with* for structures and the node-with*" layerID="1" created="1479390248006" x="4378.6377" y="811.74475" width="526.0" height="23.0" strokeWidth="1.0" autoSized="true" xsi:type="node"> - #F2AE45 + #FC938D #776D6D #000000 SansSerif-plain-12 @@ -2752,25 +2752,25 @@ - #FCDBD9 + label="To pass the graph row tvar to other functions, make a new sort of ∀ (like for #:row), and use (g-row-inst f g-row-var)." + layerID="1" created="1479403067621" x="3020.6375" y="765.24475" + width="562.0" height="38.0" strokeWidth="1.0" autoSized="true" xsi:type="node"> + #E6F7FD #776D6D #000000 SansSerif-plain-12 http://vue.tufts.edu/rdf/resource/7353a85bafd9d7675fea10f24895dc43 - #404040 #404040 SansSerif-plain-11 http://vue.tufts.edu/rdf/resource/7353a85bafd9d7675fea10f2505e36aa - - + + 383 423 @@ -2778,7 +2778,7 @@ label="Won't handle gracefully the case of mappings returning nested nodes" layerID="1" created="1479387344773" x="3337.1375" y="716.74475" width="468.0" height="23.0" strokeWidth="1.0" autoSized="true" xsi:type="node"> - #FCDBD9 + #FC938D #776D6D #000000 SansSerif-plain-12 @@ -2827,7 +2827,7 @@ label="Don't record the fields added. Instead, return a tagged structure with *only* the fields added, and stash aside the original. We know what the original may be statically (one of the graph's nodes)." layerID="1" created="1479404327217" x="3520.6375" y="854.74475" width="818.0" height="38.0" strokeWidth="1.0" autoSized="true" xsi:type="node"> - #F2AE45 + #A6A6A6 #776D6D #000000 SansSerif-plain-12 @@ -2874,7 +2874,7 @@ label="Optionnally parameterize node types with an extra polymorphic type for the "row" This poly type encapsulates the "extra" fields. The return type of the mapping should indicate that the node has a "row" and which tvar to use Statically, we can recognize that from the input, and perform the merge in an easy way" layerID="1" created="1479481584246" x="2273.6375" y="737.74475" width="635.0" height="68.0" strokeWidth="1.0" autoSized="true" xsi:type="node"> - #F2AE45 + #A6A6A6 #776D6D #000000 SansSerif-plain-12 @@ -2921,7 +2921,7 @@ - #F2AE45 + #C1F780 #776D6D #000000 SansSerif-plain-12 @@ -2944,7 +2944,7 @@ label="Cheapy trivial tracking: use let-syntax on the inputs, so that we know their type" layerID="1" created="1479486772901" x="2382.6375" y="160.74475" width="527.0" height="23.0" strokeWidth="1.0" autoSized="true" xsi:type="node"> - #F2AE45 + #A6A6A6 #776D6D #000000 SansSerif-plain-12 @@ -2966,24 +2966,25 @@ - #F2AE45 + #A6A6A6 #776D6D #000000 SansSerif-plain-12 http://vue.tufts.edu/rdf/resource/784b625ac0a83801659a3967a167ad78 - + #404040 #404040 SansSerif-plain-11 http://vue.tufts.edu/rdf/resource/784b625ac0a83801659a396755702e91 - - + + 443 447 @@ -3012,30 +3013,31 @@ - #F2AE45 + #A6A6A6 #776D6D #000000 SansSerif-plain-12 http://vue.tufts.edu/rdf/resource/784e56cfc0a83801659a3967c532603f - + #404040 #404040 SansSerif-plain-11 http://vue.tufts.edu/rdf/resource/784e56cfc0a83801659a39678a19388f - - + + 447 455 #FC938D #776D6D @@ -3044,38 +3046,39 @@ http://vue.tufts.edu/rdf/resource/784e56d0c0a83801659a396759692c9e - + #404040 #404040 SansSerif-plain-11 http://vue.tufts.edu/rdf/resource/784e56d0c0a83801659a3967b64162ba - - + + 455 457 - #F2AE45 + #A6A6A6 #776D6D #000000 SansSerif-plain-12 http://vue.tufts.edu/rdf/resource/7872f6c7c0a83801659a3967b9244b5d - #404040 #404040 SansSerif-plain-11 http://vue.tufts.edu/rdf/resource/7872f6c7c0a83801659a3967fb310cfc - - + + 457 463 @@ -3083,7 +3086,7 @@ label="Subtyping and recursive types with TR sometimes rejects valid subtyping relationships" layerID="1" created="1479489570917" x="1969.6375" y="479.74475" width="570.0" height="23.0" strokeWidth="1.0" autoSized="true" xsi:type="node"> - #F2AE45 + #FEFD8C #776D6D #000000 SansSerif-plain-12 @@ -3104,10 +3107,10 @@ 465 - #F2AE45 + #FEFD8C #776D6D #000000 SansSerif-plain-12 @@ -3128,7 +3131,7 @@ #FC938D #776D6D @@ -3137,38 +3140,39 @@ http://vue.tufts.edu/rdf/resource/78b501a5c0a83801659a39678e8cb2cd - #404040 #404040 SansSerif-plain-11 http://vue.tufts.edu/rdf/resource/78b501a6c0a83801659a39673e57b5e0 - - + + 463 471 - #F2AE45 + #A6A6A6 #776D6D #000000 SansSerif-plain-12 http://vue.tufts.edu/rdf/resource/78b501a6c0a83801659a396729606ba0 - + #404040 #404040 SansSerif-plain-11 http://vue.tufts.edu/rdf/resource/78b501a6c0a83801659a39679b169ce5 - - + + 471 473 @@ -3176,7 +3180,7 @@ label="Must specify the node name or tag+fields in the with* forms, possibly with a "row" variable. The node name should be concise enough that it's not too much of a pain to write it in a lot of places." layerID="1" created="1479493941528" x="3284.6375" y="211.74475" width="681.0" height="38.0" strokeWidth="1.0" autoSized="true" xsi:type="node"> - #F2AE45 + #A6A6A6 #776D6D #000000 SansSerif-plain-12 @@ -3201,7 +3205,7 @@ label="Detect all structure types which are present as inputs or outputs (or within the mapping?) and use that information to make a large case handling" layerID="1" created="1479494059762" x="3265.6375" y="266.74475" width="598.0" height="38.0" strokeWidth="1.0" autoSized="true" xsi:type="node"> - #F2AE45 + #A6A6A6 #776D6D #000000 SansSerif-plain-12 @@ -3265,31 +3269,32 @@ 484 - #F2AE45 + width="419.0" height="23.0" strokeWidth="1.0" autoSized="true" xsi:type="node"> + #C1F780 #776D6D #000000 SansSerif-plain-12 http://vue.tufts.edu/rdf/resource/78ba99b9c0a83801659a396792c09d82 - + #404040 #404040 SansSerif-plain-11 http://vue.tufts.edu/rdf/resource/78ba99b9c0a83801659a396789c84846 - - + + 443 488 #FC938D #776D6D @@ -3298,19 +3303,233 @@ http://vue.tufts.edu/rdf/resource/78bd72dec0a83801659a39679db74cd5 - + #F4F5E9 + #776D6D + #000000 + SansSerif-plain-18 + http://vue.tufts.edu/rdf/resource/45873cde534430712734d86ab1152fe7 + + #FFC63B + #776D6D + #000000 + SansSerif-plain-16 + http://vue.tufts.edu/rdf/resource/45873cde534430712734d86a6173ded7 + + + + #FC938D + #776D6D + #000000 + SansSerif-plain-16 + http://vue.tufts.edu/rdf/resource/45873cdf534430712734d86a3f094d92 + + + + #FEFD8C + #776D6D + #000000 + SansSerif-plain-16 + http://vue.tufts.edu/rdf/resource/45873cdf534430712734d86a14e4a638 + + + + #C1F780 + #5491A4 + #000000 + SansSerif-plain-16 + http://vue.tufts.edu/rdf/resource/45873cdf534430712734d86a1e77c5e8 + + + + #E6F7FD + #776D6D + #000000 + SansSerif-plain-16 + http://vue.tufts.edu/rdf/resource/45bba55b534430712734d86a7b98e7af + + + + #A6A6A6 + #776D6D + #000000 + SansSerif-plain-16 + http://vue.tufts.edu/rdf/resource/45873cdf534430712734d86aab608348 + + + + + + #FC938D + #776D6D + #000000 + SansSerif-plain-12 + http://vue.tufts.edu/rdf/resource/45bba55c534430712734d86a16caa731 + + + #404040 #404040 SansSerif-plain-11 - http://vue.tufts.edu/rdf/resource/78bd72dec0a83801659a3967f6f854cc - - + http://vue.tufts.edu/rdf/resource/45bbf23d534430712734d86a4fad75b2 + + + 423 + 503 + + + #A6A6A6 + #776D6D + #000000 + SansSerif-plain-12 + http://vue.tufts.edu/rdf/resource/45e66670534430712734d86a57e07278 + + + + #404040 + #404040 + SansSerif-plain-11 + http://vue.tufts.edu/rdf/resource/45e66670534430712734d86a070392ee + + 488 + 507 + + + #404040 + #404040 + SansSerif-plain-11 + http://vue.tufts.edu/rdf/resource/45e66670534430712734d86a90157415 + + + 507 490 + + #C1F780 + #776D6D + #000000 + SansSerif-plain-12 + http://vue.tufts.edu/rdf/resource/45e66670534430712734d86a3a5e0161 + + + + #404040 + #404040 + SansSerif-plain-11 + http://vue.tufts.edu/rdf/resource/45e66670534430712734d86ac0cf2c24 + + + 488 + 510 + + + #FEFD8C + #776D6D + #000000 + SansSerif-plain-12 + http://vue.tufts.edu/rdf/resource/45ec4fff534430712734d86aa07fbb12 + + + + #404040 + #404040 + SansSerif-plain-12 + http://vue.tufts.edu/rdf/resource/45ec4fff534430712734d86a24c87b1e + + + 510 + 512 + + + #FC938D + #776D6D + #000000 + SansSerif-plain-12 + http://vue.tufts.edu/rdf/resource/45ec4fff534430712734d86a19adbd4d + + + + #404040 + #404040 + SansSerif-plain-12 + http://vue.tufts.edu/rdf/resource/45ec4fff534430712734d86a0c6770e9 + + + 512 + 514 + + + #FFC63B + #776D6D + #000000 + SansSerif-plain-12 + http://vue.tufts.edu/rdf/resource/45ec4fff534430712734d86a0944806f + + + + #404040 + #404040 + SansSerif-plain-12 + http://vue.tufts.edu/rdf/resource/45ec4fff534430712734d86a1c61af46 + + + 514 + 517 + http://vue.tufts.edu/rdf/resource/6dbf6b15c0a80026548592b8d2f3fee2 diff --git a/flexible-with.hl.rkt b/flexible-with.hl.rkt index 4667e9e..264c67f 100644 --- a/flexible-with.hl.rkt +++ b/flexible-with.hl.rkt @@ -9,34 +9,6 @@ '("(lib phc-graph/scribblings/phc-graph-implementation.scrbl)" "phc-graph/flexible-with")) -@chunk[<*> - (require (for-syntax (rename-in racket/base [... …]) - syntax/stx - racket/syntax - racket/list - syntax/id-table - racket/sequence) - (for-meta 2 racket/base) - "flexible-with-utils.hl.rkt") - - (provide (for-syntax define-trees) - ;; For tests: - (struct-out Some)) - - - - - - - - <τ-tree-with-fields> - - ] - -@chunk[ - (struct (T) Some ([v : T]) #:transparent) - (define-type (Maybe T) (U (Some T) 'NONE))] - @section{Type of a tree-record, with a hole} @CHUNK[ @@ -76,19 +48,19 @@ with a new one. [mod (cadr bits)]) (define/with-syntax next-id (vector-ref names (sub1 next))) (if mod - #`(λ () - (let ([tree (tree-thunk)]) + #`(delay/pure/stateless + (let ([tree (force tree-thunk)]) (let ([left-subtree (car tree)] [right-subtree (cdr tree)]) (cons left-subtree - ((next-id (λ () right-subtree) - . replacement?)))))) - #`(λ () - (let ([tree (tree-thunk)]) + (force (next-id (delay/pure/stateless right-subtree) + . replacement?)))))) + #`(delay/pure/stateless + (let ([tree (force tree-thunk)]) (let ([left-subtree (car tree)] [right-subtree (cdr tree)]) - (cons ((next-id (λ () left-subtree) - . replacement?)) + (cons (force (next-id (delay/pure/stateless left-subtree) + . replacement?)) right-subtree)))))))] @CHUNK[ @@ -100,11 +72,15 @@ with a new one. (provide name) (: name (∀ (#,@τ*-limited T) - (→ (→ #,(tree-type-with-replacement i #'Any τ*-limited)) + (→ (Promise #,(tree-type-with-replacement i #'Any τ*-limited)) T - (→ #,(tree-type-with-replacement i #'(Some T) τ*-limited))))) - (define (name tree-thunk replacement) - #,(let ([replacement-thunk #'(λ () (Some replacement))]) + (Promise #,(tree-type-with-replacement i #'(Some T) τ*-limited))))) + (define-pure/stateless + #:∀ (#,@τ*-limited T) + (name [tree-thunk : (Promise #,(tree-type-with-replacement i #'Any τ*-limited))] + [replacement : T]) + : (Promise #,(tree-type-with-replacement i #'(Some T) τ*-limited)) + #,(let ([replacement-thunk #'(delay/pure/stateless (Some replacement))]) ))))] @subsection{Removing fields} @@ -121,10 +97,14 @@ with Some or use 'NONE on the "front-end" side. (provide name) (: name (∀ (#,@τ*-limited T) - (→ (→ #,(tree-type-with-replacement i #'(Some Any) τ*-limited)) - (→ #,(tree-type-with-replacement i #''NONE τ*-limited))))) - (define (name tree-thunk) - #,(let ([replacement-thunk #'(λ () 'NONE)]) + (→ (Promise #,(tree-type-with-replacement i #'(Some Any) τ*-limited)) + (Promise #,(tree-type-with-replacement i #''NONE τ*-limited))))) + (define-pure/stateless + #:∀ (#,@τ*-limited T) + (name [tree-thunk : (Promise #,(tree-type-with-replacement i #'(Some Any) τ*-limited))]) + : (Promise #,(tree-type-with-replacement i #''NONE τ*-limited)) + + #,(let ([replacement-thunk #'(delay/pure/stateless 'NONE)]) ))))] @section{Auxiliary values} @@ -206,18 +186,18 @@ fields: #`(begin (: fields→tree-name (∀ (field …) (→ field … - (→ #,(τ-tree-with-fields #'(field …) - all-fields))))) + (Promise #,(τ-tree-with-fields #'(field …) + all-fields))))) (define (fields→tree-name field …) - (λ () + (delay/pure/stateless #,(convert-fields (* offset 2) fields+indices))) (: tree→fields-name (∀ (field …) - (→ (→ #,(τ-tree-with-fields #'(field …) - all-fields)) + (→ (Promise #,(τ-tree-with-fields #'(field …) + all-fields)) (Values field …)))) (define (tree→fields-name tree-thunk) - (define tree (tree-thunk)) + (define tree (force tree-thunk)) #,(convert-back-fields (* offset 2) fields+indices))))] @subsection{Creating a new tree-record} @@ -301,8 +281,8 @@ interesting subparts of the trees (those where there are fields). (define-type-expander (bt-fields-id stx) (syntax-case stx () [(_ . fs) - #`(∀ fs (→ #,(τ-tree-with-fields #'fs - #'(field …))))])) + #`(∀ fs (Promise #,(τ-tree-with-fields #'fs + #'(field …))))])) #,@(map #λ(define-replace-in-tree names ∀-types % (floor-log2 %)) (range 1 (add1 total-nb-functions))) #,@(map #λ(define-remove-in-tree rm-names ∀-types % (floor-log2 %)) @@ -312,4 +292,39 @@ interesting subparts of the trees (those where there are fields). (syntax->list #'(struct …)) (syntax->list #'([struct-field …] …))))] +@subsection{Putting it all together} + +@chunk[ + (struct (T) Some ([v : T]) #:transparent) + (define-type (Maybe T) (U (Some T) 'NONE))] + +@chunk[<*> + (require delay-pure + "flexible-with-utils.hl.rkt" + (for-syntax (rename-in racket/base [... …]) + syntax/stx + racket/syntax + racket/list + syntax/id-table + racket/sequence) + (for-meta 2 racket/base)) + + (provide (for-syntax define-trees) + ;; For tests: + (struct-out Some) + + ;;DEBUG: + (for-syntax τ-tree-with-fields) + ) + + + + + + + + <τ-tree-with-fields> + + ] + @include-section[(submod "flexible-with-utils.hl.rkt" doc)] \ No newline at end of file diff --git a/test/test-flexible-with.rkt b/test/test-flexible-with.rkt index c5f6f0e..8799d78 100644 --- a/test/test-flexible-with.rkt +++ b/test/test-flexible-with.rkt @@ -20,7 +20,6 @@ (field …) [struct struct-field …] …)))])) -;(gs 6) (gs bt-fields 16 (a b c) @@ -29,8 +28,9 @@ [sabc a b c]) (check-equal?: - (~> ((ann (with-c (sab→tree 1 2) 'nine) - ((bt-fields a b c) One Positive-Byte 'nine))) + (~> (ann (with-c (sab→tree 1 2) 'nine) + ((bt-fields a b c) One Positive-Byte 'nine)) + force flatten (filter Some? _) (map Some-v _)