Remove some XEmacs compat code from semantic

* lisp/cedet/semantic/wisent/comp.el (wisent-ISVALID-TOKEN)
(wisent-parse-nonterminals):
* lisp/cedet/semantic/wisent/wisent.el
(wisent-item-to-string): Remove XEmacs compatibility code.
(wisent-char-p): Redefine as obsolete function alias for
'characterp'.
This commit is contained in:
Stefan Kangas 2020-05-16 15:22:54 +02:00
parent 5ab12a4b1b
commit 436809b705
2 changed files with 5 additions and 8 deletions

View file

@ -3053,7 +3053,7 @@ one.")
(defsubst wisent-ISVALID-TOKEN (x)
"Return non-nil if X is a character or an allowed symbol."
(or (wisent-char-p x)
(or (characterp x)
(wisent-ISVALID-VAR x)))
(defun wisent-push-token (symbol &optional nocheck)
@ -3143,7 +3143,7 @@ the rule."
(cond
((or (memq item token-list) (memq item var-list)))
;; Create new literal character token
((wisent-char-p item) (wisent-push-token item t))
((characterp item) (wisent-push-token item t))
((error "Symbol `%s' is used, but is not defined as a token and has no rules"
item))))
(setq rhl (1+ rhl)

View file

@ -55,11 +55,8 @@
;;;; Runtime stuff
;;;; -------------
;;; Compatibility
(eval-and-compile
(if (fboundp 'char-valid-p)
(defalias 'wisent-char-p 'char-valid-p)
(defalias 'wisent-char-p 'char-or-char-int-p)))
(define-obsolete-function-alias 'wisent-char-p
#'characterp "28.1")
;;; Printed representation of terminals and nonterminals
(defconst wisent-escape-sequence-strings
@ -80,7 +77,7 @@
(defsubst wisent-item-to-string (item)
"Return a printed representation of ITEM.
ITEM can be a nonterminal or terminal symbol, or a character literal."
(if (wisent-char-p item)
(if (characterp item)
(or (cdr (assq item wisent-escape-sequence-strings))
(format "'%c'" item))
(symbol-name item)))