Skip to content

allow custom indent size #1

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

allow custom indent size #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 10 additions & 0 deletions etc.scm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,3 +234,13 @@
(symbol< (typeof x) (typeof y))))

(define trace-level 0)

(define (accumulate op initial sequence)
(if (null? sequence)
initial
(op (car sequence)
(accumulate op initial (cdr sequence)))))

(define (add-indent-size . items)
(let ((indent-size 1))
(accumulate + indent-size items)))
36 changes: 18 additions & 18 deletions format.scm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@
(display "(")
(inline (car x))
(display " ")
(block (cadr x) (+ col 1 (width (car x)) 1))
(block (cadr x) (add-indent-size col (width (car x)) 1))
(display ")")))
(when (pair? (cdr xs))
(newline)
Expand Down Expand Up @@ -340,20 +340,20 @@
((memq (car x) '(begin collect))
(display "(")
(write (car x))
(args (cdr x) (add1 col)))
(args (cdr x) (add-indent-size col)))
((memq (car x) '(cond))
(display "(")
(write (car x))
(clauses (cdr x) (add1 col)))
(clauses (cdr x) (add-indent-size col)))

; 1 special arg
((and (length? 2 x)
(memq (car x) '(case match syntax-rules)))
(display "(")
(inline (car x))
(display " ")
(block (cadr x) (+ col 1 (width (car x)) 1))
(clauses (cddr x) (add1 col)))
(block (cadr x) (add-indent-size col (width (car x)) 1))
(clauses (cddr x) (add-indent-size col)))
((and (length? 2 x)
(or (defun? x)
(memq (car x)
Expand All @@ -367,14 +367,14 @@
(write (car x))
(display " ")
(inline (cadr x))
(args (cddr x) (add1 col)))
(args (cddr x) (add-indent-size col)))
((and (length? 2 x)
(memq (car x) '(do-until do-while if unless when)))
(display "(")
(write (car x))
(display " ")
(block (cadr x) (+ col 1 (width (car x)) 1))
(args (cddr x) (add1 col)))
(block (cadr x) (add-indent-size col (width (car x)) 1))
(args (cddr x) (add-indent-size col)))

; 2 special args
((and
Expand All @@ -387,7 +387,7 @@
(write (cadr x))
(display " ")
(inline (caddr x))
(args (cdddr x) (add1 col)))
(args (cdddr x) (add-indent-size col)))

; 3 special args
((and (length? 4 x)
Expand All @@ -400,7 +400,7 @@
(write (caddr x))
(display " ")
(inline (cadddr x))
(args (cddddr x) (add1 col)))
(args (cddddr x) (add-indent-size col)))

; Let
((and (length? 3 x)
Expand All @@ -409,29 +409,29 @@
(display "(")
(write (car x))
(display " (")
(bindings (cadr x) (+ col 1 (width (car x)) 2))
(args (cddr x) (add1 col)))
(bindings (cadr x) (add-indent-size col (width (car x)) 2))
(args (cddr x) (add-indent-size col)))
((and (length? 3 x)
(memq (car x) '(let)))
(display "(")
(write (car x))
(display " ")
(write (cadr x))
(display " (")
(bindings (caddr x) (+ col 1 (width (car x)) 1 (width (cadr x)) 2))
(args (cdddr x) (add1 col)))
(bindings (caddr x) (add-indent-size col (width (car x)) 1 (width (cadr x)) 2))
(args (cdddr x) (add-indent-size col)))

; Args inline
((and (not (memq (car x) '(and or)))
(every inline? x)
(< (+ col 1 (length x) (apply + (map width x))) 80))
(< (add-indent-size col (length x) (apply + (map width x))) 80))
(inline x))

; Args aligned with first
((and (length? 2 x)
(inline? (car x))
(every (lambda (y)
(< (+ col 1 (width (car x)) 1 (width y)) 80))
(< (add-indent-size col (width (car x)) 1 (width y)) 80))
(cdr x))
(cdr x))
(display "(")
Expand Down Expand Up @@ -477,8 +477,8 @@
(else
(indent col)
(display "(")
(block (car clause) (add1 col))
(args (cdr clause) (add1 col)))))
(block (car clause) (add-indent-size col))
(args (cdr clause) (add-indent-size col)))))
(display ")"))

(define (inline x)
Expand Down