branch: elpa/haskell-tng-mode commit 3194e6295ebbee7aee670dc20006ed65c266c612 Author: Tseen She <ts33n....@gmail.com> Commit: Tseen She <ts33n....@gmail.com>
stefan to the rescue --- haskell-tng-smie.el | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/haskell-tng-smie.el b/haskell-tng-smie.el index 87ba057..56c329a 100644 --- a/haskell-tng-smie.el +++ b/haskell-tng-smie.el @@ -84,10 +84,9 @@ (lexp) ) - ;; TODO to support terminators as separators + ;; TODO should we support terminators as separators? ;;(insts (insts ";" insts) (inst)) - ;; ;; FIXME these seem to break everything (lexp ("if" exp "then" exp "else" exp) ;; TODO apats @@ -122,9 +121,10 @@ ;; operator precedences ;;'((assoc ";")) ;;'((assoc ",")) - ;; TODO arrange by fixity - '((assoc "$")) - '((assoc "+") (assoc "-")) + '((assoc "else" "::") ;; TODO keywords here + (assoc "$") + ;; TODO arrange by fixity + (assoc "+" "-")) ;; '((assoc "*")) ;; '((assoc "/")) ;; '((assoc "<$>")) @@ -132,6 +132,9 @@ ;; '((assoc ">>=")) ;; '((assoc "&")) +;; Read the "<" and ">" as parentheses: when confronted with "... else E $ ..." +;;SMIE is not sure if you meant "... else E) $ ..." or "... else (E $ ...". + ))) ;; TODO indentation rules