From a004be56b39ce48ba7e8530ecd5d1f6fc00a70d5 Mon Sep 17 00:00:00 2001 From: William Carroll Date: Sat, 30 Jul 2022 10:43:06 -0700 Subject: feat(wpcarro/emacs): Package symbol.el Not sure how useful this package is, *but* I'm packaging everything I have now, and then in a separate CL I can refactor and remove various libs. Change-Id: Id106539b19244ea1586198992c7ce0d65a0a242b Reviewed-on: https://cl.tvl.fyi/c/depot/+/6014 Reviewed-by: wpcarro Autosubmit: wpcarro Tested-by: BuildkiteCI --- users/wpcarro/emacs/.emacs.d/wpc/symbol.el | 48 ----------------------------- users/wpcarro/emacs/default.nix | 1 + users/wpcarro/emacs/pkgs/symbol/default.nix | 24 +++++++++++++++ users/wpcarro/emacs/pkgs/symbol/symbol.el | 38 +++++++++++++++++++++++ users/wpcarro/emacs/pkgs/symbol/tests.el | 22 +++++++++++++ 5 files changed, 85 insertions(+), 48 deletions(-) delete mode 100644 users/wpcarro/emacs/.emacs.d/wpc/symbol.el create mode 100644 users/wpcarro/emacs/pkgs/symbol/default.nix create mode 100644 users/wpcarro/emacs/pkgs/symbol/symbol.el create mode 100644 users/wpcarro/emacs/pkgs/symbol/tests.el diff --git a/users/wpcarro/emacs/.emacs.d/wpc/symbol.el b/users/wpcarro/emacs/.emacs.d/wpc/symbol.el deleted file mode 100644 index 79d665fa20..0000000000 --- a/users/wpcarro/emacs/.emacs.d/wpc/symbol.el +++ /dev/null @@ -1,48 +0,0 @@ -;;; symbol.el --- Library for working with symbols -*- lexical-binding: t -*- - -;; Author: William Carroll -;; Version: 0.0.1 -;; Package-Requires: ((emacs "24")) - -;;; Commentary: -;; Library for working with symbols. - -;;; Code: - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Dependencies -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -(require 'string) - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Library -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -;; Symbols -(defun symbol-as-string (callback x) - "Treat the symbol, X, as a string while applying CALLBACK to it. -Coerce back to a symbol on the way out." - (->> x - #'symbol-name - callback - #'intern)) - -(defun symbol-to-string (x) - "Map `X' into a string." - (string-<-symbol x)) - -(defun symbol-hookify (x) - "Append \"-hook\" to X when X is a symbol." - (symbol-as-string #'string-hookify x)) - -(defun symbol-ensure-hookified (x) - "Ensure that X has \"-hook\" appended to it when X is a symbol." - (symbol-as-string #'string-ensure-hookified x)) - -(defun symbol-instance? (x) - "Return t if X is a symbol." - (symbolp x)) - -(provide 'symbol) -;;; symbol.el ends here diff --git a/users/wpcarro/emacs/default.nix b/users/wpcarro/emacs/default.nix index 56779f5ac8..99b18d8f97 100644 --- a/users/wpcarro/emacs/default.nix +++ b/users/wpcarro/emacs/default.nix @@ -32,6 +32,7 @@ let set string struct + symbol zle ]) ++ diff --git a/users/wpcarro/emacs/pkgs/symbol/default.nix b/users/wpcarro/emacs/pkgs/symbol/default.nix new file mode 100644 index 0000000000..9334697e32 --- /dev/null +++ b/users/wpcarro/emacs/pkgs/symbol/default.nix @@ -0,0 +1,24 @@ +{ pkgs, depot, ... }: + +let + symbol = pkgs.callPackage + ({ emacsPackages }: + emacsPackages.trivialBuild { + pname = "symbol"; + version = "1.0.0"; + src = ./symbol.el; + packageRequires = [ ]; + }) + { }; + + emacs = (pkgs.emacsPackagesFor pkgs.emacs28).emacsWithPackages (epkgs: [ + symbol + ]); +in +symbol.overrideAttrs (_old: { + doCheck = true; + checkPhase = '' + ${emacs}/bin/emacs -batch \ + -l ert -l ${./tests.el} -f ert-run-tests-batch-and-exit + ''; +}) diff --git a/users/wpcarro/emacs/pkgs/symbol/symbol.el b/users/wpcarro/emacs/pkgs/symbol/symbol.el new file mode 100644 index 0000000000..4b16351831 --- /dev/null +++ b/users/wpcarro/emacs/pkgs/symbol/symbol.el @@ -0,0 +1,38 @@ +;;; symbol.el --- Library for working with symbols -*- lexical-binding: t -*- + +;; Author: William Carroll +;; Version: 0.0.1 +;; Package-Requires: ((emacs "24")) + +;;; Commentary: +;; Library for working with symbols. + +;;; Code: + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Library +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(defun symbol-to-string (symbol) + "Map `SYMBOL' into a string." + (symbol-name symbol)) + +(defun symbol-from-string (string) + "Map `STRING' into a symbol." + (intern string)) + +(defun symbol-as-string (f x) + "Treat the symbol, X, as a string while applying F to it. +Coerce back to a symbol on the way out." + (symbol-from-string (funcall f (symbol-to-string x)))) + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Predicates +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(defun symbol-instance? (x) + "Return t if X is a symbol." + (symbolp x)) + +(provide 'symbol) +;;; symbol.el ends here diff --git a/users/wpcarro/emacs/pkgs/symbol/tests.el b/users/wpcarro/emacs/pkgs/symbol/tests.el new file mode 100644 index 0000000000..b10362b162 --- /dev/null +++ b/users/wpcarro/emacs/pkgs/symbol/tests.el @@ -0,0 +1,22 @@ +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Dependencies +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(require 'ert) +(require 'symbol) + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Tests +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(ert-deftest symbol-to-string () + (should (string= "foo" (symbol-to-string 'foo)))) + +(ert-deftest symbol-from-string () + (should (eq 'foo (symbol-from-string "foo")))) + +(ert-deftest symbol-as-string () + (should (eq 'foo-hook + (symbol-as-string + (lambda (x) (format "%s-hook" x)) + 'foo)))) -- cgit 1.4.1