Diff for /gforth/gforth.el between versions 1.5 and 1.6

version 1.5, 1994/07/29 11:16:21 version 1.6, 1994/08/10 17:22:36
Line 1 Line 1
 ;; This file is part of GNU Emacs.  ;; This file is part of GNU Emacs.
 ;; Changes by anton  ;; Changes by anton
 ;; This is a variant of forth.el that came with TILE  ;; This is a variant of forth.el that came with TILE.
 ;; I left most of this stuff untouched and made just a few changes for   ;; I left most of this stuff untouched and made just a few changes for 
 ;; the things I use.  ;; the things I use (mainly indentation and syntax tables).
 ;; So there is still a lot of work to do to adapt this to gforth  ;; So there is still a lot of work to do to adapt this to gforth.
   
 ;; GNU Emacs is distributed in the hope that it will be useful,  ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY.  No author or distributor  ;; but WITHOUT ANY WARRANTY.  No author or distributor
Line 37 Line 37
   
   
 (defvar forth-positives  (defvar forth-positives
   " : :noname begin do ?do while if ?dup-if ?dup-not-if else case create does> exception> struct "    " : :noname begin do ?do while if ?dup-if ?dup-not-if else case create does> exception> struct [if] [else] "
   "Contains all words which will cause the indent-level to be incremented    "Contains all words which will cause the indent-level to be incremented
 on the next line.  on the next line.
 OBS! All words in forth-positives must be surrounded by spaces.")  OBS! All words in forth-positives must be surrounded by spaces.")
   
 (defvar forth-negatives  (defvar forth-negatives
   " ; until repeat while +loop loop s+loop else then endif again endcase does> end-struct "    " ; until repeat while +loop loop s+loop else then endif again endcase does> end-struct [then] [else] "
   "Contains all words which will cause the indent-level to be decremented    "Contains all words which will cause the indent-level to be decremented
 on the current line.  on the current line.
 OBS! All words in forth-negatives must be surrounded by spaces.")  OBS! All words in forth-negatives must be surrounded by spaces.")
Line 52  OBS! All words in forth-negatives must b Line 52  OBS! All words in forth-negatives must b
   " : :noname "    " : :noname "
   "Contains all words which causes the indent to go to zero")    "Contains all words which causes the indent to go to zero")
   
   (defvar forth-prefixes
     " postpone [compile] ['] [char] "
     "words that prefix and escape other words")
   
 (defvar forth-mode-abbrev-table nil  (defvar forth-mode-abbrev-table nil
   "Abbrev table in use in Forth-mode buffers.")    "Abbrev table in use in Forth-mode buffers.")
   
Line 67  OBS! All words in forth-negatives must b Line 71  OBS! All words in forth-negatives must b
 (global-set-key "\C-x\C-m" 'forth-split)  (global-set-key "\C-x\C-m" 'forth-split)
 (global-set-key "\e " 'forth-reload)  (global-set-key "\e " 'forth-reload)
   
   (define-key forth-mode-map "\M-\C-x" 'compile)
 (define-key forth-mode-map "\e\C-m" 'forth-send-paragraph)  (define-key forth-mode-map "\e\C-m" 'forth-send-paragraph)
 (define-key forth-mode-map "\eo" 'forth-send-buffer)  (define-key forth-mode-map "\eo" 'forth-send-buffer)
 (define-key forth-mode-map "\C-x\C-m" 'forth-split)  (define-key forth-mode-map "\C-x\C-m" 'forth-split)
Line 80  OBS! All words in forth-negatives must b Line 85  OBS! All words in forth-negatives must b
 (if (not forth-mode-syntax-table)  (if (not forth-mode-syntax-table)
     (progn      (progn
       (setq forth-mode-syntax-table (make-syntax-table))        (setq forth-mode-syntax-table (make-syntax-table))
       (modify-syntax-entry ?\\ "\\" forth-mode-syntax-table)        (let ((char 0))
       (modify-syntax-entry ?/ ". 14" forth-mode-syntax-table)          (while (< char ?!)
       (modify-syntax-entry ?* ". 23" forth-mode-syntax-table)            (modify-syntax-entry char " " forth-mode-syntax-table)
       (modify-syntax-entry ?+ "." forth-mode-syntax-table)            (setq char (1+ char)))
       (modify-syntax-entry ?- "." forth-mode-syntax-table)          (while (< char 256)
       (modify-syntax-entry ?= "." forth-mode-syntax-table)            (modify-syntax-entry char "w" forth-mode-syntax-table)
       (modify-syntax-entry ?% "." forth-mode-syntax-table)            (setq char (1+ char))))
       (modify-syntax-entry ?< "." forth-mode-syntax-table)        (modify-syntax-entry ?\" "\"" forth-mode-syntax-table)
       (modify-syntax-entry ?> "." forth-mode-syntax-table)        (modify-syntax-entry ?\\ "<" forth-mode-syntax-table)
       (modify-syntax-entry ?& "." forth-mode-syntax-table)        (modify-syntax-entry ?\n ">" forth-mode-syntax-table)
       (modify-syntax-entry ?| "." forth-mode-syntax-table)        ))
       (modify-syntax-entry ?\' "\"" forth-mode-syntax-table)  ;I do not define '(' and ')' as comment delimiters, because emacs
       (modify-syntax-entry ?\t "    " forth-mode-syntax-table)  ;only supports one comment syntax (and a hack to accomodate C++); I
       (modify-syntax-entry ?) ">   " forth-mode-syntax-table)  ;use '\' for natural language comments and '(' for formal comments
       (modify-syntax-entry ?( "<   " forth-mode-syntax-table)  ;like stack comments, so for me it's better to have emacs treat '\'
       (modify-syntax-entry ?\( "()  " forth-mode-syntax-table)  ;comments as comments. I you want it different, make the appropriate
       (modify-syntax-entry ?\) ")(  " forth-mode-syntax-table)))  ;changes (best in your .emacs file).
   ;
   ;Hmm, the C++ hack could be used to support both comment syntaxes: we
   ;can have different comment styles, if both comments start with the
   ;same character. we could use ' ' as first and '(' and '\' as second
   ;character. However this would fail for G\ comments.
   
 (defconst forth-indent-level 4  (defconst forth-indent-level 4
   "Indentation of Forth statements.")    "Indentation of Forth statements.")
Line 110  OBS! All words in forth-negatives must b Line 120  OBS! All words in forth-negatives must b
   (setq paragraph-separate paragraph-start)    (setq paragraph-separate paragraph-start)
   (make-local-variable 'indent-line-function)    (make-local-variable 'indent-line-function)
   (setq indent-line-function 'forth-indent-line)    (setq indent-line-function 'forth-indent-line)
   (make-local-variable 'require-final-newline)  ;  (make-local-variable 'require-final-newline)
   (setq require-final-newline t)  ;  (setq require-final-newline t)
   (make-local-variable 'comment-start)    (make-local-variable 'comment-start)
   (setq comment-start "\\ ")    (setq comment-start "\\ ")
   ;(make-local-variable 'comment-end)    ;(make-local-variable 'comment-end)
Line 201  Variables controling documentation searc Line 211  Variables controling documentation searc
 ;      (run-forth forth-program-name))  ;      (run-forth forth-program-name))
   (run-hooks 'forth-mode-hook))    (run-hooks 'forth-mode-hook))
   
   (setq forth-mode-hook
         '(lambda () (setq compile-command "gforth ")))
   
 (defun forth-comment-indent ()  (defun forth-comment-indent ()
   (save-excursion    (save-excursion
     (beginning-of-line)      (beginning-of-line)
Line 285  Variables controling documentation searc Line 298  Variables controling documentation searc
                              forth-positives))                               forth-positives))
       (setq t2 (string-match (regexp-quote (concat " " w " "))        (setq t2 (string-match (regexp-quote (concat " " w " "))
                              forth-negatives))                               forth-negatives))
       (if (and t1 t2)  
           (setq sum (+ sum forth-indent-level)))  
       (if t1        (if t1
           (setq sum (+ sum forth-indent-level)))            (setq sum (+ sum forth-indent-level)))
       (if (and t2 (not first))        (if (and t2 (not first))
Line 297  Variables controling documentation searc Line 308  Variables controling documentation searc
   
   
 (defun forth-next-word ()  (defun forth-next-word ()
   "Return the next forth-word. Skip anything enclosed in double quotes or ()."    "Return the next forth-word. Skip anything that the forth-word takes from
   the input stream (comments, arguments, etc.)"
   ;actually, it would be better to use commands based on the
   ;syntax-table or comment-start etc.
   (let ((w1 nil))    (let ((w1 nil))
     (while (not w1)      (while (not w1)
       (skip-chars-forward " \t\n")        (skip-chars-forward " \t\n")
Line 306  Variables controling documentation searc Line 320  Variables controling documentation searc
         (setq w1 (buffer-substring p (point))))          (setq w1 (buffer-substring p (point))))
       (cond ((string-match "\"" w1)        (cond ((string-match "\"" w1)
              (progn               (progn
                (skip-chars-forward "^\"")                 (skip-chars-forward "^\"\n")
                (setq w1 nil)))                 (forward-char)))
             ((string-match "\(" w1)              ((string-match "\\\\" w1)
                (progn
                  (end-of-line)
                  ))
               ((or (equal "(" w1) (equal ".(" w1))
              (progn               (progn
                (skip-chars-forward "^\)")                 (skip-chars-forward "^)\n")
                (setq w1 nil)))                 (forward-char)))
               ((string-match (regexp-quote (concat " " w1 " ")) forth-prefixes)
                (progn (skip-chars-forward " \t\n")
                       (skip-chars-forward "^ \t\n")))
             (t nil)))              (t nil)))
     w1))      w1))
               
Line 801  The region is sent terminated by a newli Line 822  The region is sent terminated by a newli
 (define-key forth-mode-map "\C-x\C-n" 'next-error)  (define-key forth-mode-map "\C-x\C-n" 'next-error)
 (require 'compile "compile")  (require 'compile "compile")
   
 (defvar forth-compile-command "forth ")  (defvar forth-compile-command "gforth ")
 (defvar forth-compilation-window-percent-height 30)  (defvar forth-compilation-window-percent-height 30)
   
 (defun forth-compile (command)  (defun forth-compile (command)

Removed from v.1.5  
changed lines
  Added in v.1.6


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>