[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
pkg 9ab00f542f 70/76: Introduce PACKAGE_NAMEX
From: |
Gerd Moellmann |
Subject: |
pkg 9ab00f542f 70/76: Introduce PACKAGE_NAMEX |
Date: |
Fri, 21 Oct 2022 00:16:18 -0400 (EDT) |
branch: pkg
commit 9ab00f542f5f0b6e8aecd3eb510c951a9b6129a4
Author: Gerd Möllmann <gerd@gnu.org>
Commit: Gerd Möllmann <gerd@gnu.org>
Introduce PACKAGE_NAMEX
PACKAGE_NAME Is already taken :-(.
---
src/lisp.h | 6 ++++++
src/pkg.c | 6 +++---
src/print.c | 7 +++----
3 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/lisp.h b/src/lisp.h
index 6a48dc10d3..2042dbbd2f 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2262,6 +2262,12 @@ PACKAGE_SYMBOLS (Lisp_Object package)
return XPACKAGE (package)->symbols;
}
+INLINE Lisp_Object
+PACKAGE_NAMEX (Lisp_Object package)
+{
+ return XPACKAGE (package)->name;
+}
+
extern void init_pkg_once (void);
extern void init_pkg (void);
extern void syms_of_pkg (void);
diff --git a/src/pkg.c b/src/pkg.c
index 26b69da683..bf59b9e4fe 100644
--- a/src/pkg.c
+++ b/src/pkg.c
@@ -611,13 +611,13 @@ pkg_qualified_symbol (Lisp_Object name, Lisp_Object
package, bool external)
if (EQ (found, Qunbound))
pkg_error ("Symbol '%s' is not accessible in package '%s'",
- SDATA (name), SDATA (XPACKAGE (package)->name));
+ SDATA (name), SDATA (PACKAGE_NAMEX (package)));
/* Check if the symbol is accesible in the package as external
symbol. PKG-FIXME: Check what to do for inherited symbols. */
if (external && EQ (status, QCinternal))
pkg_error ("Symbol '%s' is internal in package '%s'",
- SDATA (name), SDATA (XPACKAGE (package)->name));
+ SDATA (name), SDATA (PACKAGE_NAMEX (package)));
return found;
}
@@ -736,7 +736,7 @@ DEFUN ("package-%name", Fpackage_percent_name,
Spackage_percent_name, 1, 1, 0,
(Lisp_Object package)
{
CHECK_PACKAGE (package);
- return XPACKAGE (package)->name;
+ return PACKAGE_NAMEX (package);
}
DEFUN ("package-%set-name", Fpackage_percent_set_name,
Spackage_percent_set_name,
diff --git a/src/print.c b/src/print.c
index e76bd44a82..af23aade6f 100644
--- a/src/print.c
+++ b/src/print.c
@@ -1804,10 +1804,10 @@ print_vectorlike (Lisp_Object obj, Lisp_Object
printcharfun, bool escapeflag,
break;
case PVEC_PACKAGE:
- if (STRINGP (XPACKAGE (obj)->name))
+ if (STRINGP (PACKAGE_NAMEX (obj)))
{
print_c_string ("#<package \"", printcharfun);
- print_string (XPACKAGE (obj)->name, printcharfun);
+ print_string (PACKAGE_NAMEX (obj), printcharfun);
print_c_string ("\">", printcharfun);
}
else
@@ -2240,8 +2240,7 @@ print_symbol (Lisp_Object symbol, Lisp_Object
printcharfun,
const bool accessible = !EQ (found, Qunbound);
if (!accessible || !EQ (found, symbol))
{
- print_symbol_name (XPACKAGE (package)->name,
- printcharfun, escape);
+ print_symbol_name (PACKAGE_NAMEX (package), printcharfun, escape);
const Lisp_Object found = pkg_find_symbol (name, package, &status);
eassert (!EQ (found, Qunbound));
if (EQ (status, QCexternal))
- pkg ea65e35cf3 28/76: src/alloc.c: Remove all uses of `pure_alloc`, (continued)
- pkg ea65e35cf3 28/76: src/alloc.c: Remove all uses of `pure_alloc`, Gerd Moellmann, 2022/10/21
- pkg a5f6912c6d 30/76: Mapatoms differently, Gerd Moellmann, 2022/10/21
- pkg 2edc30628a 27/76: Use build_pure_c_string, Gerd Moellmann, 2022/10/21
- pkg 85c0eb1682 36/76: Merge remote-tracking branch 'origin/master' into pkg, Gerd Moellmann, 2022/10/21
- pkg 07f0b758ae 62/76: hash_remove_from_table returns bool, Gerd Moellmann, 2022/10/21
- pkg e1a730849e 42/76: Fix printing uninterned symbols, Gerd Moellmann, 2022/10/21
- pkg 1424d2c6b7 61/76: Fix intern-soft, Gerd Moellmann, 2022/10/21
- pkg bdca01dd38 29/76: Workaround for something Stefan missed, Gerd Moellmann, 2022/10/21
- pkg 62582ea927 72/76: Fix completion for new symbol table layout, Gerd Moellmann, 2022/10/21
- pkg a93ec52542 76/76: Work on Lisp interface, Gerd Moellmann, 2022/10/21
- pkg 9ab00f542f 70/76: Introduce PACKAGE_NAMEX,
Gerd Moellmann <=
- pkg 51cd0e05d6 71/76: De-duplicate packages for mapatoms, Gerd Moellmann, 2022/10/21
- pkg 9a263a0782 57/76: Move more package stuff to Lisp, Gerd Moellmann, 2022/10/21
- pkg d374cb202a 43/76: Revert "Use make-package instead of make-vector", Gerd Moellmann, 2022/10/21
- pkg 77543a203a 45/76: Revert "Dpn't assume symbol-name of keywords starts with colon", Gerd Moellmann, 2022/10/21
- pkg 0a345a1181 53/76: Make internals of Lisp_Package visible to Lisp, Gerd Moellmann, 2022/10/21
- pkg 13010d7bd0 47/76: Partially revert "Remove obarrays", Gerd Moellmann, 2022/10/21
- pkg 132f070747 58/76: New predefined hash table test for string-equal, Gerd Moellmann, 2022/10/21
- pkg 4f7c171fb4 49/76: Support specifying package size, Gerd Moellmann, 2022/10/21
- pkg 9e3cfff902 51/76: Increase default symbol-table sizes, Gerd Moellmann, 2022/10/21
- pkg c98a69d650 50/76: DEFVAR some variables, Gerd Moellmann, 2022/10/21