Skip to content

Try adding s7 compatibility to langserver #27

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 2 commits into from
Aug 13, 2025
Merged

Try adding s7 compatibility to langserver #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a79311a
Added s7 in many branches
VSteveHL Aug 12, 2025
c7c56a3
add test for define* rule
VSteveHL Aug 13, 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
17 changes: 15 additions & 2 deletions analysis/abstract-interpreter.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@
(scheme-langserver analysis identifier rules r7rs define-library-import)
(scheme-langserver analysis identifier rules r7rs define-library-export)

(scheme-langserver analysis identifier rules s7 define-macro)
(scheme-langserver analysis identifier rules s7 define*)
(scheme-langserver analysis identifier rules s7 lambda*)

(scheme-langserver analysis identifier self-defined-rules router)

(scheme-langserver virtual-file-system index-node)
Expand Down Expand Up @@ -171,7 +175,7 @@
(cond
[(and (equal? r '(define)) (private:top-env=? 'r6rs top))
(private-add-rule rules `((,define-process) . ,identifier))]
[(and (equal? r '(define)) (private:top-env=? 'r7rs top))
[(and (equal? r '(define)) (or (private:top-env=? 'r7rs top) (private:top-env=? 's7 top)))
(private-add-rule rules `((,define-r7rs-process) . ,identifier))]
[(equal? r '(define-syntax)) (private-add-rule rules `((,define-syntax-process) . ,identifier))]
[(equal? r '(define-record-type)) (private-add-rule rules `((,define-record-type-process) . ,identifier))]
Expand Down Expand Up @@ -246,8 +250,17 @@

[(equal? r '(begin)) (private-add-rule rules `((,do-nothing . ,begin-process) . ,identifier))]

[(and (equal? r '(define-library)) (private:top-env=? 'r7rs top))
[(and (equal? r '(define-library)) (or (private:top-env=? 'r7rs top) (private:top-env=? 's7 top)))
(private-add-rule rules `((,library-import-process-r7rs . ,export-process-r7rs) . ,identifier))]

[(and (equal? r '(define*)) (private:top-env=? 's7 top))
(private-add-rule rules `((,define*-process) . ,identifier))]

[(and (equal? r '(define-macro)) (private:top-env=? 's7 top))
(private-add-rule rules `((,define-macro-process) . ,identifier))]

[(and (equal? r '(lambda*)) (private:top-env=? 's7 top))
(private-add-rule rules `((,lambda*-process) . ,identifier))]

[else rules])
(route&add
Expand Down
3 changes: 2 additions & 1 deletion analysis/dependency/file-linkage.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,8 @@
[(root-library-node index-node top-environment)
(let ([func (case top-environment
['r6rs library-import-process]
['r7rs library-import-process-r7rs])])
['r7rs library-import-process-r7rs]
['s7 library-import-process-r7rs])])
(apply append
(map
(lambda (l) (map file-node-path (library-node-file-nodes l)))
Expand Down
Loading