summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbd <bdunahu@operationnull.com>2025-04-16 16:40:03 -0400
committerbd <bdunahu@operationnull.com>2025-04-16 16:40:03 -0400
commit76dca859f9a4c5e5575a3097d3d3a6f96d781258 (patch)
treec129a6d326a10f40e1a53144313d397b71eefba7
parent768ebe5c796d85d0262260c9a0b1f7aec28b8844 (diff)
remove tabs
-rw-r--r--src/emit.lisp4
-rw-r--r--src/parse.lisp6
-rw-r--r--t/parse.lisp46
3 files changed, 28 insertions, 28 deletions
diff --git a/src/emit.lisp b/src/emit.lisp
index f73d9be..85214c2 100644
--- a/src/emit.lisp
+++ b/src/emit.lisp
@@ -48,8 +48,8 @@ concatenated with TYPE."
(defun x (&rest lst)
(append lst
- ;; add a halt to the end of the instructions list
- (list (r "QUOT" (rr 0) (rr 0) (rr 0)))))
+ ;; add a halt to the end of the instructions list
+ (list (r "QUOT" (rr 0) (rr 0) (rr 0)))))
(defun r (mnemonic s1 s2 d)
(concatenate
diff --git a/src/parse.lisp b/src/parse.lisp
index bd8a1f8..4e9cd5c 100644
--- a/src/parse.lisp
+++ b/src/parse.lisp
@@ -54,7 +54,7 @@
(:lambda (e) (parse-integer (esrap:text (cddr e)) :radix 16)))
(esrap:defrule integer (and (esrap:? sign) (or binary-number octal-number
- hexadecimal-number decimal-number))
+ hexadecimal-number decimal-number))
(:destructure (s i)
(if (and s (string= s "-")) (- i) i)))
@@ -137,8 +137,8 @@ DESTRUCTURE-PATTERN is the list of non-terminals on the right side of the gramma
`(esrap:defrule ,name
(and ,(read-from-string (format nil "~A-m" name)) ,@(util:riffle (make-list pattern-size :initial-element 'space) destructure-pattern))
(:destructure (m ,@(util:riffle spaces vars))
- (declare (ignore ,@spaces))
- (list ,type-id m ,@(mapcar (lambda (x) (or (nth x vars) ''(emit::rr 0))) order))))))
+ (declare (ignore ,@spaces))
+ (list ,type-id m ,@(mapcar (lambda (x) (or (nth x vars) ''(emit::rr 0))) order))))))
(defrule-instr r-type-1 'emit::r (1 2 0) register register)
(defrule-instr r-type-2 'emit::r (0 1 2) register register)
diff --git a/t/parse.lisp b/t/parse.lisp
index 29c313d..2cb5b42 100644
--- a/t/parse.lisp
+++ b/t/parse.lisp
@@ -20,7 +20,7 @@
(test esrap-register-bases
(is (equal '(emit::p
- (emit::d)
+ (emit::d)
(emit::x
(emit::r "ADD" (emit::rr 10) (emit::rr 10) (emit::rr 10))))
(esrap:parse 'parse:str->ast (format nil ".DATA~%.TEXT~%~tADD $0O012 $0B1010 $0XA~%")))))
@@ -28,7 +28,7 @@
(test esrap-instr-all-type-r
(is (equal
'(emit::p
- (emit::d)
+ (emit::d)
(emit::x
(emit::r "ADDV" (emit::rr 1) (emit::rr 2) (emit::rr 3))
(emit::r "NOT" (emit::rr 4) (emit::rr 0) (emit::rr 5))
@@ -39,7 +39,7 @@
(test esrap-instr-all-type-i
(is (equal
'(emit::p
- (emit::d)
+ (emit::d)
(emit::x
(emit::i "LOADV" (emit::rr 8) (emit::rr 9) 1)
(emit::i "STORE" (emit::rr 3) (emit::rr 5) 3)
@@ -50,11 +50,11 @@
(test esrap-instr-type-all-type-j
(is (equal
'(emit::p
- (emit::d)
+ (emit::d)
(emit::x
- (emit::j "JMP" (emit::rr 0) (emit::l "FOO"))
- (emit::j "JRL" (emit::rr 0) (emit::l "FOO" 8))
- (emit::j "RET" (emit::rr 0) 0)
+ (emit::j "JMP" (emit::rr 0) (emit::l "FOO"))
+ (emit::j "JRL" (emit::rr 0) (emit::l "FOO" 8))
+ (emit::j "RET" (emit::rr 0) 0)
(emit::j "PUSH" (emit::rr 5) 0)))
(esrap:parse 'parse:str->ast (format nil ".DATA~%.TEXT~%~tJMP FOO
~tJRL FOO~%~tRET~%~tPUSH $5~%")))))
@@ -62,7 +62,7 @@
(test esrap-instr-type-i-negative
(is (equal
'(emit::p
- (emit::d)
+ (emit::d)
(emit::x
(emit::i "LOADV" (emit::rr 8) (emit::rr 3) -3)))
(esrap:parse 'parse:str->ast (format nil ".DATA~%.TEXT~%~tLOADV $8 -3($3)~%")))))
@@ -70,7 +70,7 @@
(test esrap-instr-type-i-vars
(is (equal
'(emit::p
- (emit::d)
+ (emit::d)
(emit::x
(emit::i "LOADV" (emit::rr 8) (emit::rr 4) 2)
(emit::i "STORE" (emit::rr 1) (emit::rr 5) 2)))
@@ -80,7 +80,7 @@
(test esrap-instr-type-all-lazy-spaces
(is (equal
'(emit::p
- (emit::d)
+ (emit::d)
(emit::x
(emit::j "JMP" (emit::rr 0) (emit::l "FOO"))
(emit::j "JRL" (emit::rr 0) (emit::l "FOO" 15))
@@ -91,10 +91,10 @@ JRL FOO~t~%PUSH $5~%")))))
(test esrap-instr-type-comments
(is (equal
'(emit::p
- (emit::d)
+ (emit::d)
(emit::x
- (emit::j "JMP" (emit::rr 0) (emit::l "FOO"))
- (emit::j "JRL" (emit::rr 0) (emit::l "FOO" 18))
+ (emit::j "JMP" (emit::rr 0) (emit::l "FOO"))
+ (emit::j "JRL" (emit::rr 0) (emit::l "FOO" 18))
(emit::j "PUSH" (emit::rr 5) 0)))
(esrap:parse 'parse:str->ast (format nil ".DATA~%.TEXT;; dot dot dot
~tJMP FOO ;; this does things
@@ -108,7 +108,7 @@ JRL FOO~t~%PUSH $5~%")))))
'(emit::p
(emit::d
1)
- (emit::x))
+ (emit::x))
(esrap:parse 'parse:str->ast (format nil ".DATA~%~tA 1~%.TEXT~%")))))
(test esrap-data-loaded
@@ -116,7 +116,7 @@ JRL FOO~t~%PUSH $5~%")))))
'(emit::p
(emit::d
1 2 3 4 5 6 7 8)
- (emit::x))
+ (emit::x))
(esrap:parse 'parse:str->ast (format nil ".DATA~%~tB 1 2 3 4 5 6 7 8
.TEXT~%")))))
@@ -125,7 +125,7 @@ JRL FOO~t~%PUSH $5~%")))))
'(emit::p
(emit::d
5 6 7 8 4 3 5)
- (emit::x))
+ (emit::x))
(esrap:parse 'parse:str->ast (format nil ".DATA~%~tC 5 6 7 8~%~tD 4
~tE 3 5~%.TEXT~%")))))
@@ -134,18 +134,18 @@ JRL FOO~t~%PUSH $5~%")))))
'(emit::p
(emit::d
5 6 7 8 4 3 5)
- (emit::x))
+ (emit::x))
(esrap:parse 'parse:str->ast (format nil "~%~t.DATA~t~%F 5 6 7 8~t~%G 4
H 3 5~%.TEXT~%")))))
(test esrap-negative-ints
(is (equal
- '(emit::p
- (emit::d
- -1)
- (emit::x
- (emit::i "LOADV" (emit::rr -8) (emit::rr -3) -3)))
- (esrap:parse 'parse:str->ast (format nil ".DATA~%~tm -1~%.TEXT~%~tLOADV $-8 -3($-3)~%")))))
+ '(emit::p
+ (emit::d
+ -1)
+ (emit::x
+ (emit::i "LOADV" (emit::rr -8) (emit::rr -3) -3)))
+ (esrap:parse 'parse:str->ast (format nil ".DATA~%~tm -1~%.TEXT~%~tLOADV $-8 -3($-3)~%")))))
(test esrap-data-full
(is (equal