diff --git a/analysis/identifier/rules/goldfish/define-case-class.sls b/analysis/identifier/self-defined-rules/goldfish/define-case-class.sls similarity index 96% rename from analysis/identifier/rules/goldfish/define-case-class.sls rename to analysis/identifier/self-defined-rules/goldfish/define-case-class.sls index 662d7f2..5cfde38 100644 --- a/analysis/identifier/rules/goldfish/define-case-class.sls +++ b/analysis/identifier/self-defined-rules/goldfish/define-case-class.sls @@ -1,4 +1,4 @@ -(library (scheme-langserver analysis identifier rules goldfish define-case-class) +(library (scheme-langserver analysis identifier self-defined-rules goldfish define-case-class) (export define-case-class-process define-case-class-parameter-process) diff --git a/analysis/identifier/rules/goldfish/let1.sls b/analysis/identifier/self-defined-rules/goldfish/let1.sls similarity index 95% rename from analysis/identifier/rules/goldfish/let1.sls rename to analysis/identifier/self-defined-rules/goldfish/let1.sls index 17cbfaf..3b31508 100644 --- a/analysis/identifier/rules/goldfish/let1.sls +++ b/analysis/identifier/self-defined-rules/goldfish/let1.sls @@ -1,4 +1,4 @@ -(library (scheme-langserver analysis identifier rules goldfish let1) +(library (scheme-langserver analysis identifier self-defined-rules goldfish let1) (export let1-process let1-parameter-process) diff --git a/analysis/identifier/rules/goldfish/typed-lambda.sls b/analysis/identifier/self-defined-rules/goldfish/typed-lambda.sls similarity index 98% rename from analysis/identifier/rules/goldfish/typed-lambda.sls rename to analysis/identifier/self-defined-rules/goldfish/typed-lambda.sls index 6b8792d..7145e1d 100644 --- a/analysis/identifier/rules/goldfish/typed-lambda.sls +++ b/analysis/identifier/self-defined-rules/goldfish/typed-lambda.sls @@ -1,4 +1,4 @@ -(library (scheme-langserver analysis identifier rules goldfish typed-lambda) +(library (scheme-langserver analysis identifier self-defined-rules goldfish typed-lambda) (export typed-lambda-process typed-parameter-process) diff --git a/analysis/identifier/self-defined-rules/router.sls b/analysis/identifier/self-defined-rules/router.sls index 4535e73..93c4746 100644 --- a/analysis/identifier/self-defined-rules/router.sls +++ b/analysis/identifier/self-defined-rules/router.sls @@ -17,7 +17,11 @@ (scheme-langserver analysis identifier self-defined-rules srfi include-resolve) (scheme-langserver analysis identifier self-defined-rules ufo-match match) - (scheme-langserver analysis identifier self-defined-rules ufo-try try)) + (scheme-langserver analysis identifier self-defined-rules ufo-try try) + + (scheme-langserver analysis identifier self-defined-rules goldfish define-case-class) + (scheme-langserver analysis identifier self-defined-rules goldfish let1) + (scheme-langserver analysis identifier self-defined-rules goldfish typed-lambda)) (define (route&add rules target-identifier @@ -58,5 +62,12 @@ ;not now to delete rules ] + [(and (equal? library-identifiers '((liii base))) (equal? expressions '(let1))) + (add-rule-procedure rules `((,let1-process) . ,target-identifier))] + [(and (equal? library-identifiers '((liii oop))) (equal? expressions '(define-case-class))) + (add-rule-procedure rules `((,define-case-class-process) . ,target-identifier))] + [(and (equal? library-identifiers '((liii base))) (equal? expressions '(typed-lambda))) + (add-rule-procedure rules `((,typed-lambda-process) . ,target-identifier))] + [else rules]))) ) \ No newline at end of file diff --git a/run.ss b/run.ss index 6d81d64..d73e5b3 100644 --- a/run.ss +++ b/run.ss @@ -18,7 +18,7 @@ Options: -h, --help Print help information - -e, --top-environment Switch to support different top environment, for example R6RS, R7RS, etc.(default: R6RS) + -e, --top-environment Switch to support different top environment, for example R6RS, R7RS, s7, goldfish, etc.(default: R6RS) Example Usage: @@ -63,7 +63,7 @@ Example Usage: ((string-ci=? str "r6rs") 'r6rs) ((string-ci=? str "r7rs") 'r7rs) ((string-ci=? str "s7") 's7) - ;; ((string-ci=? str "goldfish") 'goldfish) + ((string-ci=? str "goldfish") 's7) (else #f))) diff --git a/tests/analysis/identifier/rules/goldfish/test-define-case-class.sps b/tests/analysis/identifier/rules/goldfish/test-define-case-class.sps index 0cbdb24..8a1b4e6 100644 --- a/tests/analysis/identifier/rules/goldfish/test-define-case-class.sps +++ b/tests/analysis/identifier/rules/goldfish/test-define-case-class.sps @@ -7,7 +7,7 @@ (import (rnrs (6)) (srfi :64 testing) (scheme-langserver analysis workspace) (scheme-langserver analysis identifier reference) - (scheme-langserver analysis identifier rules goldfish define-case-class) + (scheme-langserver analysis identifier self-defined-rules goldfish define-case-class) (scheme-langserver analysis identifier rules let) (scheme-langserver analysis identifier rules library-import) (scheme-langserver analysis package-manager akku) diff --git a/tests/analysis/identifier/rules/goldfish/test-define-class.sps b/tests/analysis/identifier/rules/goldfish/test-define-class.sps index 340f066..e389b3b 100644 --- a/tests/analysis/identifier/rules/goldfish/test-define-class.sps +++ b/tests/analysis/identifier/rules/goldfish/test-define-class.sps @@ -7,7 +7,7 @@ (import (rnrs (6)) (srfi :64 testing) (scheme-langserver analysis workspace) (scheme-langserver analysis identifier reference) - (scheme-langserver analysis identifier rules goldfish define-case-class) + (scheme-langserver analysis identifier self-defined-rules goldfish define-case-class) (scheme-langserver analysis identifier rules let) (scheme-langserver analysis identifier rules library-import) (scheme-langserver analysis package-manager akku) diff --git a/tests/analysis/identifier/rules/goldfish/test-let1.sps b/tests/analysis/identifier/rules/goldfish/test-let1.sps index a2c729a..e24114b 100644 --- a/tests/analysis/identifier/rules/goldfish/test-let1.sps +++ b/tests/analysis/identifier/rules/goldfish/test-let1.sps @@ -7,7 +7,7 @@ (import (rnrs (6)) (srfi :64 testing) (scheme-langserver analysis workspace) (scheme-langserver analysis identifier reference) - (scheme-langserver analysis identifier rules goldfish let1) + (scheme-langserver analysis identifier self-defined-rules goldfish let1) (scheme-langserver analysis identifier rules let) (scheme-langserver analysis identifier rules library-import) (scheme-langserver analysis package-manager akku) diff --git a/tests/analysis/identifier/rules/goldfish/test-typed-lambda.sps b/tests/analysis/identifier/rules/goldfish/test-typed-lambda.sps index c4ffff4..f5b5965 100644 --- a/tests/analysis/identifier/rules/goldfish/test-typed-lambda.sps +++ b/tests/analysis/identifier/rules/goldfish/test-typed-lambda.sps @@ -7,7 +7,7 @@ (import (rnrs (6)) (srfi :64 testing) (scheme-langserver analysis workspace) (scheme-langserver analysis identifier reference) - (scheme-langserver analysis identifier rules goldfish typed-lambda) + (scheme-langserver analysis identifier self-defined-rules goldfish typed-lambda) (scheme-langserver analysis package-manager akku) (scheme-langserver util text)