--- gforth/gforth.el	2001/05/06 13:42:56	1.49
+++ gforth/gforth.el	2001/06/17 16:13:50	1.51
@@ -171,8 +171,10 @@ PARSED-TYPE specifies what kind of text
 	 immediate (font-lock-constant-face . 3))
 	))
 
+(defvar forth-use-objects nil 
+  "*Non-nil makes forth-mode also hilight words from the \"Objects\" package.")
 (defvar forth-objects-words nil
-  "Hilighting description for words of the \"Objects\" OOP package")
+  "Hilighting description for words of the \"Objects\" package")
 (setq forth-objects-words 
       '(((":m") definition-starter (font-lock-keyword-face . 1)
 	 "[ \t\n]" t name (font-lock-function-name-face . 3))
@@ -202,10 +204,11 @@ PARSED-TYPE specifies what kind of text
 	  "methods" "end-methods" "this") 
 	 non-immediate (font-lock-keyword-face . 2))
 	(("object") non-immediate (font-lock-type-face . 2))))
-; (nconc forth-words forth-objects-words)
 
+(defvar forth-use-oof nil 
+  "*Non-nil makes forth-mode also hilight words from the \"OOF\" package.")
 (defvar forth-oof-words nil
-  "Hilighting description for words of the \"OOF\" OOP package")
+  "Hilighting description for words of the \"OOF\" package")
 (setq forth-oof-words 
       '((("class") non-immediate (font-lock-keyword-face . 2)
 	 "[ \t\n]" t name (font-lock-type-face . 3))
@@ -223,16 +226,21 @@ PARSED-TYPE specifies what kind of text
 	  "endwith")
 	 non-immediate (font-lock-keyword-face . 2))
 	(("object") non-immediate (font-lock-type-face . 2))))
-; (nconc forth-words forth-oof-words)
 
 (defvar forth-local-words nil 
   "List of Forth words to prepend to `forth-words'. Should be set by a 
-forth source, using a local variables list at the end of the file 
-(\"Local Variables: ... forth-local-words: ... End:\" construct).")
+ forth source, using a local variables list at the end of the file 
+ (\"Local Variables: ... forth-local-words: ... End:\" construct).") 
+
+(defvar forth-custom-words nil
+  "List of Forth words to prepend to `forth-words'. Should be set in your
+ .emacs.")
 
 (defvar forth-hilight-level 3 "*Level of hilighting of Forth code.")
+
 (defvar forth-compiled-words nil "Compiled representation of `forth-words'.")
 
+
 ; todo:
 ;
 
@@ -241,8 +249,6 @@ forth source, using a local variables li
 ; `forth-use-oof' could be set to non-nil for automatical adding of those
 ; word-lists. Using local variable list?
 ;
-; Anzeige von Screen-Nummern in Status-Zeile (S???)
-;
 ; Konfiguration über customization groups
 ;
 ; Bereich nur auf Wortanfang/ende ausweiten, wenn anfang bzw ende in einem 
@@ -251,16 +257,18 @@ forth source, using a local variables li
 ; User interface
 ;
 ; 'forth-word' property muss eindeutig sein!
+;
+; imenu support schlauer machen
 
 (setq debug-on-error t)
 
-;; Filter list by predicat. This is a somewhat standard function for 
+;; Filter list by predicate. This is a somewhat standard function for 
 ;; functional programming languages. So why isn't it already implemented 
 ;; in Lisp??
-(defun forth-filter (predicat list)
+(defun forth-filter (predicate list)
   (let ((filtered nil))
     (mapcar (lambda (item)
-	      (when (funcall predicat item)
+	      (when (funcall predicate item)
 		(if filtered
 		    (nconc filtered (list item))
 		  (setq filtered (cons item nil))))
@@ -312,7 +320,7 @@ forth source, using a local variables li
 (defun forth-compile-words ()
   "Compile the the words from `forth-words' and `forth-indent-words' into
  the format that's later used for doing the actual hilighting/indentation.
-Store the resulting compiled wordlists in `forth-compiled-words' and 
+ Store the resulting compiled wordlists in `forth-compiled-words' and 
 `forth-compiled-indent-words', respective"
   (setq forth-compiled-words 
 	(forth-compile-wordlist 
@@ -321,14 +329,27 @@ Store the resulting compiled wordlists i
 	(forth-compile-wordlist forth-indent-words)))
 
 (defun forth-hack-local-variables ()
-  "Parse and bind local variables, set in the contens of the current 
-forth-mode buffer. Prepend `forth-local-words' to `forth-words' and 
-`forth-local-indent-words' to `forth-local-words'."
+  "Parse and bind local variables, set in the contents of the current 
+ forth-mode buffer. Prepend `forth-local-words' to `forth-words' and 
+ `forth-local-indent-words' to `forth-indent-words'."
   (hack-local-variables)
   (setq forth-words (append forth-local-words forth-words))
   (setq forth-indent-words (append forth-local-indent-words 
 				   forth-indent-words)))
 
+(defun forth-customize-words ()
+  "Add the words from `forth-custom-words' and `forth-custom-indent-words'
+ to `forth-words' and `forth-indent-words', respective. Add 
+ `forth-objects-words' and/or `forth-oof-words' to `forth-words', if
+ `forth-use-objects' and/or `forth-use-oof', respective is set."
+  (setq forth-words (append forth-custom-words forth-words
+			    (if forth-use-oof forth-oof-words nil)
+			    (if forth-use-objects forth-objects-words nil)))
+  (setq forth-indent-words (append 
+			    forth-custom-indent-words forth-indent-words)))
+
+
+
 ;; get location of first character of previous forth word that's got 
 ;; properties
 (defun forth-previous-start (pos)
@@ -437,11 +458,9 @@ forth-mode buffer. Prepend `forth-local-
 ;; Search for known Forth words in the range `from' to `to', using 
 ;; `forth-next-known-forth-word' and set their properties via 
 ;; `forth-set-word-properties'.
-(defun forth-update-properties (from to)
+(defun forth-update-properties (from to &optional loudly)
   (save-excursion
-    (let ((msg-flag nil) (state) (word-descr) (last-location))
-      (when (> to (+ from 5000))
-	(setq msg-flag t) (message "Parsing Forth code..."))
+    (let ((msg-count 0) (state) (word-descr) (last-location))
       (goto-char (forth-previous-word (forth-previous-start 
 				       (max (point-min) (1- from)))))
       (setq to (forth-next-end (min (point-max) (1+ to))))
@@ -452,6 +471,11 @@ forth-mode buffer. Prepend `forth-local-
       (forth-delete-properties (point) to)
       ;; hilight loop...
       (while (setq word-descr (forth-next-known-forth-word to))
+	(when loudly
+	  (when (equal 0 (% msg-count 100))
+	    (message "Parsing Forth code...%s"
+		     (make-string (/ msg-count 100) ?.)))
+	  (setq msg-count (1+ msg-count)))
 	(forth-set-word-properties state word-descr)
 	(when state (put-text-property last-location (point) 'forth-state t))
 	(let ((type (car word-descr)))
@@ -468,7 +492,6 @@ forth-mode buffer. Prepend `forth-local-
 				to 'forth-state (current-buffer) (point-max))))
 		(forth-update-properties to extend-to))
 	    ))
-      (when msg-flag (message "Parsing Forth code...done"))
       )))
 
 ;; save-buffer-state borrowed from `font-lock.el'
@@ -487,12 +510,12 @@ forth-mode buffer. Prepend `forth-local-
 ;; Function that is added to the `change-functions' hook. Calls 
 ;; `forth-update-properties' and keeps care of disabling undo information
 ;; and stuff like that.
-(defun forth-change-function (from to len)
+(defun forth-change-function (from to len &optional loudly)
   (save-match-data
     (forth-save-buffer-state () 
      (unwind-protect 
 	 (progn 
-	   (forth-update-properties from to)
+	   (forth-update-properties from to loudly)
 	   (forth-update-show-screen)
 	   (forth-update-warn-long-lines))))))
 
@@ -503,6 +526,40 @@ forth-mode buffer. Prepend `forth-local-
   (byte-compile 'forth-delete-properties)
   (byte-compile 'forth-get-regexp-branch)) 
 
+;;; imenu support
+;;;
+(defun forth-next-definition-starter ()
+  (progn
+    (let* ((regexp (car forth-compiled-defining-words))
+	   (pos (re-search-forward regexp (point-max) t)))
+      (message "regexp: %s pos:%s" regexp pos)
+      (if pos
+	  (if (or (text-property-not-all (match-beginning 0) (match-end 0) 
+					  'forth-parsed nil)
+		   (text-property-not-all (match-beginning 0) (match-end 0)
+					  'forth-state nil)) 
+	      (forth-next-definition-starter)
+	    t)
+	nil))))
+
+(defun forth-create-index ()
+  (let* ((defwords 
+	  (forth-filter (lambda (word) 
+			  (and (eq (nth 1 word) 'definition-starter)
+			       (> (length word) 3)))
+			forth-words))
+	 (forth-compiled-defining-words (forth-compile-wordlist defwords))
+	 (index nil))
+    (goto-char (point-min))
+    (while (forth-next-definition-starter)
+      (if (looking-at "[ \t]*\\([^ \t\n]+\\)")
+	  (setq index (cons (cons (match-string 1) (point)) index))))
+    (message "index: %s" index)
+    index))
+
+(speedbar-add-supported-extension ".fs")
+(speedbar-add-supported-extension ".fb")
+
 ;; (require 'profile)
 ;; (setq profile-functions-list '(forth-set-word-properties forth-next-known-forth-word forth-update-properties forth-delete-properties forth-get-regexp-branch))
 
@@ -560,6 +617,10 @@ buffer is created. Should be set by a Fo
 list at the end of the file (\"Local Variables: ... forth-local-words: ... 
 End:\" construct).")
 
+(defvar forth-custom-indent-words nil
+  "List of Forth words to prepend to `forth-indent-words'. Should be set in
+ your .emacs.")
+
 (defvar forth-indent-level 4
   "Indentation of Forth statements.")
 (defvar forth-minor-indent-level 2
@@ -838,9 +899,9 @@ screen number."
 	(setq overlay-arrow-string forth-overlay-arrow-string)
 	(goto-line first-line)
 	(setq overlay-arrow-position forth-screen-marker)
-	(when (/= forth-screen-marker (point))
-	  (message "Entered screen #%i" scr)
-	  (set-marker forth-screen-marker (point)))))))
+	(set-marker forth-screen-marker 
+		    (save-excursion (goto-line first-line) (point)))
+	(setq forth-screen-number-string (format "%d" scr))))))
 
 (add-hook 'forth-motion-hooks 'forth-update-show-screen)
 
@@ -984,8 +1045,12 @@ exceeds 64 characters."
   (make-local-variable 'forth-show-screen)
   (make-local-variable 'forth-screen-marker)
   (make-local-variable 'forth-warn-long-lines)
+  (make-local-variable 'forth-screen-number-string)
+  (make-local-variable 'forth-use-oof)
+  (make-local-variable 'forth-use-objects) 
   (setq forth-screen-marker (copy-marker 0))
-  (add-hook 'after-change-functions 'forth-change-function))
+  (add-hook 'after-change-functions 'forth-change-function)
+  (setq imenu-create-index-function 'forth-create-index))
 
 ;;;###autoload
 (defun forth-mode ()
@@ -1024,7 +1089,18 @@ Variables controlling interaction and st
 Variables controlling syntax hilighting/recognition of parsed text:
  `forth-words'
     List of words that have a special parsing behaviour and/or should be
-    hilighted.
+    hilighted. Add custom words by setting forth-custom-words in your
+    .emacs, or by setting forth-local-words, in source-files' local 
+    variables lists.
+ forth-use-objects
+    Set this variable to non-nil in your .emacs, or a local variables 
+    list, to hilight and recognize the words from the \"Objects\" package 
+    for object-oriented programming.
+ forth-use-oof
+    Same as above, just for the \"OOF\" package.
+ forth-custom-words
+    List of custom Forth words to prepend to `forth-words'. Should be set
+    in your .emacs.
  forth-local-words
     List of words to prepend to `forth-words', whenever a forth-mode
     buffer is created. That variable should be set by Forth sources, using
@@ -1035,39 +1111,37 @@ Variables controlling syntax hilighting/
        forth-local-words: ...
        End:
     [THEN]
- forth-objects-words
-    Hilighting information for the words of the \"Objects\" package for 
-    object-oriented programming. Append it to `forth-words', if you need 
-    it.
- forth-oof-words
-    Hilighting information for the words of the \"OOF\" package.
  forth-hilight-level
     Controls how much syntax hilighting is done. Should be in the range 
+    0..3
 
 Variables controlling indentation style:
  `forth-indent-words'
     List of words that influence indentation.
- `forth-local-indent-words'
+ forth-local-indent-words
     List of words to prepend to `forth-indent-words', similar to 
-    `forth-local-words'. Should be used for specifying file-specific 
+    forth-local-words. Should be used for specifying file-specific 
     indentation, using a local variables list.
+ forth-custom-indent-words
+    List of words to prepend to `forth-indent-words'. Should be set in your
+    .emacs.    
  forth-indent-level
     Indentation increment/decrement of Forth statements.
  forth-minor-indent-level
     Minor indentation increment/decrement of Forth statemens.
 
 Variables controlling block-file editing:
- `forth-show-screen'
+ forth-show-screen
     Non-nil means, that the start of the current screen is marked by an
-    overlay arrow, and motion over screen boundaries displays the number 
-    of the screen entered. This variable is by default nil for `forth-mode' 
-    and t for `forth-block-mode'.
- `forth-overlay-arrow-string'
+    overlay arrow, and screen numbers are displayed in the mode line.
+    This variable is by default nil for `forth-mode' and t for 
+    `forth-block-mode'.
+ forth-overlay-arrow-string
     String to display as the overlay arrow, when `forth-show-screen' is t.
     Setting this variable to nil disables the overlay arrow.
- `forth-block-base'
+ forth-block-base
     Screen number of the first block in a block file. Defaults to 1.
- `forth-warn-long-lines'
+ forth-warn-long-lines
     Non-nil means that a warning message is displayed whenever you edit or
     move over a line that is longer than 64 characters (the maximum line
     length that can be stored into a block file). This variable defaults to
@@ -1104,6 +1178,7 @@ Variables controling documentation searc
 ;      (run-forth forth-program-name))
   (run-hooks 'forth-mode-hook))
 
+;;;###autoload
 (define-derived-mode forth-block-mode forth-mode "Forth Block Source" 
   "Major mode for editing Forth block source files, derived from 
 `forth-mode'. Differences to `forth-mode' are:
@@ -1117,7 +1192,7 @@ echo area and the line is truncated.
 
 Another problem is imposed by block files that contain newline or tab 
 characters. When Emacs converts such files back to block file format, 
-it'll translate those characters to a number of spaces. However, whenever
+it'll translate those characters to a number of spaces. However, when
 you read such a file, a warning message is displayed in the echo area,
 including a line number that may help you to locate and fix the problem.
 
@@ -1125,15 +1200,19 @@ So have a look at the *Messages* buffer,
 bell during block file read/write operations."
   (setq buffer-file-format '(forth-blocks))
   (setq forth-show-screen t)
-  (setq forth-warn-long-lines t))
+  (setq forth-warn-long-lines t)
+  (setq forth-screen-number-string (format "%d" forth-block-base))
+  (setq mode-line-format (append (reverse (cdr (reverse mode-line-format)))
+				 '("--S" forth-screen-number-string "-%-"))))
 
 (add-hook 'forth-mode-hook
       '(lambda () 
 	 (make-local-variable 'compile-command)
 	 (setq compile-command "gforth ")
 	 (forth-hack-local-variables)
+	 (forth-customize-words)
 	 (forth-compile-words)
-	 (forth-change-function (point-min) (point-max) nil)))
+	 (forth-change-function (point-min) (point-max) nil t)))
 
 (defun forth-fill-paragraph () 
   "Fill comments (starting with '\'; do not fill code (block style
@@ -1764,4 +1843,3 @@ The region is sent terminated by a newli
 ))
 
 ;;; gforth.el ends here
-