From 00b4e0a9bb0aa6fc6af997eeeff109cb263eddcf Mon Sep 17 00:00:00 2001 From: Andrea Corallo Date: Sun, 8 Nov 2020 12:16:34 +0100 Subject: [PATCH] * Fix limple-mode for new type and range limple semantic * lisp/emacs-lisp/comp.el (comp-limple-branches, comp-limple-ops): New variables. (comp-limple-lock-keywords): Update value. --- lisp/emacs-lisp/comp.el | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el index ad0ac21389e..055adcc4973 100644 --- a/lisp/emacs-lisp/comp.el +++ b/lisp/emacs-lisp/comp.el @@ -242,6 +242,15 @@ Useful to hook into pass checkers.") direct-callref) "Limple operators use to call subrs.") +(defconst comp-limple-branches '(jump cond-jump) + "Limple operators use for conditional and unconditional branches.") + +(defconst comp-limple-ops `(,@comp-limple-calls + ,@comp-limple-assignments + ,@comp-limple-branches + return) + "All limple operators.") + (define-error 'native-compiler-error-dyn-func "can't native compile a non-lexically-scoped function" 'native-compiler-error) @@ -584,7 +593,8 @@ Assume allocation class 'd-default as default." (seq (or "entry_" "entry_fallback_" "bb_") (1+ num) (? "_latch"))))) (1 font-lock-constant-face)) - (,(rx "(" (group-n 1 (1+ (or word "-")))) + (,(rx-to-string + `(seq "(" (group-n 1 (or ,@(mapcar #'symbol-name comp-limple-ops))))) (1 font-lock-keyword-face))) "Highlights used by comp-limple-mode.") -- 2.39.5