From 9f69889cfd7cc5a061c5e5ade74b9e31ab60acd0 Mon Sep 17 00:00:00 2001
From: Bojun Ren <bj.ren.coding@outlook.com>
Date: Mon, 2 Jun 2025 18:58:27 +0800
Subject: [PATCH 1/2] feat: argument parsing with SRFI-37

Add prototype for argument parsing routine.
---
 run.ss | 75 +++++++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 59 insertions(+), 16 deletions(-)

diff --git a/run.ss b/run.ss
index d07520e4..2951b8fb 100644
--- a/run.ss
+++ b/run.ss
@@ -1,20 +1,63 @@
 (import
     (chezscheme)
+    (srfi :37 args-fold)
     (scheme-langserver))
 
-(let ([arg (command-line-arguments)])
-  (if (and (pair? arg) (equal? (car arg) "--help"))
-      (begin
-        (display "Usage:\n")
-        (display "  ./run --help\n")
-        (display "  ./run [input-port] [output-port] [log-path] [enable-multi-thread?] [type-inference?]\n")
-        (display "Arguments:\n")
-        (display "  input-port            Port to read messages (default: stdin)\n")
-        (display "  output-port           Port to write messages (default: stdout)\n")
-        (display "  log-path              Path to write log output (default: null)\n")
-        (display "  enable-multi-thread?  enable | disable (default: disable)\n")
-        (display "  type-inference?       enable | disable (defaule: disable)\n")
-        (display "Example Usage:\n")
-        (display "  ./run /path/to/scheme-langserver.log enable enable\n")
-        (exit 0)))
-  (apply init-server arg))
+(define (display-help)
+  (let ([prog-name (car (command-line))])
+    (display (format "Usage:
+  ~a --help | -h
+  ~a [options] [input-port] [output-port] [log-path]
+
+Options:
+  --multi-thread            enable multi-thread
+  --type-inference          enable type inference
+
+Arguments:
+  input-port                Port to read messages (default: stdin)
+  output-port               Port to write messages (default: stdout)
+  log-path                  Path to write log output (default: null)
+
+Example Usage:
+  ~a /path/to/scheme-langserver.log\n"
+                     prog-name prog-name prog-name))))
+
+(define-record-type scheme-lsp-args
+  (fields
+   (mutable multi-thread)
+   (mutable type-inference)
+   ;; Reversed oprands
+   (mutable oprands)))
+
+(define options
+  (list
+   (option '(#\h "help") #f #f
+           (lambda (opt name arg seeds)
+             (display-help)
+             (exit 0)))
+   (option '("multi-thread") #f #f
+           (lambda (opt name arg seeds)
+             (scheme-lsp-args-multi-thread-set! seeds #t)
+             seeds))
+   (option '("type-inference") #f #f
+           (lambda (opt name arg seeds)
+             (scheme-lsp-args-type-inference-set! seeds #t)
+             seeds))))
+
+(let* ([args (args-fold
+              (command-line-arguments)
+              options
+              (lambda (opt name arg seeds)
+                (format #t "Unrecognized option: ~a\n" name)
+                (display-help)
+                (exit 0))
+              (lambda (operand seeds)
+                (scheme-lsp-args-oprands-set!
+                 seeds
+                 (cons operand
+                       (scheme-lsp-args-oprands seeds)))
+                seeds)
+              (make-scheme-lsp-args #f #f '()))]
+       [operands (reverse (scheme-lsp-args-oprands args))])
+  ;; TODO: use options
+  (apply init-server operands))

From 0cc038fdbe89c6bc40bd4ecc0dde4ee206026e04 Mon Sep 17 00:00:00 2001
From: Bojun Ren <bj.ren.coding@outlook.com>
Date: Tue, 3 Jun 2025 02:07:52 +0800
Subject: [PATCH 2/2] fix(test): test cases related to run.ss

---
 tests/analysis/dependency/rules/test-library-import.sps | 2 +-
 tests/analysis/test-tokenizer.sps                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/analysis/dependency/rules/test-library-import.sps b/tests/analysis/dependency/rules/test-library-import.sps
index b9d8976a..8270b682 100755
--- a/tests/analysis/dependency/rules/test-library-import.sps
+++ b/tests/analysis/dependency/rules/test-library-import.sps
@@ -25,7 +25,7 @@
 (test-begin "library-import-process for ss")
     (let* ([root-file-node (init-virtual-file-system "./run.ss" '() (lambda (fuzzy) #t))]
             [root-index-nodes (document-index-node-list (file-node-document root-file-node))])
-        (test-equal '((chezscheme) (scheme-langserver)) (car (map library-import-process root-index-nodes))))
+        (test-equal '((chezscheme) (srfi :37 args-fold) (scheme-langserver)) (car (map library-import-process root-index-nodes))))
 (test-end)
 
 (exit (if (zero? (test-runner-fail-count (test-runner-get))) 0 1))
diff --git a/tests/analysis/test-tokenizer.sps b/tests/analysis/test-tokenizer.sps
index c5632b8c..e7e873dc 100755
--- a/tests/analysis/test-tokenizer.sps
+++ b/tests/analysis/test-tokenizer.sps
@@ -13,7 +13,7 @@
     (scheme-langserver analysis tokenizer))
 
 (test-begin "read ss")
-    (test-equal 2 (length (source-file->annotations "./run.ss")))
+    (test-equal 5 (length (source-file->annotations "./run.ss")))
 (test-end)
 
 (test-begin "read sps")