diff options
Diffstat (limited to 'src/elisp')
| -rw-r--r-- | src/elisp/urweb-mode.el | 66 | ||||
| -rw-r--r-- | src/elisp/urweb-move.el | 13 |
2 files changed, 37 insertions, 42 deletions
diff --git a/src/elisp/urweb-mode.el b/src/elisp/urweb-mode.el index 048efcad..b44ebbb1 100644 --- a/src/elisp/urweb-mode.el +++ b/src/elisp/urweb-mode.el @@ -452,33 +452,17 @@ If anyone has a good algorithm for this..." (1+ (current-column)) nil)))) -(defun urweb-begun-xml () - "Check if this is the first new line in a new <xml>...</xml> section" +(defun urweb-empty-line () (save-excursion + (beginning-of-line) (let ((start-pos (point))) - (previous-line 1) - (search-forward "<xml>" start-pos t)))) + (end-of-line) + (not (re-search-backward "[^\n \t]" start-pos t))))) -(defun urweb-new-tags () - "Decide if the previous line of XML introduced unclosed tags" - (save-excursion - (let ((start-pos (point)) - (depth 0) - (done nil)) - (previous-line 1) - (beginning-of-line) - (while (and (not done) (search-forward "<" start-pos t)) - (if (looking-at "/") - (if (search-forward ">" start-pos t) - (when (> depth 0) (decf depth)) - (setq done t)) - (if (search-forward ">" start-pos t) - (if (not (save-excursion (backward-char 2) (looking-at "/"))) - (incf depth)) - (setq done t)))) - (and (not done) (> depth 0))))) +(defun urweb-seek-back () + (while (urweb-empty-line) (previous-line 1))) -(defun skip-matching-braces () +(defun urweb-skip-matching-braces () "Skip backwards past matching brace pairs, to calculate XML indentation after quoted Ur code" (beginning-of-line) (let ((start-pos (point)) @@ -497,13 +481,36 @@ If anyone has a good algorithm for this..." ((looking-at "{") (decf depth))))))) +(defun urweb-new-tags () + "Decide if the previous line of XML introduced unclosed tags" + (save-excursion + (let ((start-pos (point)) + (depth 0) + (done nil)) + (previous-line 1) + (urweb-seek-back) + (urweb-skip-matching-braces) + (urweb-seek-back) + (beginning-of-line) + (while (and (not done) (search-forward "<" start-pos t)) + (if (looking-at "/") + (if (search-forward ">" start-pos t) + (when (> depth 0) (decf depth)) + (setq done t)) + (if (search-forward ">" start-pos t) + (if (not (save-excursion (backward-char 2) (looking-at "/"))) + (incf depth)) + (setq done t)))) + (and (not done) (> depth 0))))) + (defun urweb-tag-matching-indent () "Seek back to a matching opener tag and get its line's indent" (save-excursion + (end-of-line) + (search-backward "</" nil t) (urweb-tag-matcher) - (if (looking-at "<xml") - (+ (current-indentation) 2) - (current-indentation)))) + (beginning-of-line) + (current-indentation))) (defun urweb-calculate-indentation () (save-excursion @@ -527,14 +534,13 @@ If anyone has a good algorithm for this..." (and (urweb-in-xml) (let ((prev-indent (save-excursion (previous-line 1) - (skip-matching-braces) - (re-search-backward "^[^\n]" nil t) + (urweb-seek-back) + (urweb-skip-matching-braces) + (urweb-seek-back) (current-indentation)))) (cond ((looking-at "</") (urweb-tag-matching-indent)) - ((urweb-begun-xml) - (+ prev-indent 4)) ((urweb-new-tags) (+ prev-indent 2)) (t diff --git a/src/elisp/urweb-move.el b/src/elisp/urweb-move.el index 370efb64..d27affa4 100644 --- a/src/elisp/urweb-move.el +++ b/src/elisp/urweb-move.el @@ -75,7 +75,7 @@ (("AND" "OR") . 1) ((">=" "<>" "<=" "=") . 4) (("+" "-" "^") . 6) - (("/" "*" "%") . 7) + (("*" "%") . 7) (("NOT") 9))) "Alist of Ur/Web infix operators and their precedence.") @@ -250,12 +250,6 @@ PREC is the precedence currently looked for." (op-prec (urweb-op-prec op 'back)) match) (cond - ((save-excursion (backward-char 5) - (looking-at "</xml>")) - (backward-char 6) - (urweb-tag-matcher) - (backward-char 1) - (urweb-backward-sexp prec)) ((not op) (let ((point (point))) (ignore-errors (let ((forward-sexp-function nil)) (backward-sexp 1))) @@ -278,11 +272,6 @@ PREC is the precedence currently looked for." ;; this reproduces the usual backward-sexp, but it might be bogus ;; in this case since !@$% is a perfectly fine symbol (t t))))) ;(or (string-match "\\sw" op) (urweb-backward-sexp prec)) -;; (when (save-excursion (backward-char 5) (looking-at "</xml>")) -;; (backward-char 5) -;; (urweb-tag-matcher) -;; (backward-char) -;; (urweb-backward-sexp prec))) (defun urweb-forward-sexp (prec) "Moves one sexp forward if possible, or one char else. |