Skip to content

feat: Add top-environment parameter to the workspace type #20

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.

Sign up for GitHub

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

Merged
ufo5260987423 merged 5 commits into from
Jul 15, 2025
Merged

feat: Add top-environment parameter to the workspace type #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b2ecaa5
sync from xmain
VSteveHL Jul 9, 2025
35b7ee7
feat: Add top-environment parameter to the workspace type
VSteveHL Jul 9, 2025
f725b97
I think that txt-filter.sls still need `[(file-directory? path) #t]`
VSteveHL Jul 10, 2025
cabf716
Merge branch 'main' into ospp-pr-top-env
VSteveHL Jul 14, 2025
6a26f86
use case-lambda rewrite init-document, init-virtual-file-system and a…
VSteveHL Jul 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion analysis/package-manager/txt-filter.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

(define (generate-txt-file-filter)
(lambda (path)
;; (pretty-print `(DEBUG: ,path))
(cond
[(file-directory? path) #t]
[(string-suffix? ".scm.txt" path) #t]
Expand Down
132 changes: 72 additions & 60 deletions analysis/workspace.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
workspace-file-linkage
workspace-facet
workspace-type-inference?
workspace-top-environment

update-file-node-with-tail

Expand Down Expand Up @@ -67,11 +68,12 @@
(immutable facet)
;only for identifer catching and type inference
(immutable threaded?)
(immutable type-inference?)))
(immutable type-inference?)
(immutable top-environment)))

(define (refresh-workspace workspace-instance)
(let* ([path (file-node-path (workspace-file-node workspace-instance))]
[root-file-node (init-virtual-file-system path '() (generate-akku-acceptable-file-filter (string-append path "/.akku/list")))]
[root-file-node (init-virtual-file-system path '() (workspace-facet workspace-instance) (workspace-top-environment workspace-instance))]
[root-library-node (init-library-node root-file-node)]
[file-linkage (init-file-linkage root-file-node root-library-node)]
[batches (get-init-reference-batches file-linkage)])
Expand All @@ -94,12 +96,12 @@
[txt (generate-txt-file-filter)]
[akku (generate-akku-acceptable-file-filter (string-append path "/.akku/list"))]
[else (generate-akku-acceptable-file-filter (string-append path "/.akku/list"))])]
[root-file-node (init-virtual-file-system path '() facet)]
[root-file-node (init-virtual-file-system path '() facet top-environment)]
[root-library-node (init-library-node root-file-node)]
[file-linkage (init-file-linkage root-file-node root-library-node)]
[batches (get-init-reference-batches file-linkage)])
(init-references root-file-node root-library-node file-linkage threaded? batches type-inference?)
(make-workspace root-file-node root-library-node file-linkage facet threaded? type-inference?))]))
(make-workspace root-file-node root-library-node file-linkage facet threaded? type-inference? top-environment))]))

;; head -[linkage]->files
;; for single file
Expand Down Expand Up @@ -219,31 +221,35 @@
[refreshable-batches (shrink-paths linkage refreshable-path)])
(init-references workspace-instance refreshable-batches))))))

(define (init-virtual-file-system path parent my-filter)
(if (my-filter path)
(let* ([name (path->name path)]
[folder? (file-directory? path)]
[document
(if folder?
'()
(init-document path))]
[node (make-file-node path name parent folder? '() document)]
[children (if folder?
(map
(lambda (p)
(init-virtual-file-system
(string-append path
(if (string-suffix? (string (directory-separator)) path)
""
(string (directory-separator)))
p)
node
my-filter))
(directory-list path))
'())])
(file-node-children-set! node (filter (lambda (p) (not (null? p))) children))
node)
'()))
(define init-virtual-file-system
(case-lambda
[(path parent my-filter) (init-virtual-file-system path parent my-filter 'r6rs)]
[(path parent my-filter top-environment)
(if (my-filter path)
(let* ([name (path->name path)]
[folder? (file-directory? path)]
[document
(if folder?
'()
(init-document path top-environment))]
[node (make-file-node path name parent folder? '() document)]
[children (if folder?
(map
(lambda (p)
(init-virtual-file-system
(string-append path
(if (string-suffix? (string (directory-separator)) path)
""
(string (directory-separator)))
p)
node
my-filter
top-environment))
(directory-list path))
'())])
(file-node-children-set! node (filter (lambda (p) (not (null? p))) children))
node)
'())]))


(define (remove-new-file path parent my-filter)
Expand All @@ -257,51 +263,57 @@
(lambda (x) (not (equal? x f)))
(file-node-children (file-node-parent f))))])))

(define (attach-new-file path parent my-filter)
(let ([f (walk-file parent path)])
(cond
[(not (my-filter path)) '()]
[(not (file-exists? path)) '()]
[(not (null? f)) f]
[(file-node-folder? parent)
(let ([maybe-parent
(find (lambda (child) (string-prefix? (file-node-path child) path))
(file-node-children parent))])
(if maybe-parent
(attach-new-file path maybe-parent my-filter)
(let ([new-node
(init-virtual-file-system
(find (lambda (p) (string-prefix? p path))
(map
(lambda (p) (string-append (file-node-path parent) (string (directory-separator)) p))
(directory-list (file-node-path parent))))
parent my-filter)])
(file-node-children-set! parent `(,@(file-node-children parent) ,new-node))
new-node)))]
[else
(let* ([name (path->name path)]
[document (init-document path)]
[node (make-file-node path name parent #f '() document)])
(file-node-children-set! parent `(,@(file-node-children parent) ,node))
node)])))
(define attach-new-file
(case-lambda
[(path parent my-filter) (attach-new-file path parent my-filter 'r6rs)]
[(path parent my-filter top-environment)
(let ([f (walk-file parent path)])
(cond
[(not (my-filter path)) '()]
[(not (file-exists? path)) '()]
[(not (null? f)) f]
[(file-node-folder? parent)
(let ([maybe-parent
(find (lambda (child) (string-prefix? (file-node-path child) path))
(file-node-children parent))])
(if maybe-parent
(attach-new-file path maybe-parent my-filter top-environment)
(let ([new-node
(init-virtual-file-system
(find (lambda (p) (string-prefix? p path))
(map
(lambda (p) (string-append (file-node-path parent) (string (directory-separator)) p))
(directory-list (file-node-path parent))))
parent my-filter top-environment)])
(file-node-children-set! parent `(,@(file-node-children parent) ,new-node))
new-node)))]
[else
(let* ([name (path->name path)]
[document (init-document path top-environment)]
[node (make-file-node path name parent #f '() document)])
(file-node-children-set! parent `(,@(file-node-children parent) ,node))
node)]))]))

(define (init-document path)
(define (init-document path top-environment)
(let ([uri (path->uri path)]
[s (read-string path)])
[s (read-string path)]
[meta-lib (case top-environment
['r7rs '(scheme base)]
[else '(chezscheme)])])
(try
(cond
[(string? s)
(make-document
uri
s
(map (lambda (item) (init-index-node '() item)) (source-file->annotations path))
(find-meta '(chezscheme)))]
(find-meta meta-lib top-environment))]
[(eof-object? s)
(make-document
uri
""
'()
(find-meta '(chezscheme)))]
(find-meta meta-lib top-environment))]
[else '()])
(except c
[(equal? c 'can-not-tolerant) '()]
Expand Down