From 9ef149355621242505a2fed1fa94da97db50bd62 Mon Sep 17 00:00:00 2001 From: Thomas Kleymann Date: Fri, 1 Nov 1996 16:15:23 +0000 Subject: improved font-lock customisation for LEGO --- lego.el | 99 +++++++++++++++++++++++++++++++++++++++------------------------- proof.el | 8 ++++-- 2 files changed, 65 insertions(+), 42 deletions(-) diff --git a/lego.el b/lego.el index b09c709c..897cec86 100644 --- a/lego.el +++ b/lego.el @@ -1,9 +1,10 @@ -;; proof.el Major mode for proof assistants Copyright (C) 1994, -;; 1995, 1996 LFCS Edinburgh. This version by Dilip Sequeira, by -;; rearranging Thomas Schreiber's code. +;; lego.el Major mode for LEGO proof assistants +;; Copyright (C) 1994, 1995, 1996 LFCS Edinburgh. +;; This version by Dilip Sequeira, by rearranging Thomas Schreiber's +;; code. ;; Maintainer: LEGO Team -;; Time-stamp: <25 Oct 96 tms ~/elisp/lego.el> +;; Time-stamp: <01 Nov 96 tms /home/tms/elisp/lego.el> ;; Thanks to David Aspinall, Robert Boyer, Rod Burstall, ;; James McKinna, Mark Ruys, Martin Steffen, Perdita Stevens @@ -120,14 +121,19 @@ ;; ----- keywords for font-lock. If you want to hack deeper, you'd better ;; ----- be fluent in regexps - it's in the YUK section. -(defvar lego-keywords - '("andI" "Claim" "Constructors" "Cut" "Discharge" "DischargeKeep" +(defvar lego-keywords-goal '("Goal")) + +(defvar lego-keywords-save + '("Save" "SaveFrozen" "SaveUnfrozen")) + +(defvar lego-keywords + (append lego-keywords-goal lego-keywords-save '("andI" "Claim" + "Constructors" "Cut" "Discharge" "DischargeKeep" "Double" "echo" "ElimOver" "Expand" "ExpAll" "ExportState" "Equiv" - "Fields" "Freeze" "From" "$?Goal" "Hnf" "Immed" "Import" "Induction" - "Inductive" "Inversion" "Init" "intros" "Intros" "Module" "Next" - "NoReductions" "Normal" "Parameters" "Qnify" "Qrepl" "Record" - "Refine" "Relation" "$?Save" "$?SaveFrozen" "$?SaveUnfrozen" - "Theorems" "Unfreeze")) + "Fields" "Freeze" "From" "Hnf" "Immed" "Import" + "Induction" "Inductive" "Inversion" "Init" "intros" "Intros" + "Module" "Next" "NoReductions" "Normal" "Parameters" "Qnify" + "Qrepl" "Record" "Refine" "Relation" "Theorems" "Unfreeze"))) (defvar lego-shell-keywords '("Cd" "Ctxt" "Decls" "Forget" "ForgetMark" "Help" "KillRef" "Load" @@ -234,8 +240,17 @@ ;; * **** * * ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +(defvar lego-w "\\(\\w\\|,\\)" + "*For font-lock, we treat \",\" separated identifiers as one identifier + and refontify commata using \\{lego-fixup-change}.") + (defun lego-decl-defn-regexp (char) - (concat "\\[ *\\([^][" char " ]+\\) *\\(\\[[^]]*\\]\\)* *" char)) + (concat "\\[\\s *\\(" lego-w "+\\)\\s *\\(\\[[^]]+\\]\\s *\\)*" char)) +; Examples +; ^ ^^^^ ^^^^^^^^^^^^^^^^^^^^^^^ ^^^^ +; [ sort = +; [ sort [n:nat] = +; [ sort [abbrev=...][n:nat] = (defvar lego-font-lock-keywords-1 (list @@ -243,33 +258,38 @@ (cons (ids-to-regexp lego-keywords) 'font-lock-keyword-face) (cons (ids-to-regexp lego-tacticals) 'font-lock-tacticals-name-face) - (list (lego-decl-defn-regexp ":") 1 'font-lock-declaration-name-face) - (list (lego-decl-defn-regexp "|") 1 'font-lock-declaration-name-face) + (list (lego-decl-defn-regexp "\\(:\\||\\)") 1 + 'font-lock-declaration-name-face) (list (lego-decl-defn-regexp "=") 1 'font-lock-function-name-face) - (list "[{<]\\([^:|]+\\)" 1 'font-lock-declaration-name-face) - (list "\\<$?Goal\\>[ \t]+\\(\\<[^ \t\n\):]+\\) *:" - 1 'font-lock-function-name-face) - (list "\\<$?Save\\>[ \t]+\\([^ \t\n\):]+\\) *;" 1 - 'font-lock-function-name-face) - ;; Kinds + (list (concat "[{<]\\s *\\(" lego-w "+\\)") 1 +; ^ Pi binder +; ^ Sigma binder + 'font-lock-declaration-name-face) - '("\\\\|\\\\|\\ \\([^ \t\n\)]+\\) =" 1 font-lock-function-name-face) - '("^\\(value of\\|type of\\) \\([^ \t\n\)]+\\) =" 2 + '("\\ \\(\\w]+\\) =" 1 font-lock-function-name-face) + '("^\\(value of\\|type of\\) \\(\\w+\\) =" 2 font-lock-function-name-face) - '("^ \\([^ \t\n\)]+\\) = ... :" 1 font-lock-function-name-face) + '("^ \\(\\w+\\) = ... :" 1 font-lock-function-name-face) - '("^ \\([^ \t\n\)]+\\) : " 1 font-lock-declaration-name-face) - '("\\ \\([^:]+\\) :" 1 font-lock-declaration-name-face) - '("\\ \\(.+\\) |" 1 font-lock-declaration-name-face) - '("^value = \\([^ \t\n\)]+\\)" 1 font-lock-declaration-name-face) + '("^ \\(\\w+\\) : " 1 font-lock-declaration-name-face) + '("\\ \\(\\w+\\) :" 1 font-lock-declaration-name-face) + '("\\ \\(\\w+\\) |" 1 font-lock-declaration-name-face) + '("^value = \\(\\w+\\)" 1 font-lock-declaration-name-face) ;; Error Messages (only required in the process buffer) @@ -277,9 +297,9 @@ '("^Error.*\n" .font-lock-error-face)))) ;; -;; A big hack to unfontify commas in declarations. All that can be -;; said for it is that the previous way of doing this was even more -;; bogus. +;; A big hack to unfontify commas in declarations and definitions. All +;; that can be said for it is that the previous way of doing this was +;; even more bogus. ;; ;; Refontify the whole line, 'cos that's what font-lock-after-change @@ -292,8 +312,9 @@ (end (progn (goto-char end) (end-of-line) (point)))) (goto-char start) (while (search-forward "," end t) - (if (eq (get-char-property (- (point) 1) 'face) - 'font-lock-declaration-name-face) + (if (memq (get-char-property (- (point) 1) 'face) + '(font-lock-declaration-name-face + font-lock-function-name-face)) (font-lock-remove-face (- (point) 1) (point))))))) (defun lego-zap-commas-buffer () @@ -424,7 +445,7 @@ (lego-shell-start-pp) (setq compilation-search-path (cons nil (lego-get-path))) (add-hook 'proof-safe-send-hook 'lego-adjust-line-width) - (add-hook 'proof-shell-exit-hook 'lego-zap-line-width) + (add-hook 'proof-shell-exit-hook 'lego-shell-zap-line-width) (font-lock-fontify-buffer)) @@ -553,11 +574,11 @@ (and (equal (buffer-size) 0) buffer-file-name (or (file-exists-p buffer-file-name) - (prog2 - (insert-before-markers - (format "Module %s;" (lego-module-name buffer-file-name))) - ))) - ) + (insert-before-markers + (format "Module %s;" (lego-module-name buffer-file-name)) + )))) + + diff --git a/proof.el b/proof.el index a4b2bf25..26c1e749 100644 --- a/proof.el +++ b/proof.el @@ -3,7 +3,7 @@ ;; rearranging Thomas Schreiber's code. ;; Maintainer: LEGO Team -;; Time-stamp: <25 Oct 96 tms ~/elisp/proof.el> +;; Time-stamp: <30 Oct 96 tms /home/tms/elisp/proof.el> ;; Thanks to David Aspinall, Robert Boyer, Rod Burstall, ;; James McKinna, Mark Ruys, Martin Steffen, Perdita Stevens @@ -214,7 +214,9 @@ (display-buffer tmp-buffer))) (defun proof-append-terminator (string) - (or (string-match proof-re-end-of-cmd string) + (or (and + (string-match proof-re-end-of-cmd string) + string) (setq string (concat string proof-terminal-string)))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -492,7 +494,7 @@ current command." (define-key proof-mode-map [(control c) (control e)] 'proof-find-end-of-command) (define-key proof-mode-map [(control c) (control j)] 'proof-send-line) -(define-key proof-mode-map [(control c) r] 'proof-send-region) +(define-key proof-mode-map [(control c) (control r)] 'proof-send-region) (define-key proof-mode-map [(control c) (control c)] 'proof-interrupt-subjob) (define-derived-mode proof-shell-mode comint-mode -- cgit v1.2.3