Move CPS macro scheme-indent-functions to .dir-locals.el.

* .dir-locals.el: Add scheme-indent-functions entries for CPS macros.

* module/language/cps.scm:
* module/language/cps/arities.scm:
* module/language/cps/closure-conversion.scm:
* module/language/cps/reify-primitives.scm:
* module/language/tree-il/compile-cps.scm: Remove the
  scheme-indent-functions that are now in .dir-locals.el

6 files changed, 19 insertions, 72 deletions

diff --git a/.dir-locals.el b/.dir-locals.el
index a24e860ca..3858b7711 100644
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -5,12 +5,25 @@
  (c-mode          . ((c-file-style . "gnu")))
  (scheme-mode
   . ((indent-tabs-mode . nil)
-     (eval . (put 'pass-if 'scheme-indent-function 1))
-     (eval . (put 'pass-if-exception 'scheme-indent-function 2))
-     (eval . (put 'pass-if-equal 'scheme-indent-function 2))
-     (eval . (put 'with-test-prefix 'scheme-indent-function 1))
-     (eval . (put 'with-code-coverage 'scheme-indent-function 1))
-     (eval . (put 'with-statprof 'scheme-indent-function 1))))
+     (eval . (put 'pass-if             'scheme-indent-function 1))
+     (eval . (put 'pass-if-exception   'scheme-indent-function 2))
+     (eval . (put 'pass-if-equal       'scheme-indent-function 2))
+     (eval . (put 'with-test-prefix    'scheme-indent-function 1))
+     (eval . (put 'with-code-coverage  'scheme-indent-function 1))
+     (eval . (put 'with-statprof       'scheme-indent-function 1))
+     (eval . (put 'let-gensyms         'scheme-indent-function 1))
+     (eval . (put 'build-cps-term      'scheme-indent-function 0))
+     (eval . (put 'build-cps-call      'scheme-indent-function 0))
+     (eval . (put 'build-cps-cont      'scheme-indent-function 0))
+     (eval . (put 'rewrite-cps-term    'scheme-indent-function 1))
+     (eval . (put 'rewrite-cps-cont    'scheme-indent-function 1))
+     (eval . (put 'rewrite-cps-call    'scheme-indent-function 1))
+     (eval . (put '$letk               'scheme-indent-function 1))
+     (eval . (put '$letk*              'scheme-indent-function 1))
+     (eval . (put '$letconst           'scheme-indent-function 1))
+     (eval . (put '$continue           'scheme-indent-function 1))
+     (eval . (put '$kargs              'scheme-indent-function 2))
+     (eval . (put '$kentry             'scheme-indent-function 1))))
  (emacs-lisp-mode . ((indent-tabs-mode . nil)))
  (texinfo-mode    . ((indent-tabs-mode . nil)
                      (fill-column . 72))))
diff --git a/module/language/cps.scm b/module/language/cps.scm
index 79fc8ad81..7d196ee3c 100644
--- a/module/language/cps.scm
+++ b/module/language/cps.scm
@@ -390,19 +390,3 @@
       (($ $letrec names syms funs body) (term-folder body seed))))
 
   (cont-folder cont seed))
-
-;;; Local Variables:
-;;; eval: (put 'let-gensyms 'scheme-indent-function 1)
-;;; eval: (put 'build-cps-term 'scheme-indent-function 0)
-;;; eval: (put 'build-cps-call 'scheme-indent-function 0)
-;;; eval: (put 'build-cps-cont 'scheme-indent-function 0)
-;;; eval: (put 'rewrite-cps-term 'scheme-indent-function 1)
-;;; eval: (put 'rewrite-cps-cont 'scheme-indent-function 1)
-;;; eval: (put 'rewrite-cps-call 'scheme-indent-function 1)
-;;; eval: (put '$letk 'scheme-indent-function 1)
-;;; eval: (put '$letk* 'scheme-indent-function 1)
-;;; eval: (put '$letconst 'scheme-indent-function 1)
-;;; eval: (put '$continue 'scheme-indent-function 1)
-;;; eval: (put '$kargs 'scheme-indent-function 2)
-;;; eval: (put '$kentry 'scheme-indent-function 1)
-;;; End:
diff --git a/module/language/cps/arities.scm b/module/language/cps/arities.scm
index 7831bd766..1c9e8f21c 100644
--- a/module/language/cps/arities.scm
+++ b/module/language/cps/arities.scm
@@ -147,11 +147,3 @@
   (rewrite-cps-call fun
     (($ $fun meta self free entries)
      ($fun meta self free ,(map fix-entry-arities entries)))))
-
-;;; Local Variables:
-;;; eval: (put 'let-gensyms 'scheme-indent-function 1)
-;;; eval: (put 'build-cps-term 'scheme-indent-function 0)
-;;; eval: (put '$letk 'scheme-indent-function 1)
-;;; eval: (put '$continue 'scheme-indent-function 1)
-;;; eval: (put '$kargs 'scheme-indent-function 2)
-;;; End:
diff --git a/module/language/cps/closure-conversion.scm b/module/language/cps/closure-conversion.scm
index 1f4e9dd1d..5691ec0db 100644
--- a/module/language/cps/closure-conversion.scm
+++ b/module/language/cps/closure-conversion.scm
@@ -260,19 +260,3 @@ and allocate and initialize flat closures."
          (error "Expected no free vars in toplevel thunk" exp entries free))
        (build-cps-call
          ($fun meta self '() ,(map convert-to-indices entries)))))))
-
-;;; Local Variables:
-;;; eval: (put 'let-gensyms 'scheme-indent-function 1)
-;;; eval: (put 'build-cps-term 'scheme-indent-function 0)
-;;; eval: (put 'build-cps-call 'scheme-indent-function 0)
-;;; eval: (put 'build-cps-cont 'scheme-indent-function 0)
-;;; eval: (put 'rewrite-cps-term 'scheme-indent-function 1)
-;;; eval: (put 'rewrite-cps-cont 'scheme-indent-function 1)
-;;; eval: (put 'rewrite-cps-call 'scheme-indent-function 1)
-;;; eval: (put '$letk 'scheme-indent-function 1)
-;;; eval: (put '$letk* 'scheme-indent-function 1)
-;;; eval: (put '$letconst 'scheme-indent-function 1)
-;;; eval: (put '$continue 'scheme-indent-function 1)
-;;; eval: (put '$kargs 'scheme-indent-function 2)
-;;; eval: (put '$kentry 'scheme-indent-function 1)
-;;; End:
diff --git a/module/language/cps/reify-primitives.scm b/module/language/cps/reify-primitives.scm
index 27ebc352e..03270206f 100644
--- a/module/language/cps/reify-primitives.scm
+++ b/module/language/cps/reify-primitives.scm
@@ -93,19 +93,3 @@
             (_ term)))))
 
     (visit-fun fun)))
-
-;;; Local Variables:
-;;; eval: (put 'let-gensyms 'scheme-indent-function 1)
-;;; eval: (put 'build-cps-term 'scheme-indent-function 0)
-;;; eval: (put 'build-cps-call 'scheme-indent-function 0)
-;;; eval: (put 'build-cps-cont 'scheme-indent-function 0)
-;;; eval: (put 'rewrite-cps-term 'scheme-indent-function 1)
-;;; eval: (put 'rewrite-cps-cont 'scheme-indent-function 1)
-;;; eval: (put 'rewrite-cps-call 'scheme-indent-function 1)
-;;; eval: (put '$letk 'scheme-indent-function 1)
-;;; eval: (put '$letk* 'scheme-indent-function 1)
-;;; eval: (put '$letconst 'scheme-indent-function 1)
-;;; eval: (put '$continue 'scheme-indent-function 1)
-;;; eval: (put '$kargs 'scheme-indent-function 2)
-;;; eval: (put '$kentry 'scheme-indent-function 1)
-;;; End:
diff --git a/module/language/tree-il/compile-cps.scm b/module/language/tree-il/compile-cps.scm
index d3490259f..304b21182 100644
--- a/module/language/tree-il/compile-cps.scm
+++ b/module/language/tree-il/compile-cps.scm
@@ -558,14 +558,4 @@ indicates that the replacement variable is in a box."
 ;;; Local Variables:
 ;;; eval: (put 'convert-arg 'scheme-indent-function 1)
 ;;; eval: (put 'convert-args 'scheme-indent-function 1)
-;;; eval: (put 'let-gensyms 'scheme-indent-function 1)
-;;; eval: (put 'build-cps-term 'scheme-indent-function 0)
-;;; eval: (put 'build-cps-call 'scheme-indent-function 0)
-;;; eval: (put 'build-cps-cont 'scheme-indent-function 0)
-;;; eval: (put '$letk 'scheme-indent-function 1)
-;;; eval: (put '$letk* 'scheme-indent-function 1)
-;;; eval: (put '$letconst 'scheme-indent-function 1)
-;;; eval: (put '$continue 'scheme-indent-function 1)
-;;; eval: (put '$kargs 'scheme-indent-function 2)
-;;; eval: (put '$kentry 'scheme-indent-function 1)
 ;;; End: