[nongnu] elpa/julia-mode fc44ae6 026/352: more work on type inference; adding isbound()

[ELPA Syncer]

branch: elpa/julia-mode
commit fc44ae63709d0560e4ed83caa6d551e4ddf1c07c
Author: Jeff Bezanson <bezanson@post.harvard.edu>
Commit: Yichao Yu <yyc1992@gmail.com>

    more work on type inference; adding isbound()
    convert for Bool, removing non-numeric definitions of bool()
    adding Complex(real), simplifying ^
    don't indent based on keywords used as field names (e.g. e.type)
---
 julia-mode.el | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/julia-mode.el b/julia-mode.el
index fbbe950..09b26e8 100644
--- a/julia-mode.el
+++ b/julia-mode.el
@@ -67,14 +67,19 @@
     (or (equal item (car lst))
        (member item (cdr lst)))))
 
-; TODO: skip keywords inside strings
+; TODO: skip keywords inside strings and comments
+
+(defun at-keyword (kw-list)
+  (and (or (= (point) 1)
+          (not (equal (char-before (point)) ?.)))
+       (member (current-word) kw-list)))
 
 ; get the column of the last open block
 (defun last-open-block (min count)
   (cond ((> count 0) (+ 4 (current-indentation)))
         ((<= (point) min) nil)
         (t (backward-word 1)
-           (cond ((member (current-word) julia-block-start-keywords)
+           (cond ((at-keyword julia-block-start-keywords)
                   (last-open-block min (+ count 1)))
                  ((equal (current-word) "end")
                   (last-open-block min (- count 1)))
@@ -85,14 +90,13 @@
   (forward-line -1)
   (end-of-line)
   (backward-sexp)
-  (if (member (current-word) julia-block-other-keywords)
+  (if (at-keyword julia-block-other-keywords)
       (+ 4 (current-indentation))
     (if (char-equal (char-after (point)) ?\()
         (progn
           (backward-word 1)
-          (let ((cur (current-indentation))
-                (cw (current-word)))
-            (if (member cw julia-block-start-keywords)
+          (let ((cur (current-indentation)))
+            (if (at-keyword julia-block-start-keywords)
                 (+ 4 cur)
               nil)))
       nil)))
@@ -130,7 +134,7 @@
            (let ((endtok (progn
                            (beginning-of-line)
                            (forward-to-indentation 0)
-                           (member (current-word) julia-block-end-keywords))))
+                           (at-keyword julia-block-end-keywords))))
              (error2nil (+ (last-open-block (point-min) 0)
                            (if endtok -4 0)))))
 ; take same indentation as previous line
@@ -146,7 +150,7 @@
                                          (equal (char-after (point)) ?=)))
                           4 nil))
          0))
-       (when (member (current-word) julia-block-end-keywords)
+       (when (at-keyword julia-block-end-keywords)
          (forward-word 1)))
 
 (defun julia-mode ()