From 1c90d9ae3b84f62168337f3c8b1c3854f6198330 Mon Sep 17 00:00:00 2001 From: riton Date: Mon, 14 Jul 2025 21:45:47 +0300 Subject: More refactoring of tests and packages Squashed commit of the following: commit c4659d8be4d664ba7fd4b59d613536f2368cff0e Author: riton Date: Mon Jul 14 21:44:48 2025 +0300 fix package name typo commit ec802339b838d059f4bc9e4da7cc370ab4d91a46 Author: riton Date: Mon Jul 14 21:43:42 2025 +0300 seperate deftest from test instances commit 92d20e0b8405a4a51f01ff65f8bd81f4d25c1e21 Author: riton Date: Mon Jul 14 21:29:47 2025 +0300 make a test system definition commit 125e5fe1e8c07230f32e762273c5c0dd259209e6 Author: riton Date: Mon Jul 14 00:39:09 2025 +0300 compiler macro of as-token commit 0e39c32097783aa39e3fed479bb85b412065f597 Author: riton Date: Mon Jul 14 00:21:46 2025 +0300 define new packages --- src/lexer-test.lisp | 120 ---------------------------------------------------- 1 file changed, 120 deletions(-) delete mode 100644 src/lexer-test.lisp (limited to 'src/lexer-test.lisp') diff --git a/src/lexer-test.lisp b/src/lexer-test.lisp deleted file mode 100644 index c6f131a..0000000 --- a/src/lexer-test.lisp +++ /dev/null @@ -1,120 +0,0 @@ -(in-package :monkey) - -(defparameter *tests* (make-hash-table)) -(defparameter *test-name* nil) - -(eval-always - (defun make-tokens (&rest tokens) - (loop :for token :in tokens - :if (consp token) - :collect (make-token (car token) (cadr token)) - :if (typep token 'token-type) - :collect (as-token token))) - - (defun test-lexer (str expected-tokens) - (labels ((expected-next () - (prog1 (car expected-tokens) - (setf expected-tokens (cdr expected-tokens))))) - (format t "Testing ~s..." *test-name*) - (let* ((lexer (make-lexer str)) - (tokens (lexer-tokens lexer)) - (expected-token (expected-next)) - (ok t)) - (loop :for token :in tokens - :for i :from 1 - :if (not (token= token expected-token)) - :do (format t "~&token ~d: expected ~a but got ~a~%" i expected-token token) - (setf ok nil) - :else :do (setf expected-token (expected-next))) - (unless (null ok) - (format t " ok~%"))))) - - (defun tokenize (designator) - (cond ((typep designator 'token-type) - (as-token designator)) - ((stringp designator) - (make-token :t/ident designator)) - ((integerp designator) - (make-token :t/int (princ-to-string designator))) - ((characterp designator) - (case designator - (#\( (as-token :t/lparen)) - (#\) (as-token :t/rparen)) - (#\; (as-token :t/semicolon)) - (#\{ (as-token :t/lbrace)) - (#\} (as-token :t/rbrace)))) - ((consp designator) - (apply #'make-token designator)))) - - (defun define-lexer-test (name string tokens) - `(progn - (setf (gethash ',name *tests*) t) - (defun ,name () - (let ((*test-name* ',name)) - (test-lexer ,string (list ,@(mapcar (lambda (tok) `(tokenize ',tok)) - tokens))))))) - - (defmacro deftest ((type &optional name) &body args) - (case type - (:lexer (apply #'define-lexer-test - (or name (gensym "LEXER-TEST")) - args))))) - -(defun run-tests () - (let ((ok t) key val) - (with-hash-table-iterator (it *tests*) - (loop :do (multiple-value-setq (ok key val) (it)) - :while ok - :do (funcall (symbol-function key)))))) - -(deftest (:lexer test-1) - "=+(){},;" - (:t/= :t/+ :t/lparen :t/rparen - :t/lbrace :t/rbrace :t/comma :t/semicolon :t/eof)) - -(deftest (:lexer test-2) - "let five = 5; -let ten = 10; - -let add = fn(x, y) { - x + y; -}; - -let result = add(five, ten); -!-/*; -5 < 10 > 5; - -if (5 < 10) { - return true; -} else { - return false; -} -10 == 10; -10 != 9; -" - (:t/let "five" :t/= 5 #\; - :t/let "ten" :t/= 10 #\; - :t/let "add" :t/= :t/function #\( "x" :t/comma "y" #\) #\{ - "x" :t/+ "y" #\; - #\} #\; - :t/let "result" :t/= "add" #\( "five" :t/comma "ten" #\) #\; - :t/! :t/- :t// :t/* #\; - 5 :t/< 10 :t/> 5 #\; - :t/if #\( 5 :t/< 10 #\) #\{ - :t/return :t/true #\; - #\} :t/else #\{ - :t/return :t/false #\; - #\} - 10 :t/== 10 #\; - 10 :t/!= 9 #\; - :t/eof)) - - -(deftest (:lexer test-fail) - "abc gf 5 fn =+(){},;" - (:t/= :t/+ :t/lparen :t/rparen - :t/lbrace :t/rbrace :t/comma :t/semicolon :t/eof)) - -(deftest (:lexer test-fail-2) - "let abc x + 5;" - (:t/let "abc" :t/= "x" :t/+ 5 :t/eof)) -- cgit v1.2.3