diff options
| author | bd <bdunahu@operationnull.com> | 2025-04-09 09:28:22 -0400 |
|---|---|---|
| committer | bd <bdunahu@operationnull.com> | 2025-04-09 09:28:22 -0400 |
| commit | 4df084d3e2785412eb086fb02ac10be5def695d1 (patch) | |
| tree | 3738442add750c208c2842df3446733da940c996 | |
| parent | 8ceaf87c43d412b758bb7562364f7ae8bee913ae (diff) | |
Remove trivia
| -rw-r--r-- | README.md | 1 | ||||
| -rw-r--r-- | rva.asd | 3 | ||||
| -rw-r--r-- | src/parse.lisp | 9 |
3 files changed, 6 insertions, 7 deletions
@@ -10,7 +10,6 @@ A common-lisp implementation (SBCL) and the following libraries are required to - ASDF (tested with v3.3.7) - fiveam (tested with v3.3.7) - clingon (tested with v0.5.0-1.f2a730f) -- trivia (tested with v0.1-0.8b406c3) ## To run @@ -9,8 +9,7 @@ :description "Assembler for the RISC-V[ECTOR] mini-ISA." :source-control (:git "git@github.com:bdunahu/rva.git") :depends-on (:uiop - :clingon - :trivia) + :clingon) :components ((:module "src" :serial t :components ((:file "package") diff --git a/src/parse.lisp b/src/parse.lisp index bd50a23..37415c8 100644 --- a/src/parse.lisp +++ b/src/parse.lisp @@ -48,10 +48,11 @@ label, and pushed onto the stack with the line index. Note that this function is intended to be called using mapcar, so that labels can be added to a map and otherwise removed from processing." - (trivia:match line - ((list (type string) 'lex::colon) - (progn (push (cons (read-from-string (car line)) i) label-loc) nil)) - (_ (progn (incf i) line))))) + (if (and (equal 2 (length line)) + (stringp (car line)) + (equal 'lex::colon (cadr line))) + (progn (push (cons (read-from-string (car line)) i) label-loc) nil) + (progn (incf i) line)))) (defun extract-instruction (line i) "Given instruction LINE, determines the expected type format and passes |