X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/7fce54c3b09700595e14f0d5b35f1103cb9086de..2287504f893d7f04037e55e557a770a1838f854f:/el/dot-emacs.el

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index d594b17..10eddb2 100644
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -1524,6 +1524,126 @@ doesn't match any of the regular expressions in
   "Major mode for editing C# code.")
 
 ;;;--------------------------------------------------------------------------
+;;; F# programming configuration.
+
+(setq fsharp-indent-offset 2)
+
+(defun mdw-fontify-fsharp ()
+
+  (let ((punct "=<>+-*/|&%!@?"))
+    (do ((i 0 (1+ i)))
+	((>= i (length punct)))
+      (modify-syntax-entry (aref punct i) ".")))
+
+  (modify-syntax-entry ?_ "_")
+  (modify-syntax-entry ?( "(")
+  (modify-syntax-entry ?) ")")
+
+  (setq indent-tabs-mode nil)
+
+  (let ((fsharp-keywords
+	 (mdw-regexps "abstract" "and" "as" "assert" "atomic"
+		      "base" "begin" "break"
+		      "checked" "class" "component" "const" "constraint"
+		      "constructor" "continue"
+		      "default" "delegate" "do" "done" "downcast" "downto"
+		      "eager" "elif" "else" "end" "exception" "extern"
+		      "false" "finally" "fixed" "for" "fori" "fun" "function"
+		      "functor"
+		      "global"
+		      "if" "in" "include" "inherit" "inline" "interface"
+		      "internal"
+		      "lazy" "let"
+		      "match" "measure" "member" "method" "mixin" "module"
+		      "mutable"
+		      "namespace" "new" "null"
+		      "object""of" "open" "or" "override"
+		      "parallel" "params" "private" "process" "protected"
+		      "public" "pure"
+		      "rec" "recursive" "return"
+		      "sealed" "sig" "static" "struct"
+		      "tailcall" "then" "to" "trait" "true" "try" "type"
+		      "upcast" "use"
+		      "val" "virtual" "void" "volatile"
+		      "when" "while" "with"
+		      "yield"))
+
+	(fsharp-builtins
+	 (mdw-regexps "asr" "land" "lor" "lsl" "lsr" "lxor" "mod"))
+
+	(bang-keywords
+	 (mdw-regexps "do" "let" "return" "use" "yield"))
+
+	(preprocessor-keywords
+	 (mdw-regexps "if" "indent" "else" "endif")))
+
+    (setq font-lock-keywords
+	  (list (list (concat "\\(^\\|[^\"]\\)"
+			      "\\(" "(\\*"
+				    "[^*]*\\*+"
+				    "\\(" "[^)*]" "[^*]*" "\\*+" "\\)*"
+				    ")"
+			      "\\|"
+				    "//.*"
+			      "\\)")
+		      '(2 font-lock-comment-face))
+
+		(list (concat "'" "\\("
+				    "\\\\"
+				    "\\(" "[ntbr'\\]"
+				    "\\|" "[0-9][0-9][0-9]"
+				    "\\|" "u" "[0-9a-fA-F]\\{4\\}"
+				    "\\|" "U" "[0-9a-fA-F]\\{8\\}"
+				    "\\)"
+				  "\\|"
+				  "." "\\)" "'"
+			      "\\|"
+			      "\"" "[^\"\\]*"
+				    "\\(" "\\\\" "\\(.\\|\n\\)"
+					  "[^\"\\]*" "\\)*"
+			      "\\(\"\\|\\'\\)")
+		      '(0 font-lock-string-face))
+
+		(list (concat "\\_<\\(" bang-keywords "\\)!" "\\|"
+			      "^#[ \t]*\\(" preprocessor-keywords "\\)\\_>"
+			      "\\|"
+			      "\\_<\\(" fsharp-keywords "\\)\\_>")
+		      '(0 font-lock-keyword-face))
+		(list (concat "\\<\\(" fsharp-builtins "\\)\\_>")
+		      '(0 font-lock-variable-name-face))
+
+		(list (concat "\\_<"
+			      "\\(" "0[bB][01]+" "\\|"
+				    "0[oO][0-7]+" "\\|"
+				    "0[xX][0-9a-fA-F]+" "\\)"
+			      "\\(" "lf\\|LF" "\\|"
+				    "[uU]?[ysnlL]?" "\\)"
+			      "\\|"
+			      "\\_<"
+			      "[0-9]+" "\\("
+				"[mMQRZING]"
+				"\\|"
+				"\\(\\.[0-9]*\\)?"
+				"\\([eE][-+]?[0-9]+\\)?"
+				"[fFmM]?"
+				"\\|"
+				"[uU]?[ysnlL]?"
+			      "\\)")
+		      '(0 mdw-number-face))
+
+		(list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"
+		      '(0 mdw-punct-face)))))
+
+  (mdw-post-config-mode-hack))
+
+(defun mdw-fontify-inferior-fsharp ()
+  (mdw-fontify-fsharp)
+  (setq font-lock-keywords
+	(append (list (list "^[#-]" '(0 font-lock-comment-face))
+		      (list "^>" '(0 font-lock-keyword-face)))
+		font-lock-keywords)))
+
+;;;--------------------------------------------------------------------------
 ;;; Go programming configuration.
 
 (defun mdw-fontify-go ()
@@ -1534,7 +1654,16 @@ doesn't match any of the regular expressions in
 		      "default" "defer" "else" "fallthrough" "for"
 		      "func" "go" "goto" "if" "import"
 		      "interface" "map" "package" "range" "return"
-		      "select" "struct" "switch" "type" "var")))
+		      "select" "struct" "switch" "type" "var"))
+	(go-intrinsics
+	 (mdw-regexps "bool" "byte" "complex64" "complex128" "error"
+		      "float32" "float64" "int" "uint8" "int16" "int32"
+		      "int64" "rune" "string" "uint" "uint8" "uint16"
+		      "uint32" "uint64" "uintptr" "void"
+		      "false" "iota" "nil" "true"
+		      "init" "main"
+		      "append" "cap" "copy" "delete" "imag" "len" "make"
+		      "new" "panic" "real" "recover")))
 
     (setq font-lock-keywords
 	  (list
@@ -1542,6 +1671,8 @@ doesn't match any of the regular expressions in
 	   ;; Handle the keywords defined above.
 	   (list (concat "\\<\\(" go-keywords "\\)\\>")
 		 '(0 font-lock-keyword-face))
+	   (list (concat "\\<\\(" go-intrinsics "\\)\\>")
+		 '(0 font-lock-variable-name-face))
 
 	   ;; Handle numbers too.
 	   ;;
@@ -2151,6 +2282,12 @@ strip numbers instead."
   (modify-syntax-entry ?} ". 4b")
   (modify-syntax-entry ?\n ">")
 
+  ;; Make punctuation be punctuation
+  (let ((punct "=<>+-*/|&%!@?$.^:#`"))
+    (do ((i 0 (1+ i)))
+	((>= i (length punct)))
+      (modify-syntax-entry (aref punct i) ".")))
+
   ;; Set fill prefix.
   (mdw-standard-fill-prefix "\\([ \t]*{?--?[ \t]*\\)")
 
@@ -2719,9 +2856,26 @@ setting once it's actually been made."
   ;; Not much fontification needed.
   (make-local-variable 'font-lock-keywords)
   (setq font-lock-keywords
-	(list
-	 (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"
-	       '(0 mdw-punct-face))))
+	(list (list (concat "\\("
+			    "\\_<[-+]?"
+			    "\\(" "[0-9]+/[0-9]+"
+			    "\\|" "\\(" "[0-9]+" "\\(\\.[0-9]*\\)?" "\\|"
+					"\\.[0-9]+" "\\)"
+				  "\\([dDeEfFlLsS][-+]?[0-9]+\\)?"
+			    "\\)"
+			    "\\|"
+			    "#"
+			    "\\(" "x" "[-+]?"
+				  "[0-9A-Fa-f]+" "\\(/[0-9A-Fa-f]+\\)?"
+			    "\\|" "o" "[-+]?" "[0-7]+" "\\(/[0-7]+\\)?"
+			    "\\|" "b" "[-+]?" "[01]+" "\\(/[01]+\\)?"
+			    "\\|" "[0-9]+" "r" "[-+]?"
+				  "[0-9a-zA-Z]+" "\\(/[0-9a-zA-Z]+\\)?"
+			    "\\)"
+			    "\\)\\_>")
+		    '(0 mdw-number-face))
+	      (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"
+		    '(0 mdw-punct-face))))
 
   (mdw-post-config-mode-hack))