diff options
| author | Pip Cet <pipcet@gmail.com> | 2020-08-21 14:47:45 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2020-08-21 14:47:45 +0200 |
| commit | 19ee08f1e8599ce0e0465f6ffbd4a76791d791b4 (patch) | |
| tree | 3fa8d56a55b5166e619065aade6b84cf3ced7e04 /lisp/international/ccl.el | |
| parent | a415179b56f022f50138f55d231070e3d1b00697 (diff) | |
| download | emacs-19ee08f1e8599ce0e0465f6ffbd4a76791d791b4.tar.gz | |
Fix return value for CCL opcode lookup-integer
* 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).
Diffstat (limited to 'lisp/international/ccl.el')
| -rw-r--r-- | lisp/international/ccl.el | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lisp/international/ccl.el b/lisp/international/ccl.el index d3ae23c2f70..3b3fcf4c041 100644 --- a/lisp/international/ccl.el +++ b/lisp/international/ccl.el @@ -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) |