Compiler macros for intern and intern-soft

* lisp/emacs-lisp/bytecomp.el (byte-code-expand-for-package-prefixes):
Pass last argument depending on buffer-local value of package-prefixes
while byte compiling.
(intern, intern-soft): New compiler macros.
* src/pkg.c (init_pkg_once): New keyword symbols.

diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index e65e7a313b613c98c4f70372ae0a2a5798e43184..6dd97be3c840417191005d5aa626bc240cfb58d6 100644 (file)
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -131,6 +131,20 @@
 (eval-when-compile (require 'cl-lib))
 (eval-when-compile (require 'subr-x))
 
+(defun byte-code-expand-for-package-prefixes (form)
+  (let ((cl (if package-prefixes :set-by-compiler :unset-by-compiler)))
+    (pcase form
+      (`(,_ ,_ ,_ ,_) form)
+      (`(,_ ,_ ,_) (append form (list cl)))
+      (`(,_ ,_) (append form (list nil cl)))
+      (_ form))))
+
+(cl-define-compiler-macro intern (&whole form _name &optional _package _cl)
+  (byte-code-expand-for-package-prefixes form))
+
+(cl-define-compiler-macro intern-soft (&whole form _name &optional _package _cl)
+  (byte-code-expand-for-package-prefixes form))
+
 ;; The feature of compiling in a specific target Emacs version
 ;; has been turned off because compile time options are a bad idea.
 (defgroup bytecomp nil

diff --git a/src/pkg.c b/src/pkg.c
index 52d05a69e26f882fd9588576a9b087dcc0188fdc..e2fc8c5e8f71cc12bd3f386b595134398efc60a7 100644 (file)
--- a/src/pkg.c
+++ b/src/pkg.c
@@ -518,7 +518,12 @@ pkg_fake_me_an_obarray (Lisp_Object vector)
   return package;
 }
 
-/* Implements Emacs' traditional Fintern function.  */
+/* Implements Emacs' traditional Fintern function.
+
+   CL can be one of
+
+   :set-by-compiler - intern seen by compiler with package-prefixes nil.
+   :set-by-compiler - intern seen by compiler with package-prefixes non-nil. */
 
 Lisp_Object
 pkg_emacs_intern (Lisp_Object name, Lisp_Object package, Lisp_Object cl)
@@ -918,6 +923,8 @@ DEFUN ("watch-*package*", Fwatch_earmuffs_package, Swatch_earmuffs_package,
 void
 init_pkg_once (void)
 {
+  DEFSYM (QCset_by_compiler, ":set-by-compiler");
+  DEFSYM (QCunset_by_compiler, ":unset-by-compiler");
   DEFSYM (QCexternal, ":external");
   DEFSYM (QCinherited, ":inherited");
   DEFSYM (QCinternal, ":internal");