Compare commits
2 Commits
1e85dd224a
...
f512e0aced
| Author | SHA1 | Date | |
|---|---|---|---|
| f512e0aced | |||
| 98fbba03cb |
@@ -7,7 +7,6 @@
|
|||||||
#:use-module (gulie config)
|
#:use-module (gulie config)
|
||||||
#:use-module (gulie engine)
|
#:use-module (gulie engine)
|
||||||
#:use-module (gulie rule)
|
#:use-module (gulie rule)
|
||||||
#:use-module (gulie diagnostic)
|
|
||||||
#:export (main))
|
#:export (main))
|
||||||
|
|
||||||
(define version "0.1.0")
|
(define version "0.1.0")
|
||||||
|
|||||||
@@ -6,9 +6,7 @@
|
|||||||
|
|
||||||
(define-module (gulie compiler)
|
(define-module (gulie compiler)
|
||||||
#:use-module (system base compile)
|
#:use-module (system base compile)
|
||||||
#:use-module (system base message)
|
|
||||||
#:use-module (ice-9 regex)
|
#:use-module (ice-9 regex)
|
||||||
#:use-module (ice-9 match)
|
|
||||||
#:use-module (srfi srfi-1)
|
#:use-module (srfi srfi-1)
|
||||||
#:use-module (gulie diagnostic)
|
#:use-module (gulie diagnostic)
|
||||||
#:export (compile-and-capture-warnings))
|
#:export (compile-and-capture-warnings))
|
||||||
|
|||||||
@@ -4,7 +4,6 @@
|
|||||||
;;; merges with built-in defaults, and provides config accessors.
|
;;; merges with built-in defaults, and provides config accessors.
|
||||||
|
|
||||||
(define-module (gulie config)
|
(define-module (gulie config)
|
||||||
#:use-module (ice-9 rdelim)
|
|
||||||
#:use-module (srfi srfi-1)
|
#:use-module (srfi srfi-1)
|
||||||
#:export (default-config
|
#:export (default-config
|
||||||
load-config
|
load-config
|
||||||
@@ -20,7 +19,7 @@
|
|||||||
generate-template))
|
generate-template))
|
||||||
|
|
||||||
(define default-config
|
(define default-config
|
||||||
'((line-length . 80)
|
'((line-length . 118)
|
||||||
(indent . 2)
|
(indent . 2)
|
||||||
(max-blank-lines . 2)
|
(max-blank-lines . 2)
|
||||||
(enable . ())
|
(enable . ())
|
||||||
@@ -71,7 +70,7 @@
|
|||||||
(if (null? default) #f (car default)))))
|
(if (null? default) #f (car default)))))
|
||||||
|
|
||||||
(define (config-line-length config)
|
(define (config-line-length config)
|
||||||
(or (config-ref config 'line-length) 80))
|
(or (config-ref config 'line-length) 118))
|
||||||
|
|
||||||
(define (config-indent-width config)
|
(define (config-indent-width config)
|
||||||
(or (config-ref config 'indent) 2))
|
(or (config-ref config 'indent) 2))
|
||||||
@@ -111,15 +110,6 @@ lists are replaced, not appended."
|
|||||||
(lp (assq-set! (list-copy result) (car pair) (cdr pair))
|
(lp (assq-set! (list-copy result) (car pair) (cdr pair))
|
||||||
(cdr pairs))))))
|
(cdr pairs))))))
|
||||||
|
|
||||||
(define (find-config-file start-dir)
|
|
||||||
"Search upward from START-DIR for .gulie.sexp. Returns path or #f."
|
|
||||||
(let lp ((dir start-dir))
|
|
||||||
(let ((candidate (string-append dir "/.gulie.sexp")))
|
|
||||||
(cond
|
|
||||||
((file-exists? candidate) candidate)
|
|
||||||
((string=? dir "/") #f)
|
|
||||||
(else (lp (dirname dir)))))))
|
|
||||||
|
|
||||||
(define (generate-template port)
|
(define (generate-template port)
|
||||||
"Write a template .gulie.sexp to PORT."
|
"Write a template .gulie.sexp to PORT."
|
||||||
(display ";;; gulie configuration\n" port)
|
(display ";;; gulie configuration\n" port)
|
||||||
|
|||||||
@@ -5,7 +5,6 @@
|
|||||||
|
|
||||||
(define-module (gulie cst)
|
(define-module (gulie cst)
|
||||||
#:use-module (srfi srfi-9)
|
#:use-module (srfi srfi-9)
|
||||||
#:use-module (srfi srfi-1)
|
|
||||||
#:use-module (srfi srfi-11)
|
#:use-module (srfi srfi-11)
|
||||||
#:use-module (gulie tokenizer)
|
#:use-module (gulie tokenizer)
|
||||||
#:export (<cst-node>
|
#:export (<cst-node>
|
||||||
|
|||||||
@@ -7,11 +7,9 @@
|
|||||||
(define-module (gulie engine)
|
(define-module (gulie engine)
|
||||||
#:use-module (ice-9 ftw)
|
#:use-module (ice-9 ftw)
|
||||||
#:use-module (ice-9 rdelim)
|
#:use-module (ice-9 rdelim)
|
||||||
#:use-module (ice-9 regex)
|
|
||||||
#:use-module (srfi srfi-1)
|
#:use-module (srfi srfi-1)
|
||||||
#:use-module (gulie diagnostic)
|
#:use-module (gulie diagnostic)
|
||||||
#:use-module (gulie rule)
|
#:use-module (gulie rule)
|
||||||
#:use-module (gulie config)
|
|
||||||
#:use-module (gulie suppression)
|
#:use-module (gulie suppression)
|
||||||
#:export (lint-file
|
#:export (lint-file
|
||||||
lint-files
|
lint-files
|
||||||
|
|||||||
@@ -32,7 +32,7 @@
|
|||||||
;;; line-length — line exceeds maximum width
|
;;; line-length — line exceeds maximum width
|
||||||
|
|
||||||
(define (config-max-line-length config)
|
(define (config-max-line-length config)
|
||||||
(or (assq-ref config 'line-length) 80))
|
(or (assq-ref config 'line-length) 118))
|
||||||
|
|
||||||
(register-rule!
|
(register-rule!
|
||||||
(make-rule
|
(make-rule
|
||||||
|
|||||||
@@ -6,7 +6,6 @@
|
|||||||
|
|
||||||
(define-module (gulie suppression)
|
(define-module (gulie suppression)
|
||||||
#:use-module (ice-9 regex)
|
#:use-module (ice-9 regex)
|
||||||
#:use-module (ice-9 rdelim)
|
|
||||||
#:use-module (srfi srfi-1)
|
#:use-module (srfi srfi-1)
|
||||||
#:use-module (gulie diagnostic)
|
#:use-module (gulie diagnostic)
|
||||||
#:export (parse-suppressions
|
#:export (parse-suppressions
|
||||||
@@ -42,8 +41,7 @@
|
|||||||
(define (parse-suppressions text)
|
(define (parse-suppressions text)
|
||||||
"Parse suppression directives from source TEXT.
|
"Parse suppression directives from source TEXT.
|
||||||
Returns a list of (line rules kind) entries."
|
Returns a list of (line rules kind) entries."
|
||||||
(let ((lines (string-split text #\newline))
|
(let ((lines (string-split text #\newline)))
|
||||||
(result '()))
|
|
||||||
(let lp ((lines lines) (line-num 1) (acc '()))
|
(let lp ((lines lines) (line-num 1) (acc '()))
|
||||||
(if (null? lines)
|
(if (null? lines)
|
||||||
(reverse acc)
|
(reverse acc)
|
||||||
|
|||||||
@@ -37,7 +37,7 @@
|
|||||||
'()
|
'()
|
||||||
((rule-check-proc rule) "f.scm" 1 "(define x 42)" '()))
|
((rule-check-proc rule) "f.scm" 1 "(define x 42)" '()))
|
||||||
|
|
||||||
(let* ((long-line (make-string 81 #\x))
|
(let* ((long-line (make-string 119 #\x))
|
||||||
(diags ((rule-check-proc rule) "f.scm" 1 long-line '())))
|
(diags ((rule-check-proc rule) "f.scm" 1 long-line '())))
|
||||||
(test-equal "long line detected" 1 (length diags)))
|
(test-equal "long line detected" 1 (length diags)))
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user