[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/xelb 269fe679cf 1/2: Inline xcb:-popcount
|
From: |
ELPA Syncer |
|
Subject: |
[elpa] externals/xelb 269fe679cf 1/2: Inline xcb:-popcount |
|
Date: |
Sun, 21 Jan 2024 00:59:18 -0500 (EST) |
branch: externals/xelb
commit 269fe679cff7ad9f78549d4089c786523ece0464
Author: Daniel Mendler <mail@daniel-mendler.de>
Commit: Daniel Mendler <mail@daniel-mendler.de>
Inline xcb:-popcount
* xcb-types.el (xcb:-popcount): Remove private defsubst.
* xcb-xinput.el, xcb-xkb.el, xelb-gen: Use logcount instead of
xcb:-popcount.
---
xcb-types.el | 4 ----
xcb-xinput.el | 18 +++++++++---------
xcb-xkb.el | 38 +++++++++++++++++++-------------------
xelb-gen | 2 +-
4 files changed, 29 insertions(+), 33 deletions(-)
diff --git a/xcb-types.el b/xcb-types.el
index d0bd82363f..1ea817ad16 100644
--- a/xcb-types.el
+++ b/xcb-types.el
@@ -413,10 +413,6 @@ FORMAT-STRING is a string specifying the message to
output, as in
"Evaluate a <paramref> field."
`(slot-value ctx ,field))
-(defsubst xcb:-popcount (mask)
- "Return the popcount of integer MASK."
- (logcount mask))
-
(defsubst xcb:-request-class->reply-class (request)
"Return the reply class corresponding to the request class REQUEST."
(intern-soft (concat (symbol-name request) "~reply")))
diff --git a/xcb-xinput.el b/xcb-xinput.el
index 20a66c3aa2..28a81dae5d 100644
--- a/xcb-xinput.el
+++ b/xcb-xinput.el
@@ -2370,7 +2370,7 @@
(lambda
(i)
(eval
- '(xcb:-popcount obj)
+ '(logcount obj)
(list
(nconc
'(obj)
@@ -2422,7 +2422,7 @@
(lambda
(i)
(eval
- '(xcb:-popcount obj)
+ '(logcount obj)
(list
(nconc
'(obj)
@@ -2560,7 +2560,7 @@
(lambda
(i)
(eval
- '(xcb:-popcount obj)
+ '(logcount obj)
(list
(nconc
'(obj)
@@ -2575,7 +2575,7 @@
(lambda
(i)
(eval
- '(xcb:-popcount obj)
+ '(logcount obj)
(list
(nconc
'(obj)
@@ -2610,7 +2610,7 @@
(lambda
(i)
(eval
- '(xcb:-popcount obj)
+ '(logcount obj)
(list
(nconc
'(obj)
@@ -2625,7 +2625,7 @@
(lambda
(i)
(eval
- '(xcb:-popcount obj)
+ '(logcount obj)
(list
(nconc
'(obj)
@@ -2682,7 +2682,7 @@
(lambda
(i)
(eval
- '(xcb:-popcount obj)
+ '(logcount obj)
(list
(nconc
'(obj)
@@ -2737,7 +2737,7 @@
(lambda
(i)
(eval
- '(xcb:-popcount obj)
+ '(logcount obj)
(list
(nconc
'(obj)
@@ -2752,7 +2752,7 @@
(lambda
(i)
(eval
- '(xcb:-popcount obj)
+ '(logcount obj)
(list
(nconc
'(obj)
diff --git a/xcb-xkb.el b/xcb-xkb.el
index 0dc184c08c..aa834e2b59 100644
--- a/xcb-xkb.el
+++ b/xcb-xkb.el
@@ -592,13 +592,13 @@
(state :initarg :state :type xcb:CARD32)
(names~ :initform
'(name names type xcb:ATOM size
- (xcb:-popcount
+ (logcount
(xcb:-fieldref 'namesPresent)))
:type xcb:-list)
(names :initarg :names :type xcb:-ignore)
(maps~ :initform
'(name maps type xcb:xkb:IndicatorMap size
- (xcb:-popcount
+ (logcount
(xcb:-fieldref 'mapsPresent)))
:type xcb:-list)
(maps :initarg :maps :type xcb:-ignore)))
@@ -1181,7 +1181,7 @@
(behaviors-rtrn :initarg :behaviors-rtrn :type xcb:-ignore)
(vmods-rtrn~ :initform
'(name vmods-rtrn type xcb:CARD8 size
- (xcb:-popcount
+ (logcount
(xcb:-fieldref 'virtualMods)))
:type xcb:-list)
(vmods-rtrn :initarg :vmods-rtrn :type xcb:-ignore)
@@ -1274,7 +1274,7 @@
(behaviors :initarg :behaviors :type xcb:-ignore)
(vmods~ :initform
'(name vmods type xcb:CARD8 size
- (xcb:-popcount
+ (logcount
(xcb:-fieldref 'virtualMods)))
:type xcb:-list)
(vmods :initarg :vmods :type xcb:-ignore)
@@ -1321,7 +1321,7 @@
(si-rtrn :initarg :si-rtrn :type xcb:-ignore)
(group-rtrn~ :initform
'(name group-rtrn type xcb:xkb:ModDef size
- (xcb:-popcount
+ (logcount
(xcb:-fieldref 'groupsRtrn)))
:type xcb:-list)
(group-rtrn :initarg :group-rtrn :type xcb:-ignore)))
@@ -1344,7 +1344,7 @@
(si :initarg :si :type xcb:-ignore)
(groupMaps~ :initform
'(name groupMaps type xcb:xkb:ModDef size
- (xcb:-popcount
+ (logcount
(xcb:-fieldref 'groups)))
:type xcb:-list)
(groupMaps :initarg :groupMaps :type xcb:-ignore)))
@@ -1379,7 +1379,7 @@
(pad~0 :initform 15 :type xcb:-pad)
(maps~ :initform
'(name maps type xcb:xkb:IndicatorMap size
- (xcb:-popcount
+ (logcount
(xcb:-fieldref 'which)))
:type xcb:-list)
(maps :initarg :maps :type xcb:-ignore)))
@@ -1392,7 +1392,7 @@
(which :initarg :which :type xcb:CARD32)
(maps~ :initform
'(name maps type xcb:xkb:IndicatorMap size
- (xcb:-popcount
+ (logcount
(xcb:-fieldref 'which)))
:type xcb:-list)
(maps :initarg :maps :type xcb:-ignore)))
@@ -1515,19 +1515,19 @@
(ktLevelNames :initarg :ktLevelNames :type xcb:-ignore)
(indicatorNames~ :initform
'(name indicatorNames type xcb:ATOM size
- (xcb:-popcount
+ (logcount
(xcb:-fieldref 'indicators)))
:type xcb:-list)
(indicatorNames :initarg :indicatorNames :type xcb:-ignore)
(virtualModNames~ :initform
'(name virtualModNames type xcb:ATOM size
- (xcb:-popcount
+ (logcount
(xcb:-fieldref 'virtualMods)))
:type xcb:-list)
(virtualModNames :initarg :virtualModNames :type xcb:-ignore)
(groups~ :initform
'(name groups type xcb:ATOM size
- (xcb:-popcount
+ (logcount
(xcb:-fieldref 'groupNames)))
:type xcb:-list)
(groups :initarg :groups :type xcb:-ignore)
@@ -1609,19 +1609,19 @@
(ktLevelNames :initarg :ktLevelNames :type xcb:-ignore)
(indicatorNames~ :initform
'(name indicatorNames type xcb:ATOM size
- (xcb:-popcount
+ (logcount
(xcb:-fieldref 'indicators)))
:type xcb:-list)
(indicatorNames :initarg :indicatorNames :type xcb:-ignore)
(virtualModNames~ :initform
'(name virtualModNames type xcb:ATOM size
- (xcb:-popcount
+ (logcount
(xcb:-fieldref 'virtualMods)))
:type xcb:-list)
(virtualModNames :initarg :virtualModNames :type xcb:-ignore)
(groups~ :initform
'(name groups type xcb:ATOM size
- (xcb:-popcount
+ (logcount
(xcb:-fieldref 'groupNames)))
:type xcb:-list)
(groups :initarg :groups :type xcb:-ignore)
@@ -1813,7 +1813,7 @@
(behaviors-rtrn :initarg :behaviors-rtrn :type xcb:-ignore)
(vmods-rtrn~ :initform
'(name vmods-rtrn type xcb:CARD8 size
- (xcb:-popcount
+ (logcount
(xcb:-fieldref 'virtualMods)))
:type xcb:-list)
(vmods-rtrn :initarg :vmods-rtrn :type xcb:-ignore)
@@ -1852,7 +1852,7 @@
(si-rtrn :initarg :si-rtrn :type xcb:-ignore)
(group-rtrn~ :initform
'(name group-rtrn type xcb:xkb:ModDef size
- (xcb:-popcount
+ (logcount
(xcb:-fieldref 'groupsRtrn)))
:type xcb:-list)
(group-rtrn :initarg :group-rtrn :type xcb:-ignore)
@@ -1930,19 +1930,19 @@
(ktLevelNames :initarg :ktLevelNames :type xcb:-ignore)
(indicatorNames~ :initform
'(name indicatorNames type xcb:ATOM size
- (xcb:-popcount
+ (logcount
(xcb:-fieldref 'indicators)))
:type xcb:-list)
(indicatorNames :initarg :indicatorNames :type xcb:-ignore)
(virtualModNames~ :initform
'(name virtualModNames type xcb:ATOM size
- (xcb:-popcount
+ (logcount
(xcb:-fieldref 'virtualMods)))
:type xcb:-list)
(virtualModNames :initarg :virtualModNames :type xcb:-ignore)
(groups~ :initform
'(name groups type xcb:ATOM size
- (xcb:-popcount
+ (logcount
(xcb:-fieldref 'groupNames)))
:type xcb:-list)
(groups :initarg :groups :type xcb:-ignore)
diff --git a/xelb-gen b/xelb-gen
index cfd36c5da2..54e3957bce 100755
--- a/xelb-gen
+++ b/xelb-gen
@@ -704,7 +704,7 @@ The `combine-adjacent' attribute is simply ignored."
(defun xelb-parse-popcount (node)
"Parse <popcount>."
(let ((expression (xelb-parse-expression (xelb-node-subnode node))))
- `(xcb:-popcount ,expression)))
+ `(logcount ,expression)))
(defun xelb-parse-listelement-ref (_node)
"Parse <listelement-ref>."