First Elisp version of lisp/shorthand.el, failing some tests

* lisp/shorthand.el: New file

* test/lisp/shorthand-tests.el: New file

diff --git a/lisp/shorthand.el b/lisp/shorthand.el
new file mode 100644 (file)
index 0000000..54c3412
--- /dev/null
+++ b/lisp/shorthand.el
@@ -0,0 +1,114 @@
+;;; shorthand.el --- namespacing system  -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2020  Free Software Foundation
+
+;; Author: João Távora <joaotavora@gmail.com>
+;; Keywords: languages, lisp
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Simple-minded namespacing in Emacs:
+
+;; 1. Do this on an Emacs you don't care about, since this advises basic
+;;    functions;
+;; 2. Load `shorthand.el` (or byte-compile and load it);
+;; 3. Construct an example user of this library.
+;;
+;;    magnar-string.el is constructed by taking s.el, renaming it to
+;;    magnar-string.el, and then appending this to the end of the file:
+;;
+;;    ;;; magnar-string.el ends here,
+;;    Local Variables:
+;;    shorthand-shorthands: (("^s-" . "magnar-string-"))
+;;    End:
+;;
+;; 4. Load `magnar-string.el` or byte-compile it and load `magnar-string.elc`;
+;; 5. Try C-h f and check there's no "s-" pollution; Not even the `s-`
+;;    symbols are interned.  All the relevant functions are namespaced
+;;    under "magnar-string-";
+;; 6. Open test.el, and play around there.  Open test2.el and play around
+;;    with magnar-string.el under a different "mstring-" prefix;
+;; 7. Evaluating code should work.  Eldoc should also work.  Xref (`M-.`)
+;;    is broken.  Anything else might breaks spectacularly;
+
+;; Read `shorthand.el`: it's less than 50 loc.  The idea is to keep only
+;; one obarray, but instruments `read` to not pollute it with symbols
+;; that with the shorthands for other longer named symbols.
+
+;;; Code:
+
+(require 'cl-lib)
+
+(defvar shorthand-shorthands nil)
+(put 'shorthand-shorthands 'safe-local-variable #'consp)
+
+(defun shorthand--expand-shorthand (form)
+  (cl-typecase form
+    (cons (setcar form (shorthand--expand-shorthand (car form)))
+          (setcdr form (shorthand--expand-shorthand (cdr form))))
+    (vector (cl-loop for i from 0 for e across form
+                     do (aset form i (shorthand--expand-shorthand e))))
+    (symbol (let* ((name (symbol-name form)))
+              (cl-loop for (short-pat . long-pat) in shorthand-shorthands
+                       when (string-match short-pat name)
+                       do (setq name (replace-match long-pat t nil name)))
+              (setq form (intern name))))
+    (string) (number)
+    (t       (message "[shorthand] unexpected %s" (type-of form))))
+  form)
+
+(defun shorthand-read-wrapper (wrappee stream &rest stuff)
+  "Read a form from STREAM.
+Do this in two steps, read the form while shadowing the global
+`obarray' so that symbols aren't just automatically interned into
+`obarray' as usual.  Then walk the form using
+`shorthand--expand-shorthand' and every time a symbol is found,
+apply the transformations of `shorthand-shorthands' to it before
+interning it the \"real\" global `obarray'.  This ensures that
+longhand, _not_ shorthand, versions of each symbol is interned."
+  (if (and load-file-name (string-match "\\.elc$" load-file-name))
+      (apply wrappee stream stuff)
+    (shorthand--expand-shorthand
+     (let ((obarray (obarray-make))) (apply wrappee stream stuff)))))
+
+(defun shorthand-intern-soft-wrapper (wrappee name &rest stuff)
+  "Tell if string NAME names an interned symbol.
+Even if NAME directly doesn't, its longhand expansion might."
+  (let ((res (apply wrappee name stuff)))
+    (or res (cl-loop
+             for (short-pat . long-pat) in shorthand-shorthands
+             thereis (apply wrappee
+                            (replace-regexp-in-string short-pat
+                                                      long-pat name)
+                            stuff)))))
+
+(defun shorthand-load-wrapper (wrappee file &rest stuff)
+  "Load Elisp FILE, aware of file-local `shortand-shorthands'."
+  (let (file-local-shorthands)
+    (when (file-readable-p file)
+      (with-temp-buffer
+        (insert-file-contents file)
+        (hack-local-variables)
+        (setq file-local-shorthands shorthand-shorthands)))
+    (let ((shorthand-shorthands file-local-shorthands))
+      (apply wrappee file stuff))))
+
+(advice-add 'read        :around #'shorthand-read-wrapper)
+(advice-add 'intern-soft :around #'shorthand-intern-soft-wrapper)
+(advice-add 'load        :around #'shorthand-load-wrapper)
+
+(provide 'shorthand)
+;;; shorthand.el ends here

diff --git a/test/lisp/shorthand-tests.el b/test/lisp/shorthand-tests.el
new file mode 100644 (file)
index 0000000..e3d5615
--- /dev/null
+++ b/test/lisp/shorthand-tests.el
@@ -0,0 +1,60 @@
+;;; shorthand-tests.el --- Tests for shorthand.el  -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2020 Free Software Foundation, Inc.
+
+;; Author: João Távora <joaotavora@gmail.com>
+;; Keywords:
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;;
+
+;;; Code:
+
+(require 'shorthand)
+(require 'cl-lib)
+(require 'ert)
+
+(ert-deftest shorthand-read-buffer ()
+  (let* ((gsym (downcase (symbol-name (cl-gensym "sh-"))))
+         (shorthand-sname (format "s-%s" gsym))
+         (expected (intern (format "shorthand-longhand-%s" gsym))))
+    (cl-assert (not (intern-soft shorthand-sname)))
+    (should (equal (let ((shorthand-shorthands
+                          '(("^s-" . "shorthand-longhand-"))))
+                     (with-temp-buffer
+                       (insert shorthand-sname)
+                       (goto-char (point-min))
+                       (read (current-buffer))))
+                   expected))
+    (should (not (intern-soft shorthand-sname)))))
+
+(ert-deftest shorthand-read-from-string ()
+  (let* ((gsym (downcase (symbol-name (cl-gensym "sh-"))))
+         (shorthand-sname (format "s-%s" gsym))
+         (expected (intern (format "shorthand-longhand-%s" gsym))))
+    (cl-assert (not (intern-soft shorthand-sname)))
+    (should (equal (let ((shorthand-shorthands
+                          '(("^s-" . "shorthand-longhand-"))))
+                     (car (read-from-string shorthand-sname)))
+                   expected))
+    (should (not (intern-soft shorthand-sname)))))
+
+
+(provide 'shorthand-tests)
+;;; shorthand-tests.el ends here