Merge pull request #31 from clojure-emacs/remove-a-el-part-2

Remove remaining a-list call, move a.el to be test-only

Author: plexus

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Unreleased
 
+## 1.0.1 (2021-09-27)
+
+- Remove remaining a.el usage
+
 ## 1.0.0 (2021-09-27)
 
 - Added a `:read-one` option to read/parse a single form at a time

parseclj-ast.el

@@ -27,7 +27,6 @@
 
 ;;; Code:
 
-(require 'a)
 (require 'seq)
 (require 'subr-x)
 (require 'parseclj-lex)

parseclj-lex.el

@@ -74,7 +74,7 @@ Tokens at a mimimum have these attributes
 - POS: the position in the input, starts from 1 (like point)
 
 Other ATTRIBUTES can be given as a flat list of key-value pairs."
-  (apply 'a-list :token-type type :form form :pos pos attributes))
+  (apply #'parseclj-alist :token-type type :form form :pos pos attributes))
 
 (defun parseclj-lex-error-token (pos &optional error-type)
   "Create a lexer error token starting at POS.

parseclj.el

@@ -31,8 +31,7 @@
 ;;; Code:
 
 (require 'map)
-(require 'parseclj-parser)
-(require 'parseclj-ast)
+(require 'seq)
 
 (defun parseclj-alist (&rest kvs)
   "Create an association list from the given keys and values KVS.
@@ -42,6 +41,9 @@ For example: (parseclj-alist :foo 123 :bar 456)"
   ;; (map-into kvs 'alist)
   (mapcar (lambda (kv) (cons (car kv) (cadr kv))) (seq-partition kvs 2)))
 
+(require 'parseclj-parser)
+(require 'parseclj-ast)
+
 (defun parseclj-hash-table (&rest kvs)
   "Create a hash table from the given keys and values KVS.
 Arguments are simply provided in sequence, rather than as lists

test/parseclj-ast-test.el

@@ -27,6 +27,7 @@
 
 ;;; Code
 
+(require 'a)
 (require 'ert)
 (require 'parseclj-ast)