mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Fix return value for CCL opcode lookup-integer

Browse source 
* src/ccl.c (ccl_driver): Fix LookupIntConstTbl return value.
* test/lisp/international/ccl-tests.el (ccl-hash-table): Add test.
* lisp/international/ccl.el (ccl-embed-data): Don't pass non-numbers
to `ccl-fixnum' (bug#36740).
This commit is contained in:
Pip Cet 2020-08-21 14:47:45 +02:00 • committed by Lars Ingebrigtsen
parent a415179b56
commit 19ee08f1e8
3 changed files with 21 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lisp/international/ccl.el
View file

@ -196,7 +196,9 @@
"Embed integer DATA in `ccl-program-vector' at `ccl-current-ic' and
increment it. If IC is specified, embed DATA at IC."
(if ic
(aset ccl-program-vector ic (ccl-fixnum data))
(aset ccl-program-vector ic (if (numberp data)
(ccl-fixnum data)
data))
(let ((len (length ccl-program-vector)))
(if (>= ccl-current-ic len)
(let ((new (make-vector (* len 2) nil)))
@ -204,7 +206,9 @@ increment it. If IC is specified, embed DATA at IC."
(setq len (1- len))
(aset new len (aref ccl-program-vector len)))
(setq ccl-program-vector new))))
(aset ccl-program-vector ccl-current-ic (ccl-fixnum data))
(aset ccl-program-vector ccl-current-ic (if (numberp data)
(ccl-fixnum data)
data))
(setq ccl-current-ic (1+ ccl-current-ic))))
(defun ccl-embed-symbol (symbol prop)