commit 50925070a82c293c04ea88a7a2abdbd989471e7e (patch)
parent ae08188772f7d552a0608c4d81b9af87e33c8eab
Author: Alex Karle <alex@alexkarle.com>
Date: Sun, 2 Oct 2022 15:11:49 -0400
cleanup: reindent using vim's autoindent for lisp
Diffstat:
| M | fisl.scm | | | 14 | +++++++------- |
| M | scanner.scm | | | 230 | ++++++++++++++++++++++++++++++++++++++++---------------------------------------- |
| M | util.scm | | | 32 | ++++++++++++++++---------------- |
3 files changed, 138 insertions(+), 138 deletions(-)
diff --git a/fisl.scm b/fisl.scm
@@ -4,10 +4,10 @@
(load "util.scm")
(import (chicken io)
- (chicken base)
- (chicken format)
- scanner
- util)
+ (chicken base)
+ (chicken format)
+ scanner
+ util)
(define (run code fname)
(let ((exit-code 0))
@@ -19,13 +19,13 @@
(let ((l (read-line)))
(if (not (eof-object? l))
(begin
- (run l "repl")
- (run-prompt))
+ (run l "repl")
+ (run-prompt))
(exit 0))))
(define (run-file fname)
(call-with-input-file fname (lambda (p)
- (exit (run (read-string #f p) fname)))))
+ (exit (run (read-string #f p) fname)))))
(define (main args)
(let ((argc (length args)))
diff --git a/scanner.scm b/scanner.scm
@@ -2,132 +2,132 @@
(module scanner (scan)
-(import scheme
- util
- (chicken base)
- (chicken format))
+ (import scheme
+ util
+ (chicken base)
+ (chicken format))
-(define (make-token type lexeme literal line)
- `((type ,type)
- (lexeme ,lexeme)
- (literal ,literal)
- (line ,line)))
+ (define (make-token type lexeme literal line)
+ `((type ,type)
+ (lexeme ,lexeme)
+ (literal ,literal)
+ (line ,line)))
-(define (is-digit c)
- (and c (char<=? #\0 c) (char>=? #\9 c)))
+ (define (is-digit c)
+ (and c (char<=? #\0 c) (char>=? #\9 c)))
-(define (is-alpha c)
- (and c
- (or
- (eq? c #\_)
- (and (char<=? #\a c) (char>=? #\z c))
- (and (char<=? #\A c) (char>=? #\Z c)))))
+ (define (is-alpha c)
+ (and c
+ (or
+ (eq? c #\_)
+ (and (char<=? #\a c) (char>=? #\z c))
+ (and (char<=? #\A c) (char>=? #\Z c)))))
-(define (get-keyword k)
- (let ((kpair (assoc k '(("and" AND)
- ("class" CLASS)
- ("else" ELSE)
- ("false" FALSE)
- ("for" FOR)
- ("fun" FUN)
- ("if" IF)
- ("nil" NIL)
- ("or" OR)
- ("print" PRINT)
- ("return" RETURN)
- ("super" SUPER)
- ("this" THIS)
- ("true" TRUE)
- ("var" VAR)
- ("while" WHILE)))))
- (if kpair (cadr kpair) #f)))
+ (define (get-keyword k)
+ (let ((kpair (assoc k '(("and" AND)
+ ("class" CLASS)
+ ("else" ELSE)
+ ("false" FALSE)
+ ("for" FOR)
+ ("fun" FUN)
+ ("if" IF)
+ ("nil" NIL)
+ ("or" OR)
+ ("print" PRINT)
+ ("return" RETURN)
+ ("super" SUPER)
+ ("this" THIS)
+ ("true" TRUE)
+ ("var" VAR)
+ ("while" WHILE)))))
+ (if kpair (cadr kpair) #f)))
-(define (is-alnum c)
- (and c (or (is-alpha c) (is-digit c))))
+ (define (is-alnum c)
+ (and c (or (is-alpha c) (is-digit c))))
-(define (scan src fname)
- (define (peek i)
- ; safe string-ref
- (if (< i (string-length src))
- (string-ref src i)
- #f))
+ (define (scan src fname)
+ (define (peek i)
+ ; safe string-ref
+ (if (< i (string-length src))
+ (string-ref src i)
+ #f))
- (define (get-tokens s i line in)
- ; Gets all tokens after 'start', tracks state in i (current char), line, in
- (define (tok type s2 i2)
- ; Helper to make a token, cons it to our list, and recurse with fresh state
- (let ((text (substring src s2 (add1 i2))))
- (let ((tok (cond
- ((eq? type 'STRING) (make-token type text (substring src (add1 s2) i2) line))
- ((eq? type 'NUMBER) (make-token type text (string->number text) line))
- ((eq? type 'IDENTIFIER)
- (let ((k (get-keyword text)))
- (if k
- (make-token k text #f line)
- (make-token 'IDENTIFIER text #f line))))
- (else (make-token type text #f line)))))
- (cons tok (get-tokens (add1 i2) (add1 i2) line #f)))))
+ (define (get-tokens s i line in)
+ ; Gets all tokens after 'start', tracks state in i (current char), line, in
+ (define (tok type s2 i2)
+ ; Helper to make a token, cons it to our list, and recurse with fresh state
+ (let ((text (substring src s2 (add1 i2))))
+ (let ((tok (cond
+ ((eq? type 'STRING) (make-token type text (substring src (add1 s2) i2) line))
+ ((eq? type 'NUMBER) (make-token type text (string->number text) line))
+ ((eq? type 'IDENTIFIER)
+ (let ((k (get-keyword text)))
+ (if k
+ (make-token k text #f line)
+ (make-token 'IDENTIFIER text #f line))))
+ (else (make-token type text #f line)))))
+ (cons tok (get-tokens (add1 i2) (add1 i2) line #f)))))
- (define (next l2)
- ; Helper to iterate while keeping state
- (get-tokens s (add1 i) l2 in))
+ (define (next l2)
+ ; Helper to iterate while keeping state
+ (get-tokens s (add1 i) l2 in))
- (let ((c (peek i)))
- (if (and (not in) (not c))
- (list (make-token 'EOF "" #f line))
- (cond
- ((eq? in 'comment) (if (or (not c) (eq? #\newline c))
+ (let ((c (peek i)))
+ (if (and (not in) (not c))
+ (list (make-token 'EOF "" #f line))
+ (cond
+ ((eq? in 'comment) (if (or (not c) (eq? #\newline c))
(get-tokens (add1 i) (add1 i) (add1 line) #f)
(next line)))
- ((eq? in 'string)
- (cond
- ((not c) (err (format "~A:~A:unterminated string" fname line)))
- ((eq? #\" c) (tok 'STRING s i))
- ((eq? #\newline c) (next (add1 line)))
- (else (next line))))
- ((eq? in 'number)
- (cond
- ((is-digit c) (next line))
- ((eq? #\. c) (get-tokens s (add1 i) line 'decimal))
- (else (tok 'NUMBER s (sub1 i)))))
- ((eq? in 'decimal)
- (cond
- ((is-digit c) (next line))
- (else (tok 'NUMBER s (sub1 i)))))
- ((eq? in 'alpha)
- (cond
- ((is-alnum c) (next line))
- (else (tok 'IDENTIFIER s (sub1 i)))))
- ((eq? in '=) (if (eq? #\= c) (tok 'EQUAL_EQUAL s i) (tok 'EQUAL s s)))
- ((eq? in '>) (if (eq? #\> c) (tok 'GREATER_EQUAL s i) (tok 'GREATER s s)))
- ((eq? in '<) (if (eq? #\< c) (tok 'LESS_EQUAL s i) (tok 'LESS s s)))
- ((eq? in '!) (if (eq? #\= c) (tok 'BANG_EQUAL s i) (tok 'BANG s s)))
- ((eq? in '/) (if (eq? #\/ c) (get-tokens s (add1 i) line 'comment) (tok 'SLASH s s)))
- (else (cond
- ((eq? #\( c) (tok 'LEFT_PAREN s s))
- ((eq? #\) c) (tok 'RIGHT_PAREN s s))
- ((eq? #\{ c) (tok 'LEFT_BRACE s s))
- ((eq? #\} c) (tok 'RIGHT_BRACE s s))
- ((eq? #\, c) (tok 'COMMA s s))
- ((eq? #\. c) (tok 'DOT s s))
- ((eq? #\- c) (tok 'MINUS s s))
- ((eq? #\+ c) (tok 'PLUS s s))
- ((eq? #\; c) (tok 'SEMICOLON s s))
- ((eq? #\* c) (tok 'STAR s s))
- ((eq? #\! c) (get-tokens s (add1 i) line '!))
- ((eq? #\= c) (get-tokens s (add1 i) line '=))
- ((eq? #\< c) (get-tokens s (add1 i) line '<))
- ((eq? #\> c) (get-tokens s (add1 i) line '>))
- ((eq? #\/ c) (get-tokens s (add1 i) line '/))
- ((eq? #\" c) (get-tokens s (add1 i) line 'string))
- ((is-digit c) (get-tokens s (add1 i) line 'number))
- ((is-alpha c) (get-tokens s (add1 i) line 'alpha))
- ((eq? #\space c) (get-tokens (add1 i) (add1 i) line #f))
- ((eq? #\tab c) (get-tokens (add1 i) (add1 i) line #f))
- ((eq? #\newline c) (get-tokens (add1 i) (add1 i) (add1 line) #f))
- (else (err (format "~A:~A:unexpected character: ~A" fname 0 c)) #f)))))))
+ ((eq? in 'string)
+ (cond
+ ((not c) (err (format "~A:~A:unterminated string" fname line)))
+ ((eq? #\" c) (tok 'STRING s i))
+ ((eq? #\newline c) (next (add1 line)))
+ (else (next line))))
+ ((eq? in 'number)
+ (cond
+ ((is-digit c) (next line))
+ ((eq? #\. c) (get-tokens s (add1 i) line 'decimal))
+ (else (tok 'NUMBER s (sub1 i)))))
+ ((eq? in 'decimal)
+ (cond
+ ((is-digit c) (next line))
+ (else (tok 'NUMBER s (sub1 i)))))
+ ((eq? in 'alpha)
+ (cond
+ ((is-alnum c) (next line))
+ (else (tok 'IDENTIFIER s (sub1 i)))))
+ ((eq? in '=) (if (eq? #\= c) (tok 'EQUAL_EQUAL s i) (tok 'EQUAL s s)))
+ ((eq? in '>) (if (eq? #\> c) (tok 'GREATER_EQUAL s i) (tok 'GREATER s s)))
+ ((eq? in '<) (if (eq? #\< c) (tok 'LESS_EQUAL s i) (tok 'LESS s s)))
+ ((eq? in '!) (if (eq? #\= c) (tok 'BANG_EQUAL s i) (tok 'BANG s s)))
+ ((eq? in '/) (if (eq? #\/ c) (get-tokens s (add1 i) line 'comment) (tok 'SLASH s s)))
+ (else (cond
+ ((eq? #\( c) (tok 'LEFT_PAREN s s))
+ ((eq? #\) c) (tok 'RIGHT_PAREN s s))
+ ((eq? #\{ c) (tok 'LEFT_BRACE s s))
+ ((eq? #\} c) (tok 'RIGHT_BRACE s s))
+ ((eq? #\, c) (tok 'COMMA s s))
+ ((eq? #\. c) (tok 'DOT s s))
+ ((eq? #\- c) (tok 'MINUS s s))
+ ((eq? #\+ c) (tok 'PLUS s s))
+ ((eq? #\; c) (tok 'SEMICOLON s s))
+ ((eq? #\* c) (tok 'STAR s s))
+ ((eq? #\! c) (get-tokens s (add1 i) line '!))
+ ((eq? #\= c) (get-tokens s (add1 i) line '=))
+ ((eq? #\< c) (get-tokens s (add1 i) line '<))
+ ((eq? #\> c) (get-tokens s (add1 i) line '>))
+ ((eq? #\/ c) (get-tokens s (add1 i) line '/))
+ ((eq? #\" c) (get-tokens s (add1 i) line 'string))
+ ((is-digit c) (get-tokens s (add1 i) line 'number))
+ ((is-alpha c) (get-tokens s (add1 i) line 'alpha))
+ ((eq? #\space c) (get-tokens (add1 i) (add1 i) line #f))
+ ((eq? #\tab c) (get-tokens (add1 i) (add1 i) line #f))
+ ((eq? #\newline c) (get-tokens (add1 i) (add1 i) (add1 line) #f))
+ (else (err (format "~A:~A:unexpected character: ~A" fname 0 c)) #f)))))))
- (get-tokens 0 0 1 #f))
-) ; end of module
+ (get-tokens 0 0 1 #f))
+ ) ; end of module
diff --git a/util.scm b/util.scm
@@ -1,21 +1,21 @@
(module util (die get err)
-(import scheme
- (chicken base)
- (chicken io)
- (chicken format))
+ (import scheme
+ (chicken base)
+ (chicken io)
+ (chicken format))
-(define (err str)
- (fprintf (current-error-port) "~A\n" str))
+ (define (err str)
+ (fprintf (current-error-port) "~A\n" str))
-(define (die str)
- (err str)
- (exit 1))
+ (define (die str)
+ (err str)
+ (exit 1))
-(define (get assoc-arr key)
- ;; fetch from assoc array and error if key not found
- (let ((tup (assoc key assoc-arr)))
- (if tup
- (cadr tup)
- (error (format "bad key ~A" key)))))
+ (define (get assoc-arr key)
+ ;; fetch from assoc array and error if key not found
+ (let ((tup (assoc key assoc-arr)))
+ (if tup
+ (cadr tup)
+ (error (format "bad key ~A" key)))))
-) ; end of module
+ ) ; end of module
