Changeset b8d197 in git

Timestamp:

Jul 15, 1999, 9:03:09 AM (24 years ago)

Author:

Tim Wichmann <wichmann@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

457bd7daf379c8a6dd5fa01fc2193ed676a5f9f3

Parents:

6652179b387ece88868cec40491432e4e627d7fc

Message:

	* singular.el: Added function singular-dynamic-complete
	Added new variable singular-completion-addsuffix
	Added define key for singular-dynamic-complete
	Remark: Loading of completion-files not ready!

	* singular.el: font-lock-levels extended to 3 levels
	Removed font-lock error in prompt fontifying
	Removed font-lock error in keywords fontifying


git-svn-id: file:///usr/local/Singular/svn/trunk@3274 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• emacs/singular.el (modified) (10 diffs)

emacs/singular.el

@@ -1 +1 @@
 ;;; singular.el --- Emacs support for Computer Algebra System Singular
 
-;; $Id: singular.el,v 1.27 1999-07-02 13:45:24 obachman Exp $
+;; $Id: singular.el,v 1.28 1999-07-15 07:03:09 wichmann Exp $
 
 ;;; Commentary:
@@ -216 +216 @@
 ;              "ring" "string" "vector"))
 
-(defvar singular-font-lock-keywords-0
+(defvar singular-font-lock-keywords-1
   '(
-    ("^\\(> \\|. \\)" . font-lock-singular-prompt-face)
+    ("^\\(> \\|\\. \\)" . font-lock-singular-prompt-face)
     ("^   [\\?].*" 0 font-lock-singular-error-face t)
     ("^// \\(\\*\\*.*\\)" 1 font-lock-singular-warn-face t)
@@ -224 +224 @@
   "Subdued level for highlighting in singular-(interactive)-mode")
 
-(defvar singular-font-lock-keywords-1
-  '(
-    ("\\<def\\|i\\(deal\\|nt\\(\\|mat\\|vec\\)\\)\\|li\\(nk\\|st\\)\\|m\\(a\\(p\\|trix\\)\\|odule\\)\\|number\\|p\\(oly\\|roc\\)\\|qring\\|r\\(esolution\\|ing\\)\\|string\\|vector\\>" . font-lock-type-face)
-    ("^\\(> \\|. \\)" . font-lock-singular-prompt-face)
-    ("^   [\\?].*" 0 font-lock-singular-error-face t)
-    ("^// \\(\\*\\*.*\\)" 1 font-lock-singular-warn-face t)
-    )
-  "Subdued level for highlighting in singular-(interactive)-mode")
-
-(defvar singular-font-lock-keywords-2 
+(defvar singular-font-lock-keywords-2
   (append
    singular-font-lock-keywords-1
+   '(
+     ("\\<\\(def\\|i\\(deal\\|nt\\(\\|mat\\|vec\\)\\)\\|li\\(nk\\|st\\)\\|m\\(a\\(p\\|trix\\)\\|odule\\)\\|number\\|p\\(oly\\|roc\\)\\|qring\\|r\\(esolution\\|ing\\)\\|string\\|vector\\)\\>" . font-lock-type-face)
+     ))
+  "Medium level for highlighting in singular-(interactive)-mode")
+
+(defvar singular-font-lock-keywords-3 
+  (append
+   singular-font-lock-keywords-2
    '(
      ("^   [\\?].*`\\(\\sw\\sw+\\)`" 1 font-lock-reference-name-face t)
@@ -242 +241 @@
   "Gaudy level for highlihgting in singular-(interactive)-mode") 
 
-(defvar singular-font-lock-keywords singular-font-lock-keywords-0
+(defvar singular-font-lock-keywords singular-font-lock-keywords-1
   "Default highlighting for singular-(interactive)-mode")
 
 (defvar singular-font-lock-defaults 
   '((singular-font-lock-keywords
-     singular-font-lock-keywords-0
-     singular-font-lock-keywords-0)
+     singular-font-lock-keywords-1 singular-font-lock-keywords-2
+     singular-font-lock-keywords-3)
     nil                   ;; KEYWORDS-ONLY 
     nil                   ;; CASE-FOLD (ignore case when non-nil)
@@ -262 +261 @@
        singular-font-lock-defaults)))
 ;;}}}
+
 ;;}}}
 
 ;;{{{ Singular interactive mode
+
 ;;{{{ Key map and menus
 (defvar singular-interactive-mode-map ()
@@ -283 +284 @@
                      'singular-interactive-mode-map)))
   (define-key singular-interactive-mode-map "\C-m" 'singular-send-or-copy-input)
+  (define-key singular-interactive-mode-map "\t" 'singular-dynamic-complete)
   (define-key singular-interactive-mode-map "\C-c\C-f" 'singular-load-file)
   (define-key singular-interactive-mode-map "\C-c\C-l" 'singular-load-library)
@@ -381 +383 @@
       (add-submenu nil 
                    singular-start-menu-definition))))
+;;}}}
 
 ;;{{{ Syntax table
@@ -551 +554 @@
 
 This variable is used to initialize `comint-input-filter' when
+Singular interactive mode starts up.")
+
+(defvar singular-completion-addsuffix '("/" . "")
+  "*Specifies suffixes to be added on completed file names and directories.
+If a cons pair, it should be of the form (DIRSUFFIX . FILESUFFIX) where
+DIRSUFFIX and FILESUFFIX are strings added on unambiguous or exact completion.
+If non-nil, add a `/' to completed directories, ` ' to file names.
+This mirrors the optional behavior of tcsh.
+
+This variable is used to initialize `comint-completion-addsuffix' when
 Singular interactive mode starts up.")
 ;;}}}
@@ -1867 +1880 @@
 ;;}}}
 
+;;{{{ Filename, Command, and Help Completion
+;; NOT READY
+;; how to find and load the completion files?
+(load-file "cmd-cmpl.el")
+(load-file "hlp-cmpl.el")
+
+(defun singular-dynamic-complete ()
+  "NOT READY: docu"
+  (interactive)
+  (if (eq (buffer-syntactic-context) 'string)
+      ;; then: expand filename
+      (comint-dynamic-complete-as-filename)
+    ;; else: expand command or help
+    (let ((end (point))
+          beg
+          pattern
+          completion-list
+          completion)
+      (save-excursion
+        (beginning-of-line)
+        (if (re-search-forward (concat singular-prompt-regexp
+                                       "[ \t]*\\([\\?]\\|help \\)[ \t]*\\(.*\\)")
+                               end t)
+            (setq pattern (match-string 2)
+                  beg (match-beginning 2)
+                  completion-list singular-completion-help-list)
+          (goto-char end)
+          (skip-chars-backward "a-zA-Z0-9")
+          (setq pattern (buffer-substring (point) end)
+                beg (point)
+                completion-list singular-completion-command-list)))
+      
+      (setq completion (try-completion pattern
+                                       completion-list))
+      (cond ((eq completion t)
+             (message "[Sole completion]"))  ;; nothing to complete
+            ((null completion)               ;; no completion found
+             (message "Can't find completion for \"%s\"" pattern)
+             (ding))
+            ((not (string= pattern completion))
+             (delete-region beg end)
+             (insert completion))
+            (t
+             (message "Making completion list...")
+             (let ((list (all-completions pattern 
+                                          completion-list)))
+               (with-output-to-temp-buffer "*Completions*"
+                 (display-completion-list list)))
+             (message "Making completion list...%s" "done"))))))
+;;}}}
+
 ;;{{{ Singular interactive mode
 (defun singular-interactive-mode ()
@@ -1919 +1983 @@
   (setq comint-input-ring-size singular-input-ring-size)
   (setq comint-input-filter singular-history-filter)
+  (setq comint-completion-addsuffix singular-completion-addsuffix)
 
   ;; get name of history file (if any)