-
-
Notifications
You must be signed in to change notification settings - Fork 5.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
make x[...] .= ... assign in-place #17546
Merged
Merged
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1542,6 +1542,15 @@ | |
(cadr expr) ;; eta reduce `x->f(x)` => `f` | ||
`(-> ,argname (block ,@splat ,expr))))) | ||
|
||
(define (ref-to-view expr) | ||
(if (and (pair? expr) (eq? (car expr) 'ref)) | ||
(let* ((ex (partially-expand-ref expr)) | ||
(stmts (butlast (cdr ex))) | ||
(refex (last (cdr ex))) | ||
(nuref `(call view ,(caddr refex) ,@(cdddr refex)))) | ||
`(block ,@stmts ,nuref)) | ||
expr)) | ||
|
||
; fuse nested calls to expr == f.(args...) into a single broadcast call, | ||
; or a broadcast! call if lhs is non-null. | ||
(define (expand-fuse-broadcast lhs rhs) | ||
|
@@ -1657,14 +1666,15 @@ | |
(cons farg new-fargs) (cons arg new-args) renames varfarg vararg)))))) | ||
(cf (cdadr f) args '() '() '() '() '())) | ||
e)) ; (not (fuse? e)) | ||
(let ((e (compress-fuse (dot-to-fuse rhs)))) ; an expression '(fuse func args) if expr is a dot call | ||
(let ((e (compress-fuse (dot-to-fuse rhs))) ; an expression '(fuse func args) if expr is a dot call | ||
(lhs_ (ref-to-view lhs))) ; x[...] expressions on lhs turn in to view(x, ...) to update x in-place | ||
(if (fuse? e) | ||
(if (null? lhs) | ||
(expand-forms `(call broadcast ,(from-lambda (cadr e)) ,@(caddr e))) | ||
(expand-forms `(call broadcast! ,(from-lambda (cadr e)) ,lhs ,@(caddr e)))) | ||
(expand-forms `(call broadcast! ,(from-lambda (cadr e)) ,lhs_ ,@(caddr e)))) | ||
(if (null? lhs) | ||
(expand-forms e) | ||
(expand-forms `(call broadcast! identity ,lhs ,e)))))) | ||
(expand-forms `(call broadcast! identity ,lhs_ ,e)))))) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Similarly, should these be calls to |
||
|
||
;; table mapping expression head to a function expanding that form | ||
(define expand-table | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@JeffBezanson, should this be
(top view)
rather thanview
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes; I would go with
top
to avoid capturing locals that might be calledview
orbroadcast
.