Replace manually crafted hex regexes with [:xdigit:]
* admin/charsets/mapconv: * build-aux/gitlog-to-changelog (parse_amend_file, git_dir_option): * lisp/progmodes/verilog-mode.el (verilog-delay-re): (verilog-type-font-keywords, verilog-read-always-signals-recurse): (verilog-is-number): * lisp/progmodes/vera-mode.el (vera-font-lock-keywords): * test/src/emacs-module-tests.el (mod-test-sum-test): * lisp/xml.el: (xml--entity-replacement-text): * lisp/version.el (emacs-repository-version-git): * lisp/textmodes/sgml-mode.el (sgml-quote): * lisp/textmodes/css-mode.el (css-escapes-re) (css--colors-regexp): * lisp/progmodes/prolog.el (prolog-syntax-propertize-function): * lisp/progmodes/hideif.el (hif-token-regexp, hif-tokenize): * lisp/progmodes/ebnf-dtd.el: (ebnf-dtd-attlistdecl) (ebnf-dtd-entitydecl, ebnf-dtd-lex): * lisp/progmodes/ebnf-ebx.el (ebnf-ebx-hex-character): * lisp/progmodes/ebnf-abn.el (ebnf-abn-character): * lisp/progmodes/cperl-mode.el (cperl-highlight-charclass) (cperl-find-pods-heres): * lisp/progmodes/cc-mode.el (c-maybe-quoted-number-head) (c-maybe-quoted-number, c-parse-quotes-before-change) (c-parse-quotes-after-change, c-quoted-number-head-before-point) (c-quoted-number-straddling-point): * lisp/progmodes/ada-mode.el (featurep, ada-in-numeric-literal-p) (ada-font-lock-keywords): * lisp/org/org-mobile.el (org-mobile-copy-agenda-files) * lisp/org/org-table.el (org-table-number-regexp): (org-mobile-update-checksum-for-capture-file): * lisp/nxml/xsd-regexp.el (xsdre-gen-categories): * lisp/nxml/xmltok.el (let*): * lisp/nxml/rng-xsd.el (rng-xsd-convert-hex-binary) (rng-xsd-convert-any-uri): * lisp/nxml/rng-uri.el (rng-uri-file-name-1) (rng-uri-unescape-multibyte, rng-uri-unescape-unibyte) (rng-uri-unescape-unibyte-match) (rng-uri-unescape-unibyte-replace): * lisp/nxml/rng-cmpct.el (rng-c-process-escapes): * lisp/nxml/nxml-maint.el (nxml-insert-target-repertoire-glyph-set): * lisp/net/shr-color.el (shr-color->hexadecimal): * lisp/mail/rfc2231.el (rfc2231-decode-encoded-string): * lisp/international/mule-cmds.el (read-char-by-name): * lisp/htmlfontify.el (hfy-hex-regex): * lisp/gnus/nneething.el (nneething-decode-file-name): * lisp/gnus/mml-sec.el (mml-secure-find-usable-keys): * lisp/gnus/gnus-art.el (gnus-button-mid-or-mail-heuristic-alist): * lisp/faces.el (read-color): * lisp/epg.el (epg--status-ERRSIG, epg--status-VALIDSIG) (epg--status-SIG_CREATED, epg--decode-percent-escape) (epg--decode-hexstring, epg--decode-quotedstring) (epg-dn-from-string): * lisp/emulation/cua-rect.el (cua-incr-rectangle): * lisp/dnd.el (dnd-unescape-uri): * lisp/cedet/semantic/lex.el (semantic-lex-number-expression): * lisp/cedet/semantic/java.el (semantic-java-number-regexp): * lisp/calc/calc-lang.el (pascal): * lisp/calc/calc-ext.el (math-read-number-fancy): * lisp/calc/calc-aent.el (math-read-token): Replace various combinations of [0-9a-fA-F] with [[:xdigit:]]. (Bug#36167)
This commit is contained in:
Konstantin Kharlamov
Eli Zaretskii
parent
814b509b1d
commit
dfc322d77f
41 changed files with 95 additions and 95 deletions
|
|
@ -118,7 +118,7 @@ elif [ "$3" = "IANA" ] ; then
|
|||
# Source format is:
|
||||
# 0xXX 0xYYYY
|
||||
sed -n -e "${2}p" < $1 \
|
||||
| sed -e 's/\(0x[0-9A-Fa-f]*\)[^0]*\(0x[0-9A-Fa-f]*\).*/\1 \2/' \
|
||||
| sed -e 's/\(0x[[:xdigit:]]*\)[^0]*\(0x[[:xdigit:]]*\).*/\1 \2/' \
|
||||
| sort | ${AWKPROG}
|
||||
elif [ "$3" = "UNICODE" ] ; then
|
||||
# Source format is:
|
||||
|
|
|
|||
|
|
@ -189,7 +189,7 @@ sub parse_amend_file($)
|
|||
|
||||
if (!$in_code)
|
||||
{
|
||||
$line =~ /^([0-9a-fA-F]{40})$/
|
||||
$line =~ /^([[:xdigit:]]{40})$/
|
||||
or (warn "$ME: $f:$.: invalid line; expected an SHA1\n"),
|
||||
$fail = 1, next;
|
||||
$sha = lc $1;
|
||||
|
|
@ -303,7 +303,7 @@ sub git_dir_option($)
|
|||
my ($sha, $rest) = split ':', $log, 2;
|
||||
defined $sha
|
||||
or die "$ME:$.: malformed log entry\n";
|
||||
$sha =~ /^[0-9a-fA-F]{40}$/
|
||||
$sha =~ /^[[:xdigit:]]{40}$/
|
||||
or die "$ME:$.: invalid SHA1: $sha\n";
|
||||
|
||||
my $skipflag = 0;
|
||||
|
|
@ -391,7 +391,7 @@ sub git_dir_option($)
|
|||
@skipshas = ();
|
||||
next;
|
||||
}
|
||||
if ($found && $_ =~ /^([0-9a-fA-F]{7,}) [^ ]/)
|
||||
if ($found && $_ =~ /^([[:xdigit:]]{7,}) [^ ]/)
|
||||
{
|
||||
push ( @skipshas, $1 );
|
||||
}
|
||||
|
|
|
|||
|
|
@ -728,7 +728,7 @@ in Calc algebraic input.")
|
|||
math-exp-str (1- math-exp-pos))
|
||||
(1- math-exp-pos))))))
|
||||
(or (and (memq calc-language calc-lang-c-type-hex)
|
||||
(eq (string-match "0[xX][0-9a-fA-F]+" math-exp-str
|
||||
(eq (string-match "0[xX][[:xdigit:]]+" math-exp-str
|
||||
math-exp-pos)
|
||||
math-exp-pos))
|
||||
(string-match "_?\\([0-9]+.?0*@ *\\)?\\([0-9]+.?0*' *\\)?\\(0*\\([2-9]\\|1[0-4]\\)\\(#[#]?\\|\\^\\^\\)[0-9a-dA-D.]+[eE][-+_]?[0-9]+\\|0*\\([2-9]\\|[0-2][0-9]\\|3[0-6]\\)\\(#[#]?\\|\\^\\^\\)[0-9a-zA-Zα-ωΑ-Ω:.]+\\|[0-9]+:[0-9:]+\\|[0-9.]+\\([eE][-+_]?[0-9]+\\)?\"?\\)?"
|
||||
|
|
|
|||
|
|
@ -2967,13 +2967,13 @@ If X is not an error form, return 1."
|
|||
|
||||
;; C language hexadecimal notation
|
||||
((and (eq calc-language 'c)
|
||||
(string-match "^0[xX]\\([0-9a-fA-F]+\\)$" s))
|
||||
(string-match "^0[xX]\\([[:xdigit:]]+\\)$" s))
|
||||
(let ((digs (math-match-substring s 1)))
|
||||
(math-read-radix digs 16)))
|
||||
|
||||
;; Pascal language hexadecimal notation
|
||||
((and (eq calc-language 'pascal)
|
||||
(string-match "^\\$\\([0-9a-fA-F]+\\)$" s))
|
||||
(string-match "^\\$\\([[:xdigit:]]+\\)$" s))
|
||||
(let ((digs (math-match-substring s 1)))
|
||||
(math-read-radix digs 16)))
|
||||
|
||||
|
|
|
|||
|
|
@ -243,7 +243,7 @@
|
|||
(put 'pascal 'math-lang-read-symbol
|
||||
'((?\$
|
||||
(eq (string-match
|
||||
"\\(\\$[0-9a-fA-F]+\\)\\($\\|[^0-9a-zA-Zα-ωΑ-Ω]\\)"
|
||||
"\\(\\$[[:xdigit:]]+\\)\\($\\|[^0-9a-zA-Zα-ωΑ-Ω]\\)"
|
||||
math-exp-str math-exp-pos)
|
||||
math-exp-pos)
|
||||
(setq math-exp-token 'number
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@
|
|||
"\\|"
|
||||
"\\<[0-9]+[eE][-+]?[0-9]+[fFdD]?\\>"
|
||||
"\\|"
|
||||
"\\<0[xX][0-9a-fA-F]+[lL]?\\>"
|
||||
"\\<0[xX][[:xdigit:]]+[lL]?\\>"
|
||||
"\\|"
|
||||
"\\<[0-9]+[lLfFdD]?\\>"
|
||||
"\\)"
|
||||
|
|
@ -63,7 +63,7 @@ DECIMAL_LITERAL:
|
|||
[1-9][0-9]*
|
||||
;
|
||||
HEX_LITERAL:
|
||||
0[xX][0-9a-fA-F]+
|
||||
0[xX][[:xdigit:]]+
|
||||
;
|
||||
OCTAL_LITERAL:
|
||||
0[0-7]*
|
||||
|
|
|
|||
|
|
@ -596,7 +596,7 @@ may need to be overridden for some special languages.")
|
|||
"\\|"
|
||||
"\\<[0-9]+[eE][-+]?[0-9]+[fFdD]?\\>"
|
||||
"\\|"
|
||||
"\\<0[xX][0-9a-fA-F]+[lL]?\\>"
|
||||
"\\<0[xX][[:xdigit:]]+[lL]?\\>"
|
||||
"\\|"
|
||||
"\\<[0-9]+[lLfFdD]?\\>"
|
||||
"\\)"
|
||||
|
|
@ -609,7 +609,7 @@ DECIMAL_LITERAL:
|
|||
[1-9][0-9]*
|
||||
;
|
||||
HEX_LITERAL:
|
||||
0[xX][0-9a-fA-F]+
|
||||
0[xX][[:xdigit:]]+
|
||||
;
|
||||
OCTAL_LITERAL:
|
||||
0[0-7]*
|
||||
|
|
|
|||
|
|
@ -138,7 +138,7 @@ Return nil if URI is not a local file."
|
|||
|
||||
(defsubst dnd-unescape-uri (uri)
|
||||
(replace-regexp-in-string
|
||||
"%[A-Fa-f0-9][A-Fa-f0-9]"
|
||||
"%[[:xdigit:]][[:xdigit:]]"
|
||||
(lambda (arg)
|
||||
(let ((str (make-string 1 0)))
|
||||
(aset str 0 (string-to-number (substring arg 1) 16))
|
||||
|
|
|
|||
|
|
@ -1127,7 +1127,7 @@ The length of STRING need not be the same as the rectangle width."
|
|||
(cua--rectangle-operation 'keep nil t 1 nil
|
||||
(lambda (_s e _l _r)
|
||||
(cond
|
||||
((re-search-forward "0x\\([0-9a-fA-F]+\\)" e t)
|
||||
((re-search-forward "0x\\([[:xdigit:]]+\\)" e t)
|
||||
(let* ((txt (cua--filter-buffer-noprops (match-beginning 1) (match-end 1)))
|
||||
(n (string-to-number txt 16))
|
||||
(fmt (format "0x%%0%dx" (length txt))))
|
||||
|
|
|
|||
14
lisp/epg.el
14
lisp/epg.el
|
|
@ -952,7 +952,7 @@ callback data (if any)."
|
|||
|
||||
(defun epg--status-ERRSIG (context string)
|
||||
(if (string-match "\\`\\([^ ]+\\) \\([0-9]+\\) \\([0-9]+\\) \
|
||||
\\([0-9A-Fa-f][0-9A-Fa-f]\\) \\([^ ]+\\) \\([0-9]+\\)"
|
||||
\\([[:xdigit:]][[:xdigit:]]\\) \\([^ ]+\\) \\([0-9]+\\)"
|
||||
string)
|
||||
(let ((signature (epg-make-signature 'error)))
|
||||
(epg-context-set-result-for
|
||||
|
|
@ -976,7 +976,7 @@ callback data (if any)."
|
|||
(when (and signature
|
||||
(eq (epg-signature-status signature) 'good)
|
||||
(string-match "\\`\\([^ ]+\\) [^ ]+ \\([^ ]+\\) \\([^ ]+\\) \
|
||||
\\([0-9]+\\) [^ ]+ \\([0-9]+\\) \\([0-9]+\\) \\([0-9A-Fa-f][0-9A-Fa-f]\\) \
|
||||
\\([0-9]+\\) [^ ]+ \\([0-9]+\\) \\([0-9]+\\) \\([[:xdigit:]][[:xdigit:]]\\) \
|
||||
\\(.*\\)"
|
||||
string))
|
||||
(setf (epg-signature-fingerprint signature)
|
||||
|
|
@ -1146,7 +1146,7 @@ callback data (if any)."
|
|||
|
||||
(defun epg--status-SIG_CREATED (context string)
|
||||
(if (string-match "\\`\\([DCS]\\) \\([0-9]+\\) \\([0-9]+\\) \
|
||||
\\([0-9A-Fa-f][0-9A-Fa-f]\\) \\(.*\\) " string)
|
||||
\\([[:xdigit:]][[:xdigit:]]\\) \\(.*\\) " string)
|
||||
(epg-context-set-result-for
|
||||
context 'sign
|
||||
(cons (epg-make-new-signature
|
||||
|
|
@ -2022,7 +2022,7 @@ If you are unsure, use synchronous version of this function
|
|||
(defun epg--decode-percent-escape (string)
|
||||
(setq string (string-to-unibyte string))
|
||||
(let ((index 0))
|
||||
(while (string-match "%\\(\\(%\\)\\|\\([0-9A-Fa-f][0-9A-Fa-f]\\)\\)"
|
||||
(while (string-match "%\\(\\(%\\)\\|\\([[:xdigit:]][[:xdigit:]]\\)\\)"
|
||||
string index)
|
||||
(if (match-beginning 2)
|
||||
(setq string (replace-match "%" t t string)
|
||||
|
|
@ -2039,7 +2039,7 @@ If you are unsure, use synchronous version of this function
|
|||
|
||||
(defun epg--decode-hexstring (string)
|
||||
(let ((index 0))
|
||||
(while (eq index (string-match "[0-9A-Fa-f][0-9A-Fa-f]" string index))
|
||||
(while (eq index (string-match "[[:xdigit:]][[:xdigit:]]" string index))
|
||||
(setq string (replace-match (string (string-to-number
|
||||
(match-string 0 string) 16))
|
||||
t t string)
|
||||
|
|
@ -2049,7 +2049,7 @@ If you are unsure, use synchronous version of this function
|
|||
(defun epg--decode-quotedstring (string)
|
||||
(let ((index 0))
|
||||
(while (string-match "\\\\\\(\\([,=+<>#;\\\"]\\)\\|\
|
||||
\\([0-9A-Fa-f][0-9A-Fa-f]\\)\\)"
|
||||
\\([[:xdigit:]][[:xdigit:]]\\)\\)"
|
||||
string index)
|
||||
(if (match-beginning 2)
|
||||
(setq string (replace-match "\\2" t nil string)
|
||||
|
|
@ -2086,7 +2086,7 @@ The return value is an alist mapping from types to values."
|
|||
string index))
|
||||
(setq index (match-end 0)
|
||||
value (epg--decode-quotedstring (match-string 0 string)))
|
||||
(if (eq index (string-match "#\\([0-9A-Fa-f]+\\)" string index))
|
||||
(if (eq index (string-match "#\\([[:xdigit:]]+\\)" string index))
|
||||
(setq index (match-end 0)
|
||||
value (epg--decode-hexstring (match-string 1 string)))
|
||||
(if (eq index (string-match "\"\\([^\\\"]\\|\\\\.\\)*\""
|
||||
|
|
|
|||
|
|
@ -1997,7 +1997,7 @@ resulting color name in the echo area."
|
|||
(when (and convert-to-RGB
|
||||
(not (string-equal color "")))
|
||||
(let ((components (x-color-values color)))
|
||||
(unless (string-match-p "^#\\(?:[a-fA-F0-9][a-fA-F0-9][a-fA-F0-9]\\)+$" color)
|
||||
(unless (string-match-p "^#\\(?:[[:xdigit:]][[:xdigit:]][[:xdigit:]]\\)+$" color)
|
||||
(setq color (format "#%04X%04X%04X"
|
||||
(logand 65535 (nth 0 components))
|
||||
(logand 65535 (nth 1 components))
|
||||
|
|
|
|||
|
|
@ -7423,10 +7423,10 @@ must return `mid', `mail', `invalid' or `ask'."
|
|||
(-2.0 . "^[0-9]")
|
||||
(-1.0 . "^[0-9][0-9]")
|
||||
;;
|
||||
;; -3.0 /^[0-9][0-9a-fA-F]{2,2}/;
|
||||
(-3.0 . "^[0-9][0-9a-fA-F][0-9a-fA-F][^0-9a-fA-F]")
|
||||
;; -5.0 /^[0-9][0-9a-fA-F]{3,3}/;
|
||||
(-5.0 . "^[0-9][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][^0-9a-fA-F]")
|
||||
;; -3.0 /^[0-9][[:xdigit:]]{2,2}/;
|
||||
(-3.0 . "^[0-9][[:xdigit:]][[:xdigit:]][^[:xdigit:]]")
|
||||
;; -5.0 /^[0-9][[:xdigit:]]{3,3}/;
|
||||
(-5.0 . "^[0-9][[:xdigit:]][[:xdigit:]][[:xdigit:]][^[:xdigit:]]")
|
||||
;;
|
||||
(-3.0 . "[0-9][0-9][0-9][0-9][0-9][^0-9].*@") ;; "[0-9]{5,}.*\@"
|
||||
(-3.0 . "[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][^0-9].*@")
|
||||
|
|
|
|||
|
|
@ -725,7 +725,7 @@ Otherwise, NAME is treated as user ID, for which no keys are returned if it
|
|||
is expired or revoked.
|
||||
If optional JUSTONE is not nil, return the first key instead of a list."
|
||||
(let* ((keys (epg-list-keys context name))
|
||||
(iskeyid (string-match "\\(0x\\)?\\([0-9a-fA-F]\\{8,\\}\\)" name))
|
||||
(iskeyid (string-match "\\(0x\\)?\\([[:xdigit:]]\\{8,\\}\\)" name))
|
||||
(fingerprint (match-string 2 name))
|
||||
result)
|
||||
(when (and iskeyid (>= (length keys) 2))
|
||||
|
|
|
|||
|
|
@ -297,7 +297,7 @@ included.")
|
|||
(defun nneething-decode-file-name (file &optional coding-system)
|
||||
"Decode the name of the FILE is encoded in CODING-SYSTEM."
|
||||
(let ((pos 0) buf)
|
||||
(while (string-match "%\\([0-9a-fA-F][0-9a-fA-F]\\)" file pos)
|
||||
(while (string-match "%\\([[:xdigit:]][[:xdigit:]]\\)" file pos)
|
||||
(setq buf (cons (string (string-to-number (match-string 1 file) 16))
|
||||
(cons (substring file pos (match-beginning 0)) buf))
|
||||
pos (match-end 0)))
|
||||
|
|
|
|||
|
|
@ -566,7 +566,7 @@ therefore no longer care about) will be invalid at any time.\n
|
|||
(defvar hfy-tmpfont-stack nil
|
||||
"An alist of derived fonts resulting from overlays.")
|
||||
|
||||
(defconst hfy-hex-regex "[0-9A-Fa-f]")
|
||||
(defconst hfy-hex-regex "[[:xdigit:]]")
|
||||
|
||||
(defconst hfy-triplet-regex
|
||||
(concat
|
||||
|
|
|
|||
|
|
@ -3079,7 +3079,7 @@ as names, not numbers."
|
|||
(char
|
||||
(cond
|
||||
((char-from-name input t))
|
||||
((string-match-p "\\`[0-9a-fA-F]+\\'" input)
|
||||
((string-match-p "\\`[[:xdigit:]]+\\'" input)
|
||||
(ignore-errors (string-to-number input 16)))
|
||||
((string-match-p "\\`#\\([bBoOxX]\\|[0-9]+[rR]\\)[0-9a-zA-Z]+\\'"
|
||||
input)
|
||||
|
|
|
|||
|
|
@ -223,7 +223,7 @@ These look like:
|
|||
(mm-with-unibyte-buffer
|
||||
(insert value)
|
||||
(goto-char (point-min))
|
||||
(while (re-search-forward "%\\([0-9A-Fa-f][0-9A-Fa-f]\\)" nil t)
|
||||
(while (re-search-forward "%\\([[:xdigit:]][[:xdigit:]]\\)" nil t)
|
||||
(insert
|
||||
(prog1
|
||||
(string-to-number (match-string 1) 16)
|
||||
|
|
|
|||
|
|
@ -235,7 +235,7 @@ Like rgb() or hsl()."
|
|||
(cond
|
||||
;; Hexadecimal color: #abc or #aabbcc
|
||||
((string-match
|
||||
"\\(#[0-9a-fA-F]\\{3\\}[0-9a-fA-F]\\{3\\}?\\)"
|
||||
"\\(#[[:xdigit:]]\\{3\\}[[:xdigit:]]\\{3\\}?\\)"
|
||||
color)
|
||||
(match-string 1 color))
|
||||
;; rgb() or rgba() colors
|
||||
|
|
|
|||
|
|
@ -34,10 +34,10 @@
|
|||
(let (lst head)
|
||||
(with-current-buffer (find-file-noselect file)
|
||||
(goto-char (point-min))
|
||||
(while (re-search-forward "^ *\\([a-fA-F0-9]\\{2\\}\\)[ \t]+" nil t)
|
||||
(while (re-search-forward "^ *\\([[:xdigit:]]\\{2\\}\\)[ \t]+" nil t)
|
||||
(let ((row (match-string 1))
|
||||
(eol (line-end-position)))
|
||||
(while (re-search-forward "\\([a-fA-F0-9]\\{2\\}\\)-\\([a-fA-F0-9]\\{2\\}\\)\\|\\([a-fA-F0-9]\\{2\\}\\)" eol t)
|
||||
(while (re-search-forward "\\([[:xdigit:]]\\{2\\}\\)-\\([[:xdigit:]]\\{2\\}\\)\\|\\([[:xdigit:]]\\{2\\}\\)" eol t)
|
||||
(setq lst
|
||||
(cons (if (match-beginning 3)
|
||||
(concat "#x" row (match-string 3))
|
||||
|
|
|
|||
|
|
@ -369,7 +369,7 @@ OVERRIDE is either nil, require or t."
|
|||
(and pos
|
||||
(rng-c-error "Nul character found (binary file?)")))
|
||||
(let ((offset 0))
|
||||
(while (re-search-forward "\\\\x+{\\([0-9a-fA-F]+\\)}"
|
||||
(while (re-search-forward "\\\\x+{\\([[:xdigit:]]+\\)}"
|
||||
(point-max)
|
||||
t)
|
||||
(let* ((ch (decode-char 'ucs (string-to-number (match-string 1) 16))))
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ Signal an error if URI is not a valid file URL."
|
|||
|
||||
;; pattern is either nil or match or replace
|
||||
(defun rng-uri-file-name-1 (uri pattern)
|
||||
(unless (string-match "\\`\\(?:[^%]\\|%[0-9a-fA-F]{2}\\)*\\'" uri)
|
||||
(unless (string-match "\\`\\(?:[^%]\\|%[[:xdigit:]]{2}\\)*\\'" uri)
|
||||
(rng-uri-error "Bad escapes in URI `%s'" uri))
|
||||
(setq uri (rng-uri-unescape-multibyte uri))
|
||||
(let* ((components
|
||||
|
|
@ -299,7 +299,7 @@ Both FULL and BASE must be absolute URIs."
|
|||
(mapconcat 'identity segments "/")))
|
||||
|
||||
(defun rng-uri-unescape-multibyte (str)
|
||||
(replace-regexp-in-string "\\(?:%[89a-fA-F][0-9a-fA-F]\\)+"
|
||||
(replace-regexp-in-string "\\(?:%[89a-fA-F][[:xdigit:]]\\)+"
|
||||
'rng-multibyte-percent-decode
|
||||
str))
|
||||
|
||||
|
|
@ -310,7 +310,7 @@ Both FULL and BASE must be absolute URIs."
|
|||
'utf-8))
|
||||
|
||||
(defun rng-uri-unescape-unibyte (str)
|
||||
(replace-regexp-in-string "%[0-7][0-9a-fA-F]"
|
||||
(replace-regexp-in-string "%[0-7][[:xdigit:]]"
|
||||
(lambda (h)
|
||||
(string-to-number (substring h 1) 16))
|
||||
str
|
||||
|
|
@ -318,7 +318,7 @@ Both FULL and BASE must be absolute URIs."
|
|||
t))
|
||||
|
||||
(defun rng-uri-unescape-unibyte-match (str)
|
||||
(replace-regexp-in-string "%[0-7][0-9a-fA-F]\\|[^%]"
|
||||
(replace-regexp-in-string "%[0-7][[:xdigit:]]\\|[^%]"
|
||||
(lambda (match)
|
||||
(if (string= match "*")
|
||||
"\\([^/]*\\)"
|
||||
|
|
@ -333,7 +333,7 @@ Both FULL and BASE must be absolute URIs."
|
|||
|
||||
(defun rng-uri-unescape-unibyte-replace (str next-match-index)
|
||||
(replace-regexp-in-string
|
||||
"%[0-7][0-9a-fA-F]\\|[^%]"
|
||||
"%[0-7][[:xdigit:]]\\|[^%]"
|
||||
(lambda (match)
|
||||
(if (string= match "*")
|
||||
(let ((n next-match-index))
|
||||
|
|
|
|||
|
|
@ -330,7 +330,7 @@ trailing digits. For example, -0021.0430 would be represented by [-1
|
|||
(match-string 1 string)))
|
||||
|
||||
(defun rng-xsd-convert-hex-binary (string)
|
||||
(and (string-match "\\`[ \r\n\t]*\\(\\(?:[0-9A-Fa-f][0-9A-Fa-f]\\)*\\)[ \r\n\t]*\\'"
|
||||
(and (string-match "\\`[ \r\n\t]*\\(\\(?:[[:xdigit:]][[:xdigit:]]\\)*\\)[ \r\n\t]*\\'"
|
||||
string)
|
||||
(downcase (match-string 1 string))))
|
||||
|
||||
|
|
@ -360,7 +360,7 @@ trailing digits. For example, -0021.0430 would be represented by [-1
|
|||
n)))
|
||||
|
||||
(defun rng-xsd-convert-any-uri (string)
|
||||
(and (string-match "\\`\\(?:[^%]\\|%[0-9a-fA-F][0-9a-fA-F]\\)*\\'" string)
|
||||
(and (string-match "\\`\\(?:[^%]\\|%[[:xdigit:]][[:xdigit:]]\\)*\\'" string)
|
||||
(string-match "\\`[^#]*\\(?:#[^#]*\\)?\\'" string)
|
||||
(string-match "\\`\\(?:[a-zA-Z][-+.A-Za-z0-9]*:.+\\|[^:]*\\(?:[#/?].*\\)?\\)\\'" string)
|
||||
string))
|
||||
|
|
|
|||
|
|
@ -413,7 +413,7 @@ and VALUE-END, otherwise a STRING giving the value."
|
|||
(xmltok-g decimal-ref-close ";") opt))
|
||||
(hex-ref
|
||||
(xmltok+ "x" open
|
||||
(xmltok-g hex "[0-9a-fA-F]" +)
|
||||
(xmltok-g hex "[[:xdigit:]]" +)
|
||||
(xmltok-g hex-ref-close ";") opt
|
||||
close opt))
|
||||
(char-ref
|
||||
|
|
|
|||
|
|
@ -702,7 +702,7 @@ Code is inserted into the current buffer."
|
|||
(with-current-buffer (find-file-noselect file)
|
||||
(goto-char (point-min))
|
||||
(mapc (lambda (x) (put x 'xsdre-ranges nil)) xsdre-gen-categories)
|
||||
(while (re-search-forward "^\\([0-9A-Fa-f]*\\);[^;]*;\\([A-Z][a-z]\\);"
|
||||
(while (re-search-forward "^\\([[:xdigit:]]*\\);[^;]*;\\([A-Z][a-z]\\);"
|
||||
nil
|
||||
t)
|
||||
(let* ((sym (intern (match-string-no-properties 2)))
|
||||
|
|
|
|||
|
|
@ -472,7 +472,7 @@ agenda view showing the flagged items."
|
|||
(concat (shell-quote-argument org-mobile-checksum-binary)
|
||||
" "
|
||||
(shell-quote-argument (expand-file-name file)))))
|
||||
(when (string-match "[a-fA-F0-9]\\{30,40\\}" check)
|
||||
(when (string-match "[[:xdigit:]]\\{30,40\\}" check)
|
||||
(push (cons link-name (match-string 0 check))
|
||||
org-mobile-checksum-files))))
|
||||
|
||||
|
|
@ -761,7 +761,7 @@ If nothing new has been added, return nil."
|
|||
(buffer (find-file-noselect file)))
|
||||
(when buffer
|
||||
(with-current-buffer buffer
|
||||
(when (re-search-forward (concat "\\([0-9a-fA-F]\\{30,\\}\\).*?"
|
||||
(when (re-search-forward (concat "\\([[:xdigit:]]\\{30,\\}\\).*?"
|
||||
(regexp-quote org-mobile-capture-file)
|
||||
"[ \t]*$") nil t)
|
||||
(goto-char (match-beginning 1))
|
||||
|
|
|
|||
|
|
@ -155,7 +155,7 @@ table, obtained by prompting the user."
|
|||
:type 'string)
|
||||
|
||||
(defcustom org-table-number-regexp
|
||||
"^\\([<>]?[-+^.0-9]*[0-9][-+^.0-9eEdDx()%:]*\\|[<>]?[-+]?0[xX][0-9a-fA-F.]+\\|[<>]?[-+]?[0-9]+#[0-9a-zA-Z.]+\\|nan\\|[-+u]?inf\\)$"
|
||||
"^\\([<>]?[-+^.0-9]*[0-9][-+^.0-9eEdDx()%:]*\\|[<>]?[-+]?0[xX][[:xdigit:].]+\\|[<>]?[-+]?[0-9]+#[0-9a-zA-Z.]+\\|nan\\|[-+u]?inf\\)$"
|
||||
"Regular expression for recognizing numbers in table columns.
|
||||
If a table column contains mostly numbers, it will be aligned to the
|
||||
right. If not, it will be aligned to the left.
|
||||
|
|
@ -180,9 +180,9 @@ Other options offered by the customize interface are more restrictive."
|
|||
(const :tag "Exponential, Floating point, Integer"
|
||||
"^[-+]?[0-9.]+\\([eEdD][-+0-9]+\\)?$")
|
||||
(const :tag "Very General Number-Like, including hex and Calc radix"
|
||||
"^\\([<>]?[-+^.0-9]*[0-9][-+^.0-9eEdDx()%]*\\|[<>]?[-+]?0[xX][0-9a-fA-F.]+\\|[<>]?[-+]?[0-9]+#[0-9a-zA-Z.]+\\|nan\\|[-+u]?inf\\)$")
|
||||
"^\\([<>]?[-+^.0-9]*[0-9][-+^.0-9eEdDx()%]*\\|[<>]?[-+]?0[xX][[:xdigit:].]+\\|[<>]?[-+]?[0-9]+#[0-9a-zA-Z.]+\\|nan\\|[-+u]?inf\\)$")
|
||||
(const :tag "Very General Number-Like, including hex and Calc radix, allows comma as decimal mark"
|
||||
"^\\([<>]?[-+^.,0-9]*[0-9][-+^.0-9eEdDx()%]*\\|[<>]?[-+]?0[xX][0-9a-fA-F.]+\\|[<>]?[-+]?[0-9]+#[0-9a-zA-Z.]+\\|nan\\|[-+u]?inf\\)$")
|
||||
"^\\([<>]?[-+^.,0-9]*[0-9][-+^.0-9eEdDx()%]*\\|[<>]?[-+]?0[xX][[:xdigit:].]+\\|[<>]?[-+]?[0-9]+#[0-9a-zA-Z.]+\\|nan\\|[-+u]?inf\\)$")
|
||||
(string :tag "Regexp:")))
|
||||
|
||||
(defcustom org-table-number-fraction 0.5
|
||||
|
|
|
|||
|
|
@ -909,7 +909,7 @@ the 4 file locations can be clicked on and jumped to."
|
|||
change))
|
||||
(replace-match "'A'"))
|
||||
(goto-char from)
|
||||
(while (re-search-forward "\\(#[0-9a-fA-F]*#\\)" to t)
|
||||
(while (re-search-forward "\\(#[[:xdigit:]]*#\\)" to t)
|
||||
(setq change (cons (list (match-beginning 1)
|
||||
(length (match-string 1))
|
||||
(match-string 1))
|
||||
|
|
@ -1013,7 +1013,7 @@ If PARSE-RESULT is non-nil, use it instead of calling `parse-partial-sexp'."
|
|||
|
||||
(defsubst ada-in-numeric-literal-p ()
|
||||
"Return t if point is after a prefix of a numeric literal."
|
||||
(looking-back "\\([0-9]+#[0-9a-fA-F_]+\\)" (line-beginning-position)))
|
||||
(looking-back "\\([0-9]+#[[:xdigit:]_]+\\)" (line-beginning-position)))
|
||||
|
||||
;;------------------------------------------------------------------
|
||||
;; Contextual menus
|
||||
|
|
@ -5213,7 +5213,7 @@ Return nil if no body was found."
|
|||
'("<<\\(\\sw+\\)>>" 1 font-lock-constant-face)
|
||||
|
||||
;; Highlight based-numbers (R. Reagan <robin-reply@reagans.org>)
|
||||
(list "\\([0-9]+#[0-9a-fA-F_]+#\\)" '(1 font-lock-constant-face t))
|
||||
(list "\\([0-9]+#[[:xdigit:]_]+#\\)" '(1 font-lock-constant-face t))
|
||||
|
||||
;; Ada unnamed numerical constants
|
||||
(list "\\W\\([-+]?[0-9._]+\\)\\>" '(1 font-lock-constant-face))
|
||||
|
|
|
|||
|
|
@ -1513,7 +1513,7 @@ Note that the style variables are always made local to the buffer."
|
|||
(defconst c-maybe-quoted-number-head
|
||||
(concat
|
||||
"\\(0\\("
|
||||
"\\([Xx]\\([0-9a-fA-F]\\('[0-9a-fA-F]\\|[0-9a-fA-F]\\)*'?\\)?\\)"
|
||||
"\\([Xx]\\([[:xdigit:]]\\('[[:xdigit:]]\\|[[:xdigit:]]\\)*'?\\)?\\)"
|
||||
"\\|"
|
||||
"\\([Bb]\\([01]\\('[01]\\|[01]\\)*'?\\)?\\)"
|
||||
"\\|"
|
||||
|
|
@ -1533,7 +1533,7 @@ Note that the style variables are always made local to the buffer."
|
|||
(save-excursion
|
||||
(let ((here (point))
|
||||
found)
|
||||
(skip-chars-backward "0-9a-fA-F'")
|
||||
(skip-chars-backward "[:xdigit:]'")
|
||||
(if (and (memq (char-before) '(?x ?X))
|
||||
(eq (char-before (1- (point))) ?0))
|
||||
(backward-char 2))
|
||||
|
|
@ -1547,7 +1547,7 @@ Note that the style variables are always made local to the buffer."
|
|||
(defconst c-maybe-quoted-number-tail
|
||||
(concat
|
||||
"\\("
|
||||
"\\([xX']?[0-9a-fA-F]\\('[0-9a-fA-F]\\|[0-9a-fA-F]\\)*\\)"
|
||||
"\\([xX']?[[:xdigit:]]\\('[[:xdigit:]]\\|[[:xdigit:]]\\)*\\)"
|
||||
"\\|"
|
||||
"\\([bB']?[01]\\('[01]\\|[01]\\)*\\)"
|
||||
"\\|"
|
||||
|
|
@ -1567,7 +1567,7 @@ Note that this is a strict tail, so won't match, e.g. \"0x....\".")
|
|||
(defconst c-maybe-quoted-number
|
||||
(concat
|
||||
"\\(0\\("
|
||||
"\\([Xx][0-9a-fA-F]\\('[0-9a-fA-F]\\|[0-9a-fA-F]\\)*\\)"
|
||||
"\\([Xx][[:xdigit:]]\\('[[:xdigit:]]\\|[[:xdigit:]]\\)*\\)"
|
||||
"\\|"
|
||||
"\\([Bb][01]\\('[01]\\|[01]\\)*\\)"
|
||||
"\\|"
|
||||
|
|
@ -1585,9 +1585,9 @@ Note that this is a strict tail, so won't match, e.g. \"0x....\".")
|
|||
(when c-has-quoted-numbers
|
||||
(save-excursion
|
||||
(let ((here (point))
|
||||
(bound (progn (skip-chars-forward "0-9a-fA-F'") (point))))
|
||||
(bound (progn (skip-chars-forward "[:xdigit:]'") (point))))
|
||||
(goto-char here)
|
||||
(when (< (skip-chars-backward "0-9a-fA-F'") 0)
|
||||
(when (< (skip-chars-backward "[:xdigit:]'") 0)
|
||||
(if (and (memq (char-before) '(?x ?X))
|
||||
(eq (char-before (1- (point))) ?0))
|
||||
(backward-char 2))
|
||||
|
|
@ -1628,7 +1628,7 @@ Note that this is a strict tail, so won't match, e.g. \"0x....\".")
|
|||
(if (>= (point) c-new-BEG)
|
||||
(setq c-new-BEG (match-beginning 0))))
|
||||
((looking-at
|
||||
"\\([^'\\]\\|\\\\\\([0-7]\\{1,3\\}\\|[xuU][0-9a-fA-F]+\\|.\\)\\)'")
|
||||
"\\([^'\\]\\|\\\\\\([0-7]\\{1,3\\}\\|[xuU][[:xdigit:]]+\\|.\\)\\)'")
|
||||
(goto-char (match-end 0))
|
||||
(if (> (match-end 0) c-new-BEG)
|
||||
(setq c-new-BEG (1- (match-beginning 0)))))
|
||||
|
|
@ -1657,7 +1657,7 @@ Note that this is a strict tail, so won't match, e.g. \"0x....\".")
|
|||
(if (> (match-end 0) c-new-END)
|
||||
(setq c-new-END (match-end 0))))
|
||||
((looking-at
|
||||
"\\([^'\\]\\|\\\\\\([0-7]\\{1,3\\}\\|[xuU][0-9a-fA-F]+\\|.\\)\\)'")
|
||||
"\\([^'\\]\\|\\\\\\([0-7]\\{1,3\\}\\|[xuU][[:xdigit:]]+\\|.\\)\\)'")
|
||||
(goto-char (match-end 0))
|
||||
(if (> (match-end 0) c-new-END)
|
||||
(setq c-new-END (match-end 0))))
|
||||
|
|
@ -1677,8 +1677,8 @@ Note that this is a strict tail, so won't match, e.g. \"0x....\".")
|
|||
((c-quoted-number-tail-after-point)
|
||||
(setq c-new-END (match-end 0)))
|
||||
((looking-at
|
||||
"\\(\\\\\\([0-7]\\{1,3\\}\\|[xuU][0-9a-fA-F]+\\|.\\)\\|.\\)?\
|
||||
\\('\\([^'\\]\\|\\\\\\([0-7]\\{1,3\\}\\|[xuU][0-9a-fA-F]+\\|.\\)\\)\\)*'")
|
||||
"\\(\\\\\\([0-7]\\{1,3\\}\\|[xuU][[:xdigit:]]+\\|.\\)\\|.\\)?\
|
||||
\\('\\([^'\\]\\|\\\\\\([0-7]\\{1,3\\}\\|[xuU][[:xdigit:]]+\\|.\\)\\)\\)*'")
|
||||
(setq c-new-END (match-end 0))))
|
||||
|
||||
;; Remove the '(1) syntax-table property from any "'"s within (c-new-BEG
|
||||
|
|
@ -1730,7 +1730,7 @@ Note that this is a strict tail, so won't match, e.g. \"0x....\".")
|
|||
'c-digit-separator t ?')
|
||||
(goto-char num-end))
|
||||
((looking-at
|
||||
"\\([^\\']\\|\\\\\\([0-7]\\{1,3\\}\\|[xuU][0-9a-fA-F]+\\|.\\)\
|
||||
"\\([^\\']\\|\\\\\\([0-7]\\{1,3\\}\\|[xuU][[:xdigit:]]+\\|.\\)\
|
||||
\\)'") ; balanced quoted expression.
|
||||
(goto-char (match-end 0)))
|
||||
((looking-at "\\\\'") ; Anomalous construct.
|
||||
|
|
|
|||
|
|
@ -3463,18 +3463,18 @@ Should be called with the point before leading colon of an attribute."
|
|||
(defsubst cperl-highlight-charclass (endbracket dashface bsface onec-space)
|
||||
(let ((l '(1 5 7)) ll lle lll
|
||||
;; 2 groups, the first takes the whole match (include \[trnfabe])
|
||||
(singleChar (concat "\\(" "[^\\]" "\\|" "\\\\[^cdg-mo-qsu-zA-Z0-9_]" "\\|" "\\\\c." "\\|" "\\\\x" "\\([0-9a-fA-F][0-9a-fA-F]?\\|\\={[0-9a-fA-F]+}\\)" "\\|" "\\\\0?[0-7][0-7]?[0-7]?" "\\|" "\\\\N{[^{}]*}" "\\)")))
|
||||
(singleChar (concat "\\(" "[^\\]" "\\|" "\\\\[^cdg-mo-qsu-zA-Z0-9_]" "\\|" "\\\\c." "\\|" "\\\\x" "\\([[:xdigit:]][[:xdigit:]]?\\|\\={[[:xdigit:]]+}\\)" "\\|" "\\\\0?[0-7][0-7]?[0-7]?" "\\|" "\\\\N{[^{}]*}" "\\)")))
|
||||
(while ; look for unescaped - between non-classes
|
||||
(re-search-forward
|
||||
;; On 19.33, certain simplifications lead
|
||||
;; to bugs (as in [^a-z] \\| [trnfabe] )
|
||||
(concat ; 1: SingleChar (include \[trnfabe])
|
||||
singleChar
|
||||
;;"\\(" "[^\\]" "\\|" "\\\\[^cdg-mo-qsu-zA-Z0-9_]" "\\|" "\\\\c." "\\|" "\\\\x" "\\([0-9a-fA-F][0-9a-fA-F]?\\|\\={[0-9a-fA-F]+}\\)" "\\|" "\\\\0?[0-7][0-7]?[0-7]?" "\\|" "\\\\N{[^{}]*}" "\\)"
|
||||
;;"\\(" "[^\\]" "\\|" "\\\\[^cdg-mo-qsu-zA-Z0-9_]" "\\|" "\\\\c." "\\|" "\\\\x" "\\([[:xdigit:]][[:xdigit:]]?\\|\\={[[:xdigit:]]+}\\)" "\\|" "\\\\0?[0-7][0-7]?[0-7]?" "\\|" "\\\\N{[^{}]*}" "\\)"
|
||||
"\\(" ; 3: DASH SingleChar (match optionally)
|
||||
"\\(-\\)" ; 4: DASH
|
||||
singleChar ; 5: SingleChar
|
||||
;;"\\(" "[^\\]" "\\|" "\\\\[^cdg-mo-qsu-zA-Z0-9_]" "\\|" "\\\\c." "\\|" "\\\\x" "\\([0-9a-fA-F][0-9a-fA-F]?\\|\\={[0-9a-fA-F]+}\\)" "\\|" "\\\\0?[0-7][0-7]?[0-7]?" "\\|" "\\\\N{[^{}]*}" "\\)"
|
||||
;;"\\(" "[^\\]" "\\|" "\\\\[^cdg-mo-qsu-zA-Z0-9_]" "\\|" "\\\\c." "\\|" "\\\\x" "\\([[:xdigit:]][[:xdigit:]]?\\|\\={[[:xdigit:]]+}\\)" "\\|" "\\\\0?[0-7][0-7]?[0-7]?" "\\|" "\\\\N{[^{}]*}" "\\)"
|
||||
"\\)?"
|
||||
"\\|"
|
||||
"\\(" ; 7: other escapes
|
||||
|
|
@ -4368,7 +4368,7 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
|
|||
"\\=[0123456789]*" (1- e) 'to-end))
|
||||
(and (eq qtag ?x)
|
||||
(re-search-forward
|
||||
"\\=[0-9a-fA-F][0-9a-fA-F]?\\|\\={[0-9a-fA-F]+}"
|
||||
"\\=[[:xdigit:]][[:xdigit:]]?\\|\\={[[:xdigit:]]+}"
|
||||
(1- e) 'to-end))
|
||||
(and (memq qtag (append "pPN" nil))
|
||||
(re-search-forward "\\={[^{}]+}\\|."
|
||||
|
|
|
|||
|
|
@ -640,7 +640,7 @@ See documentation for variable `ebnf-abn-lex'."
|
|||
(let* ((char (following-char))
|
||||
(chars (cond ((or (= char ?B) (= char ?b)) "01")
|
||||
((or (= char ?D) (= char ?d)) "0-9")
|
||||
((or (= char ?X) (= char ?x)) "0-9A-Fa-f")
|
||||
((or (= char ?X) (= char ?x)) "[:xdigit:]")
|
||||
(t (error "Invalid terminal value")))))
|
||||
(forward-char)
|
||||
(or (> (skip-chars-forward chars ebnf-limit) 0)
|
||||
|
|
|
|||
|
|
@ -324,7 +324,7 @@
|
|||
;; /* Character Reference */
|
||||
;;
|
||||
;; CharRef ::= '&#' [0-9]+ ';'
|
||||
;; | '&#x' [0-9a-fA-F]+ ';'
|
||||
;; | '&#x' [[:xdigit:]]+ ';'
|
||||
;; [WFC: Legal Character]
|
||||
;;
|
||||
;;
|
||||
|
|
@ -915,9 +915,9 @@
|
|||
;;; EntityRef ::= '&' Name ';'
|
||||
;;;
|
||||
;;; CharRef ::= '&#' [0-9]+ ';'
|
||||
;;; | '&#x' [0-9a-fA-F]+ ';'
|
||||
;;; | '&#x' [[:xdigit:]]+ ';'
|
||||
|
||||
;;; "^\\(&\\([A-Za-z_:][-A-Za-z0-9._:]*\\|#\\(x[0-9a-fA-F]+\\|[0-9]+\\)\\);\\|[^<&]\\)*$"
|
||||
;;; "^\\(&\\([A-Za-z_:][-A-Za-z0-9._:]*\\|#\\(x[[:xdigit:]]+\\|[0-9]+\\)\\);\\|[^<&]\\)*$"
|
||||
|
||||
|
||||
(defun ebnf-dtd-attlistdecl ()
|
||||
|
|
@ -945,7 +945,7 @@
|
|||
(setq token (ebnf-dtd-lex)))
|
||||
(or (and (eq token 'string)
|
||||
(string-match
|
||||
"^\\(&\\([A-Za-z_:][-A-Za-z0-9._:]*\\|#\\(x[0-9a-fA-F]+\\|[0-9]+\\)\\);\\|[^<&]\\)*$"
|
||||
"^\\(&\\([A-Za-z_:][-A-Za-z0-9._:]*\\|#\\(x[[:xdigit:]]+\\|[0-9]+\\)\\);\\|[^<&]\\)*$"
|
||||
ebnf-dtd-lex))
|
||||
(error "Invalid default value in ATTLIST declaration"))))
|
||||
(or (eq token 'end-decl)
|
||||
|
|
@ -986,9 +986,9 @@
|
|||
;;; EntityRef ::= '&' Name ';'
|
||||
;;;
|
||||
;;; CharRef ::= '&#' [0-9]+ ';'
|
||||
;;; | '&#x' [0-9a-fA-F]+ ';'
|
||||
;;; | '&#x' [[:xdigit:]]+ ';'
|
||||
|
||||
;;; "^\\(%[A-Za-z_:][-A-Za-z0-9._:]*;\\|&\\([A-Za-z_:][-A-Za-z0-9._:]*\\|#\\(x[0-9a-fA-F]+\\|[0-9]+\\)\\);\\|[^%&]\\)*$"
|
||||
;;; "^\\(%[A-Za-z_:][-A-Za-z0-9._:]*;\\|&\\([A-Za-z_:][-A-Za-z0-9._:]*\\|#\\(x[[:xdigit:]]+\\|[0-9]+\\)\\);\\|[^%&]\\)*$"
|
||||
|
||||
|
||||
(defun ebnf-dtd-entitydecl ()
|
||||
|
|
@ -1001,7 +1001,7 @@
|
|||
(setq token (ebnf-dtd-lex))
|
||||
(if (eq token 'string)
|
||||
(if (string-match
|
||||
"^\\(%[A-Za-z_:][-A-Za-z0-9._:]*;\\|&\\([A-Za-z_:][-A-Za-z0-9._:]*\\|#\\(x[0-9a-fA-F]+\\|[0-9]+\\)\\);\\|[^%&]\\)*$"
|
||||
"^\\(%[A-Za-z_:][-A-Za-z0-9._:]*;\\|&\\([A-Za-z_:][-A-Za-z0-9._:]*\\|#\\(x[[:xdigit:]]+\\|[0-9]+\\)\\);\\|[^%&]\\)*$"
|
||||
ebnf-dtd-lex)
|
||||
(setq token (ebnf-dtd-lex))
|
||||
(error "Invalid ENTITY definition"))
|
||||
|
|
@ -1242,7 +1242,7 @@ See documentation for variable `ebnf-dtd-lex'."
|
|||
(setq ebnf-dtd-lex (if (/= (following-char) ?x)
|
||||
(ebnf-dtd-char-ref "&#" "0-9")
|
||||
(forward-char)
|
||||
(ebnf-dtd-char-ref "&#x" "0-9a-fA-F")))
|
||||
(ebnf-dtd-char-ref "&#x" "[:xdigit:]")))
|
||||
'char-ref))
|
||||
;; miscellaneous: (, ), [, ], =, |, *, +, >, `,'
|
||||
(t
|
||||
|
|
|
|||
|
|
@ -658,7 +658,7 @@ See documentation for variable `ebnf-ebx-lex'."
|
|||
(or no-error
|
||||
(error "Invalid hexadecimal character"))
|
||||
(forward-char)
|
||||
(or (> (skip-chars-forward "0-9A-Fa-f" ebnf-limit) 0)
|
||||
(or (> (skip-chars-forward "[:xdigit:]" ebnf-limit) 0)
|
||||
(error "Invalid hexadecimal character"))))
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -540,7 +540,7 @@ that form should be displayed.")
|
|||
|
||||
(defconst hif-token-regexp
|
||||
(concat (regexp-opt (mapcar 'car hif-token-alist))
|
||||
"\\|0x[0-9a-fA-F]+\\.?[0-9a-fA-F]*"
|
||||
"\\|0x[[:xdigit:]]+\\.?[[:xdigit:]]*"
|
||||
"\\|[0-9]+\\.?[0-9]*" ;; decimal/octal
|
||||
"\\|\\w+"))
|
||||
|
||||
|
|
@ -595,7 +595,7 @@ that form should be displayed.")
|
|||
;; 1. postfix 'l', 'll', 'ul' and 'ull'
|
||||
;; 2. floating number formats (like 1.23e4)
|
||||
;; 3. 098 is interpreted as octal conversion error
|
||||
(if (string-match "0x\\([0-9a-fA-F]+\\.?[0-9a-fA-F]*\\)"
|
||||
(if (string-match "0x\\([[:xdigit:]]+\\.?[[:xdigit:]]*\\)"
|
||||
token)
|
||||
(hif-string-to-number (match-string 1 token) 16)) ;; hex
|
||||
(if (string-match "\\`0[0-9]+\\(\\.[0-9]+\\)?\\'" token)
|
||||
|
|
|
|||
|
|
@ -1071,7 +1071,7 @@ VERSION is of the format (Major . Minor)"
|
|||
;; Supposedly, ISO-Prolog wants \NNN\ for octal and \xNNN\ for hexadecimal
|
||||
;; escape sequences in atoms, so be careful not to let the terminating \
|
||||
;; escape a subsequent quote.
|
||||
("\\\\[x0-7][0-9a-fA-F]*\\(\\\\\\)" (1 "_"))
|
||||
("\\\\[x0-7][[:xdigit:]]*\\(\\\\\\)" (1 "_"))
|
||||
)))
|
||||
|
||||
(defun prolog-mode-variables ()
|
||||
|
|
|
|||
|
|
@ -635,7 +635,7 @@ Adapted from `font-lock-match-c-style-declaration-item-and-skip-to-next'."
|
|||
(list (concat "^\\s-*" vera-rvm-types-regexp "\\s-*\\(\\[[^]]+\\]\\s-+\\)?")
|
||||
'(vera-font-lock-match-item nil nil (1 font-lock-variable-name-face)))
|
||||
;; highlight numbers
|
||||
'("\\([0-9]*'[bdoh][0-9a-fA-FxXzZ_]+\\)" 1 vera-font-lock-number)
|
||||
'("\\([0-9]*'[bdoh][[:xdigit:]xXzZ_]+\\)" 1 vera-font-lock-number)
|
||||
;; highlight filenames in #include directives
|
||||
'("^#\\s-*include\\s-*\\(<[^>\"\n]*>?\\)"
|
||||
1 font-lock-string-face)
|
||||
|
|
|
|||
|
|
@ -2762,7 +2762,7 @@ find the errors."
|
|||
"\\s-*\\(\\<\\(reg\\|wire\\)\\>\\s-*\\)?\\(\\<\\(un\\)?signed\\>\\s-*\\)?\\(" verilog-range-re "\\)?"))
|
||||
(defconst verilog-macroexp-re "`\\sw+")
|
||||
|
||||
(defconst verilog-delay-re "#\\s-*\\(\\([0-9_]+\\('s?[hdxbo][0-9a-fA-F_xz]+\\)?\\)\\|\\(([^()]*)\\)\\|\\(\\sw+\\)\\)")
|
||||
(defconst verilog-delay-re "#\\s-*\\(\\([0-9_]+\\('s?[hdxbo][[:xdigit:]_xz]+\\)?\\)\\|\\(([^()]*)\\)\\|\\(\\sw+\\)\\)")
|
||||
(defconst verilog-declaration-re-2-no-macro
|
||||
(concat "\\s-*" verilog-declaration-re
|
||||
"\\s-*\\(\\(" verilog-optional-signed-range-re "\\)\\|\\(" verilog-delay-re "\\)"
|
||||
|
|
@ -3292,7 +3292,7 @@ See also `verilog-font-lock-extra-types'.")
|
|||
'font-lock-preprocessor-face
|
||||
'font-lock-type-face))
|
||||
;; Fontify delays/numbers
|
||||
'("\\(@\\)\\|\\([ \t\n\f\r]#\\s-*\\(\\([0-9_.]+\\('s?[hdxbo][0-9a-fA-F_xz]*\\)?\\)\\|\\(([^()]+)\\|\\sw+\\)\\)\\)"
|
||||
'("\\(@\\)\\|\\([ \t\n\f\r]#\\s-*\\(\\([0-9_.]+\\('s?[hdxbo][[:xdigit:]_xz]*\\)?\\)\\|\\(([^()]+)\\|\\sw+\\)\\)\\)"
|
||||
0 font-lock-type-face append)
|
||||
;; Fontify property/sequence cycle delays - these start with '##'
|
||||
'("\\(##\\(\\sw+\\|\\[[^]]+\\]\\)\\)"
|
||||
|
|
@ -9182,7 +9182,7 @@ TEMP-NEXT is true to ignore next token, fake from inside case statement."
|
|||
(setq end-else-check t))
|
||||
(forward-char 1))
|
||||
((equal keywd "'")
|
||||
(cond ((looking-at "'[sS]?[hdxboHDXBO]?[ \t]*[0-9a-fA-F_xzXZ?]+")
|
||||
(cond ((looking-at "'[sS]?[hdxboHDXBO]?[ \t]*[[:xdigit:]_xzXZ?]+")
|
||||
(goto-char (match-end 0)))
|
||||
((looking-at "'{")
|
||||
(forward-char 2)
|
||||
|
|
@ -9872,7 +9872,7 @@ Allows version control to check out the file if need be."
|
|||
"Return true if SYMBOL is number-like."
|
||||
(or (string-match "^[0-9 \t:]+$" symbol)
|
||||
(string-match "^[---]*[0-9]+$" symbol)
|
||||
(string-match "^[0-9 \t]+'s?[hdxbo][0-9a-fA-F_xz? \t]*$" symbol)))
|
||||
(string-match "^[0-9 \t]+'s?[hdxbo][[:xdigit:]_xz? \t]*$" symbol)))
|
||||
|
||||
(defun verilog-symbol-detick (symbol wing-it)
|
||||
"Return an expanded SYMBOL name without any defines.
|
||||
|
|
|
|||
|
|
@ -873,7 +873,7 @@ cannot be completed sensibly: `custom-ident',
|
|||
(css--uri-re (1 "|") (2 "|"))))
|
||||
|
||||
(defconst css-escapes-re
|
||||
"\\\\\\(?:[^\000-\037\177]\\|[0-9a-fA-F]+[ \n\t\r\f]?\\)")
|
||||
"\\\\\\(?:[^\000-\037\177]\\|[[:xdigit:]]+[ \n\t\r\f]?\\)")
|
||||
(defconst css-nmchar-re (concat "\\(?:[-[:alnum:]]\\|" css-escapes-re "\\)"))
|
||||
(defconst css-nmstart-re (concat "\\(?:[[:alpha:]]\\|" css-escapes-re "\\)"))
|
||||
(defconst css-ident-re ;; (concat css-nmstart-re css-nmchar-re "*")
|
||||
|
|
@ -1079,10 +1079,10 @@ This recognizes CSS-color-4 extensions."
|
|||
(regexp-opt (mapcar #'car css--color-map) 'symbols)
|
||||
"\\|"
|
||||
;; Short hex. css-color-4 adds alpha.
|
||||
"\\(#[0-9a-fA-F]\\{3,4\\}\\b\\)"
|
||||
"\\(#[[:xdigit:]]\\{3,4\\}\\b\\)"
|
||||
"\\|"
|
||||
;; Long hex. css-color-4 adds alpha.
|
||||
"\\(#\\(?:[0-9a-fA-F][0-9a-fA-F]\\)\\{3,4\\}\\b\\)"
|
||||
"\\(#\\(?:[[:xdigit:]][[:xdigit:]]\\)\\{3,4\\}\\b\\)"
|
||||
"\\|"
|
||||
;; RGB.
|
||||
"\\(\\_<rgba?(\\)"
|
||||
|
|
|
|||
|
|
@ -1302,7 +1302,7 @@ With prefix argument UNQUOTEP, unquote the region. All numeric entities,
|
|||
(if unquotep
|
||||
;; FIXME: We should unquote other named character references as well.
|
||||
(while (re-search-forward
|
||||
"\\(&\\(amp\\|quot\\|lt\\|gt\\|#\\([0-9]+\\|[xX][0-9a-fA-F]+\\)\\)\\)\\([][<>&;\n\t \"%!'(),/=?]\\|$\\)"
|
||||
"\\(&\\(amp\\|quot\\|lt\\|gt\\|#\\([0-9]+\\|[xX][[:xdigit:]]+\\)\\)\\)\\([][<>&;\n\t \"%!'(),/=?]\\|$\\)"
|
||||
nil t)
|
||||
(replace-match
|
||||
(string
|
||||
|
|
|
|||
|
|
@ -120,7 +120,7 @@ or if we could not determine the revision.")
|
|||
(with-demoted-errors "Error running git rev-parse: %S"
|
||||
(call-process "git" nil '(t nil) nil "rev-parse" "HEAD")))
|
||||
(progn (goto-char (point-min))
|
||||
(looking-at "[0-9a-fA-F]\\{40\\}"))
|
||||
(looking-at "[[:xdigit:]]\\{40\\}"))
|
||||
(match-string 0)))))
|
||||
|
||||
(defun emacs-repository-get-version (&optional dir external)
|
||||
|
|
|
|||
|
|
@ -194,13 +194,13 @@ See also `xml-get-attribute-or-nil'."
|
|||
;; [8] Nmtokens ::= Nmtoken (#x20 Nmtoken)*
|
||||
(defconst xml-nmtokens-re (concat xml-nmtoken-re "\\(?: " xml-name-re "\\)*"))
|
||||
|
||||
;; [66] CharRef ::= '&#' [0-9]+ ';' | '&#x' [0-9a-fA-F]+ ';'
|
||||
(defconst xml-char-ref-re "\\(?:&#[0-9]+;\\|&#x[0-9a-fA-F]+;\\)")
|
||||
;; [66] CharRef ::= '&#' [0-9]+ ';' | '&#x' [[:xdigit:]]+ ';'
|
||||
(defconst xml-char-ref-re "\\(?:&#[0-9]+;\\|&#x[[:xdigit:]]+;\\)")
|
||||
|
||||
;; [68] EntityRef ::= '&' Name ';'
|
||||
(defconst xml-entity-ref (concat "&" xml-name-re ";"))
|
||||
|
||||
(defconst xml-entity-or-char-ref-re (concat "&\\(?:#\\(x\\)?\\([0-9a-fA-F]+\\)\\|\\("
|
||||
(defconst xml-entity-or-char-ref-re (concat "&\\(?:#\\(x\\)?\\([[:xdigit:]]+\\)\\|\\("
|
||||
xml-name-re "\\)\\);"))
|
||||
|
||||
;; [69] PEReference ::= '%' Name ';'
|
||||
|
|
@ -889,7 +889,7 @@ This follows the rule [28] in the XML specifications."
|
|||
The replacement text is obtained by replacing character
|
||||
references and parameter-entity references."
|
||||
(let ((ref-re (eval-when-compile
|
||||
(concat "\\(?:&#\\([0-9]+\\)\\|&#x\\([0-9a-fA-F]+\\)\\|%\\("
|
||||
(concat "\\(?:&#\\([0-9]+\\)\\|&#x\\([[:xdigit:]]+\\)\\|%\\("
|
||||
xml-name-re "\\)\\);")))
|
||||
children)
|
||||
(while (string-match ref-re string)
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@
|
|||
(should (eq 0
|
||||
(string-match
|
||||
(concat "#<module function "
|
||||
"\\(at \\(0x\\)?[0-9a-fA-F]+\\( from .*\\)?"
|
||||
"\\(at \\(0x\\)?[[:xdigit:]]+\\( from .*\\)?"
|
||||
"\\|Fmod_test_sum from .*\\)>")
|
||||
(prin1-to-string (nth 1 descr)))))
|
||||
(should (= (nth 2 descr) 3)))
|
||||
|
|
|
|||
Loading…
Reference in a new issue