aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorK. Handa2015-01-07 22:47:43 +0900
committerK. Handa2015-01-07 22:47:43 +0900
commit3f79d3131629f73da16ec121d2a0056f11b70e65 (patch)
tree4a9b18b3efdaf126d4e94139431ca21bc1045234
parent17263d51845794072bbcbfd44ea4f6ec1b8aca42 (diff)
downloademacs-3f79d3131629f73da16ec121d2a0056f11b70e65.tar.gz
emacs-3f79d3131629f73da16ec121d2a0056f11b70e65.zip
international/ccl.el (define-ccl-program): Improve the docstring.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/international/ccl.el49
2 files changed, 45 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ca7a3c45818..adcdcd9d0b8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12015-01-07 K. Handa <handa@gnu.org>
2
3 * international/ccl.el (define-ccl-program): Improve the docstring.
4
12014-12-31 Paul Eggert <eggert@cs.ucla.edu> 52014-12-31 Paul Eggert <eggert@cs.ucla.edu>
2 6
3 Less 'make' chatter in lisp directory 7 Less 'make' chatter in lisp directory
diff --git a/lisp/international/ccl.el b/lisp/international/ccl.el
index 280e3d7abb1..0c3b2af33dd 100644
--- a/lisp/international/ccl.el
+++ b/lisp/international/ccl.el
@@ -1355,6 +1355,14 @@ IF := (if EXPRESSION CCL_BLOCK_0 CCL_BLOCK_1)
1355BRANCH := (branch EXPRESSION CCL_BLOCK_0 [CCL_BLOCK_1 ...]) 1355BRANCH := (branch EXPRESSION CCL_BLOCK_0 [CCL_BLOCK_1 ...])
1356 1356
1357;; Execute STATEMENTs until (break) or (end) is executed. 1357;; Execute STATEMENTs until (break) or (end) is executed.
1358
1359;; Create a block of STATEMENTs for repeating. The STATEMENTs
1360;; are executed sequentially unitl REPEAT or BREAK is executed.
1361;; If REPEAT statement is executed, STATEMENTs are executed from the
1362;; start again. If BREAK statements is executed, the execution
1363;; exits from the block. If neither REAPEAT nor BREAK is
1364;; executed, the execution exits from the block after executing the
1365;; last STATEMENT.
1358LOOP := (loop STATEMENT [STATEMENT ...]) 1366LOOP := (loop STATEMENT [STATEMENT ...])
1359 1367
1360;; Terminate the most inner loop. 1368;; Terminate the most inner loop.
@@ -1501,17 +1509,42 @@ ARRAY := `[' integer ... `]'
1501 1509
1502 1510
1503TRANSLATE := 1511TRANSLATE :=
1504 (translate-character REG(table) REG(charset) REG(codepoint)) 1512 ;; Decode character SRC, translate it by translate table
1505 | (translate-character SYMBOL REG(charset) REG(codepoint)) 1513 ;; TABLE, and encode it back to DST. TABLE is specified
1506 ;; SYMBOL must refer to a table defined by `define-translation-table'. 1514 ;; by its id number in REG_0, SRC is specified by its
1515 ;; charset id number and codepoint in REG_1 and REG_2
1516 ;; respectively.
1517 ;; On encoding, the charset of highest priority is selected.
1518 ;; After the execution, DST is specified by its charset
1519 ;; id number and codepouin in REG_1 and REG_2 respectively.
1520 (translate-character REG_0 REG_1 REG_2)
1521
1522 ;; Same as above except for SYMBOL specifying the name of
1523 ;; the translate table defined by `define-translation-table'.
1524 | (translate-character SYMBOL REG_1 REG_2)
1525
1507LOOKUP := 1526LOOKUP :=
1508 (lookup-character SYMBOL REG(charset) REG(codepoint)) 1527 ;; Look up character SRC in hash table TABLE. TABLE is
1528 ;; specified by its name in SYMBOL, and SRC is specified by
1529 ;; its charset id number and codepoint in REG_1 and REG_2
1530 ;; respectively.
1531 ;; If its associated value is an integer, set REG_1 to that
1532 ;; value, and set r7 to 1. Otherwise, set r7 to 0.
1533 (lookup-character SYMBOL REG_1 REG_2)
1534
1535 ;; Look up integer value N in hash table TABLE. TABLE is
1536 ;; specified by its name in SYMBOL and N is specified in
1537 ;; REG.
1538 ;; If its associated value is a character, set REG to that
1539 ;; value, and set r7 to 1. Otherwise, set r7 to 0.
1509 | (lookup-integer SYMBOL REG(integer)) 1540 | (lookup-integer SYMBOL REG(integer))
1510 ;; SYMBOL refers to a table defined by `define-translation-hash-table'. 1541
1511MAP := 1542MAP :=
1512 (iterate-multiple-map REG REG MAP-IDs) 1543 ;; The following statements are for internal use only.
1513 | (map-multiple REG REG (MAP-SET)) 1544 (iterate-multiple-map REG REG MAP-IDs)
1514 | (map-single REG REG MAP-ID) 1545 | (map-multiple REG REG (MAP-SET))
1546 | (map-single REG REG MAP-ID)
1547
1515MAP-IDs := MAP-ID ... 1548MAP-IDs := MAP-ID ...
1516MAP-SET := MAP-IDs | (MAP-IDs) MAP-SET 1549MAP-SET := MAP-IDs | (MAP-IDs) MAP-SET
1517MAP-ID := integer 1550MAP-ID := integer