diff options
Diffstat (limited to 'lib/tools/emacs/erlang.el')
| -rw-r--r-- | lib/tools/emacs/erlang.el | 39 |
1 files changed, 25 insertions, 14 deletions
diff --git a/lib/tools/emacs/erlang.el b/lib/tools/emacs/erlang.el index 7216d6b6fd..065e180804 100644 --- a/lib/tools/emacs/erlang.el +++ b/lib/tools/emacs/erlang.el @@ -678,6 +678,8 @@ resulting regexp is surrounded by \\_< and \\_>." "of" "receive" "try" + "maybe" + "else" "when") "Erlang reserved keywords")) @@ -1466,8 +1468,8 @@ Other commands: (modify-syntax-entry ?\n ">" table) (modify-syntax-entry ?\" "\"" table) (modify-syntax-entry ?# "." table) - ;; (modify-syntax-entry ?$ "\\" table) ;; Creates problems with indention afterwards - ;; (modify-syntax-entry ?$ "'" table) ;; Creates syntax highlighting and indention problems + ;; (modify-syntax-entry ?$ "\\" table) ;; Creates problems with indentation afterwards + ;; (modify-syntax-entry ?$ "'" table) ;; Creates syntax highlighting and indentation problems (modify-syntax-entry ?$ "/" table) ;; Misses the corner case "string that ends with $" ;; we have to live with that for now..it is the best alternative ;; that can be worked around with "string that ends with \$" @@ -2730,13 +2732,13 @@ Value is list (stack token-start token-type in-what)." ;; Word constituent: check and handle keywords. ((= cs ?w) - (cond ((looking-at "\\(end\\|after\\)[^_a-zA-Z0-9]") + (cond ((looking-at "\\(end\\|after\\|else\\)[^_a-zA-Z0-9]") ;; Must pop top icr layer, `after' will push a new ;; layer next. (progn (while (and stack (eq (car (car stack)) '->)) (erlang-pop stack)) - (if (and stack (memq (car (car stack)) '(icr begin fun try))) + (if (and stack (memq (car (car stack)) '(icr begin fun try maybe))) (erlang-pop stack)))) ((looking-at "catch\\b.*of") t) @@ -2746,7 +2748,7 @@ Value is list (stack token-start token-type in-what)." (progn (while (and stack (eq (car (car stack)) '->)) (erlang-pop stack)) - (if (and stack (memq (car (car stack)) '(icr begin try))) + (if (and stack (memq (car (car stack)) '(icr begin try maybe))) (erlang-pop stack)))) ) (cond ((looking-at "\\(if\\|case\\|receive\\)[^_a-zA-Z0-9]") @@ -2768,7 +2770,7 @@ Value is list (stack token-start token-type in-what)." ((looking-at "\\(fun\\)[^_a-zA-Z0-9]") ;; Push a new layer if we are defining a `fun' - ;; expression, not when we are refering an existing + ;; expression, not when we are referring an existing ;; function. 'fun's defines are only indented one level now. (if (save-excursion (goto-char (match-end 1)) @@ -2783,6 +2785,11 @@ Value is list (stack token-start token-type in-what)." (erlang-push (list 'fun token (current-column)) stack))) ((looking-at "\\(begin\\)[^_a-zA-Z0-9]") (erlang-push (list 'begin token (current-column)) stack)) + ((looking-at "\\(maybe\\)[^_a-zA-Z0-9]") + (erlang-push (list 'begin token (current-column)) stack)) + ((looking-at "\\(else\\)[^_a-zA-Z0-9]") + (erlang-push (list 'icr token (current-column)) stack)) + ;; Normal when case ;;((looking-at "when\\s ") ;;((looking-at "when\\s *\\($\\|%\\)") @@ -2820,7 +2827,7 @@ Value is list (stack token-start token-type in-what)." (forward-char 1)) (t ;; Maybe a character literal, quote the next char to avoid - ;; situations as $" being seen as the begining of a string. + ;; situations as $" being seen as the beginning of a string. ;; Note the quoting something in the middle of a string is harmless. (quote (following-char)) (forward-char 1)))) @@ -2875,7 +2882,7 @@ Value is list (stack token-start token-type in-what)." (erlang-pop stack)) (cond ((eq (car (car stack)) '<<) (erlang-pop stack)) - ((memq (car (car stack)) '(icr begin fun)) + ((memq (car (car stack)) '(icr begin maybe fun)) (error "Missing `end'")) (t (error "Unbalanced parentheses"))) @@ -2947,6 +2954,8 @@ Value is list (stack token-start token-type in-what)." )) ((eq (car (car stack)) 'begin) (error "Missing `end'")) + ((eq (car (car stack)) 'maybe) + (error "Missing `end'")) (t (error "Unbalanced parenthesis")) ) @@ -3048,7 +3057,7 @@ Return nil if inside string, t if in a comment." ((and (eq (car stack-top) '||) (looking-at "\\(]\\|>>\\)[^_a-zA-Z0-9]")) (nth 2 (car (cdr stack)))) ;; Real indentation, where operators create extra indentation etc. - ((memq (car stack-top) '(-> || try begin)) + ((memq (car stack-top) '(-> || try begin maybe)) (if (looking-at "\\(of\\)[^_a-zA-Z0-9]") (nth 2 stack-top) (goto-char (nth 1 stack-top)) @@ -3060,6 +3069,8 @@ Return nil if inside string, t if in a comment." (cond ((null (cdr stack))) ; Top level in function. ((eq (car stack-top) 'begin) (setq skip 5)) + ((eq (car stack-top) 'maybe) + (setq skip 5)) ((eq (car stack-top) 'try) (setq skip 5)) ((eq (car stack-top) '->) @@ -3073,7 +3084,7 @@ Return nil if inside string, t if in a comment." (let ((base (erlang-indent-find-base stack indent-point off skip))) ;; Special cases (goto-char indent-point) - (cond ((looking-at "\\(;\\|end\\|after\\)\\($\\|[^_a-zA-Z0-9]\\)") + (cond ((looking-at "\\(;\\|end\\|after\\|else\\)\\($\\|[^_a-zA-Z0-9]\\)") (if (eq (car stack-top) '->) (erlang-pop stack)) (cond ((and stack (looking-at ";")) @@ -3222,7 +3233,7 @@ Return nil if inside string, t if in a comment." (progn (if (memq (car stack-top) '(-> ||)) (erlang-pop stack)) - ;; Take parent identation + offset, + ;; Take parent indentation + offset, ;; else just erlang-indent-level if no parent (if stack (+ (caddr (car stack)) @@ -3324,8 +3335,8 @@ This assumes that the preceding expression is either simple (defun erlang-at-keyword () "Are we looking at an Erlang keyword which will increase indentation?" - (looking-at (concat "\\(when\\|if\\|fun\\|case\\|begin\\|" - "of\\|receive\\|after\\|catch\\|try\\)\\b"))) + (looking-at (concat "\\(when\\|if\\|fun\\|case\\|begin\\|maybe\\|" + "of\\|receive\\|after\\|catch\\|try\\|else\\)\\b"))) (defun erlang-at-operator () "Are we looking at an Erlang operator?" @@ -6068,7 +6079,7 @@ unless the optional NO-DISPLAY is non-nil." erlang-compile-erlang-function module-name (inferior-erlang-format-comma-opts opts)) - (let (;; Hopefully, noone else will ever use these... + (let (;; Hopefully, no one else will ever use these... (tmpvar "Tmp7236") (tmpvar2 "Tmp8742")) (format |