1
0
Fork 0

- fixed missing/wrong production rules symbols for date-formatter and keybindings.

This commit is contained in:
cage 2024-06-21 17:50:29 +02:00
parent f0ba8aad71
commit 81bf22b110
2 changed files with 15 additions and 11 deletions

View File

@ -35,6 +35,9 @@
"%%") "%%")
(:text t)) (:text t))
(defrule date-formatter-percent #\%
(:constant :key))
(defrule date-formatter-text (+ (not date-formatter-percent)) (defrule date-formatter-text (+ (not date-formatter-percent))
(:text t)) (:text t))

View File

@ -95,7 +95,7 @@
(defrule keybindings-blank (or #\space #\Newline #\Tab) (defrule keybindings-blank (or #\space #\Newline #\Tab)
(:constant nil)) (:constant nil))
(defrule keybindings-blanks (* blank) (defrule keybindings-blanks (* keybindings-blank)
(:constant nil)) (:constant nil))
(defrule keybindings-escaped-character (and #\\ character) (defrule keybindings-escaped-character (and #\\ character)
@ -151,15 +151,15 @@
"key-next-page" "key-next-page"
"key-previous-page" "key-previous-page"
"key-delete-char" "key-delete-char"
arrow-right keybindings-arrow-right
arrow-left keybindings-arrow-left
arrow-up keybindings-arrow-up
arrow-down keybindings-arrow-down
key-home keybindings-key-home
key-end keybindings-key-end
key-next-page keybindings-key-next-page
key-previous-page keybindings-key-previous-page
key-delete-next-char) keybindings-key-delete-next-char)
(:text t) (:text t)
(:function string-upcase)) (:function string-upcase))
@ -259,7 +259,8 @@ produces a tree and graft the latter on `existing-tree'"
(add-child tree new-node) (add-child tree new-node)
(add new-node (rest commands))) (add new-node (rest commands)))
nil))) nil)))
(let ((raw (parse 'keypath (strcat keypath " " +function-placeholder-re+))) (let ((raw (parse 'keybindings-keypath (strcat keypath " "
+function-placeholder-re+)))
(new-tree (make-starting-comand-tree))) (new-tree (make-starting-comand-tree)))
(add new-tree raw) (add new-tree raw)
(graft-branch existing-tree (graft-branch existing-tree