mixal-mode.el sync with gnu mdk project

mixal-mode.el sync with gnu mdk project

[Pieter Pareit]

[-- Attachment #1: Type: text/plain, Size: 112 bytes --]

Hello,

Could the attached patch be applied to emacs/emacs/lisp/progmodes/mixal-mode.el.

Regards,
Pieter

[-- Attachment #2: pp_051008_emacs.patch --]
[-- Type: application/octet-stream, Size: 3141 bytes --]

--- mixal-mode.el.emacs	2005-10-08 12:07:20.000000000 +0000
+++ mixal-mode.el	2005-10-08 12:28:15.000000000 +0000
@@ -17,8 +17,8 @@
 ;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 ;; MA 02110-1301 USA
 
-;; Author: Pieter E.J. Pareit <pieter.pareit@skynet.be>
-;; Maintainer: Pieter E.J. Pareit <pieter.pareit@skynet.be>
+;; Author: Pieter E.J. Pareit <pieter.pareit@gmail.com>
+;; Maintainer: Pieter E.J. Pareit <pieter.pareit@gmail.com>
 ;; Created: 09 Nov 2002
 ;; Version: 0.1
 ;; Keywords: Knuth mix mixal asm mixvm "The Art Of Computer Programming"
@@ -45,6 +45,15 @@
 ;; Have fun.
 
 ;;; History:
+;; Version 0.3:
+;; 08/10/05: sync mdk and emacs cvs
+;;           from emacs: compile-command and require-final-newline
+;;           from mdk:   see version 0.2
+;;           correct my email address
+;; Version 0.2:
+;; 06/04/05: mixasm no longer needs -g option
+;;           fontlocking of comments works in all? cases now
+;;           added some more mixal-operation-codes
 ;; Version 0.1:
 ;; Version 0.1.1:
 ;; 22/11/02: bugfix in fontlocking, needed to add a '-' to the regex.
@@ -54,7 +63,6 @@
 ;; 09/11/02: started mixal-mode.
 
 ;;; Code:
-
 (defvar compile-command)
 
 ;;; Key map
@@ -71,8 +79,8 @@
 ;;; Syntax table
 (defvar mixal-mode-syntax-table
   (let ((st (make-syntax-table)))
-    (modify-syntax-entry ?* "<" st)
-    (modify-syntax-entry ?\n ">" st)
+    ; (modify-syntax-entry ?* "<" st)    we need to do a bit more to make
+    ; (modify-syntax-entry ?\n ">" st)    fontlocking for comments work
     st)
   "Syntax table for `dot-mode'.")
 
@@ -97,6 +105,7 @@
     "LD4" "LD5" "LD6" "LDX" "LDAN" "LD1N" "LD2N" "LD3N" "LD4N" "LD5N" "LD6N"
     "LDXN" "STA" "ST1" "ST2" "ST3" "ST4" "ST5" "ST6" "STX" "STJ" "STZ" "JBUS"
     "IOC" "IN" "OUT" "JRAD" "JMP" "JSJ" "JOV" "JNOV"
+    "JL" "JE" "JG" "JGE" "JNE" "JLE"
     "JAN" "J1N" "J2N" "J3N" "J4N" "J5N" "J6N" "JXN"
     "JAZ" "J1Z" "J2Z" "J3Z" "J4Z" "J5Z" "J6Z" "JXZ"
     "JAP" "J1P" "J2P" "J3P" "J4P" "J5P" "J6P" "JXP"
@@ -124,8 +133,11 @@
     (,(regexp-opt
        mixal-assembly-pseudoinstructions 'words)
      . mixal-font-lock-assembly-pseudoinstruction-face)
-    ("^[A-Z0-9a-z]*[ \t]+[A-Z0-9a-z]+[ \t]+[\\-A-Z0-9a-z,():]*[\t]+\\(.*\\)$"
-     (1 font-lock-comment-face)))
+    ("^[A-Z0-9a-z]*[ \t]+[A-ZO-9a-z]+[ \t]+\\(=.*=\\).*$"
+     (1 font-lock-constant-face))
+    ("^[A-Z0-9a-z]*[ \t]+[A-Z0-9a-z]+[ \t]+[A-Z0-9a-z,():+-\\*=\" ]*[\t]+\\(.*\\)$"
+     (1 font-lock-comment-face))
+    ("^\\*.*$" . font-lock-comment-face))
   "Keyword highlighting specification for `mixal-mode'.")
 ; (makunbound 'mixal-font-lock-keywords)
 
@@ -1302,7 +1314,7 @@
   (set (make-local-variable 'font-lock-defaults) '(mixal-font-lock-keywords))
 ; might add an indent function in the future
 ;  (set (make-local-variable 'indent-line-function) 'mixal-indent-line)
-  (set (make-local-variable 'compile-command) (concat "mixasm -g "
+  (set (make-local-variable 'compile-command) (concat "mixasm "
 						      buffer-file-name))
   ;; mixasm will do strange when there is no final newline,
   ;; so let Emacs ensure that it is always there

[-- Attachment #3: Type: text/plain, Size: 142 bytes --]

_______________________________________________
Emacs-devel mailing list
Emacs-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-devel

Re: mixal-mode.el sync with gnu mdk project

[Stefan Monnier]

>  (defvar mixal-mode-syntax-table
>    (let ((st (make-syntax-table)))
> -    (modify-syntax-entry ?* "<" st)
> -    (modify-syntax-entry ?\n ">" st)
> +    ; (modify-syntax-entry ?* "<" st)    we need to do a bit more to make
> +    ; (modify-syntax-entry ?\n ">" st)    fontlocking for comments work
>      st)
>    "Syntax table for `dot-mode'.")

Re-indenting this code will do the wrong thing: you need 2 semi-colons,
not 1.  Such single-semin-colon comments are indented to comment-column.
 
> +    ("^[A-Z0-9a-z]*[ \t]+[A-ZO-9a-z]+[ \t]+\\(=.*=\\).*$"
> +     (1 font-lock-constant-face))
> +    ("^[A-Z0-9a-z]*[ \t]+[A-Z0-9a-z]+[ \t]+[A-Z0-9a-z,():+-\\*=\" ]*[\t]+\\(.*\\)$"
                                                                       ^^^^
                                                                        \t



        Stefan