From 8d8321080448898637e72d8229194921a59ff6c8 Mon Sep 17 00:00:00 2001
From: Gabriel Scherer <gabriel.scherer@gmail.com>
Date: Thu, 10 Dec 2020 17:44:59 +0100
Subject: [PATCH] [minor] move functions around

---
 miniml/compiler/compile.scm | 58 ++++++++++++++++++-------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/miniml/compiler/compile.scm b/miniml/compiler/compile.scm
index 5106d93..4356b49 100644
--- a/miniml/compiler/compile.scm
+++ b/miniml/compiler/compile.scm
@@ -1509,6 +1509,35 @@
          (body (lower-fun-body args arg-names body)))
     (list arg-names shape body)))
 
+(define (lower-fun-body args arg-names basebody)
+  (fold-right (lambda (arg name body) (match arg
+     (($ <arg> pat ('Optional label) ('Some default))
+      (lower-arg-default label default body))
+     (($ <arg> pat _ ('None))
+      (lower-arg-pat pat name body))))
+   basebody args arg-names))
+
+(define (lower-arg-name a i)
+  (match (arg-get-pat a)
+     (('PVar v)
+      v)
+     (_
+      (string-append "arg#" (number->string i)))))
+
+(define (lower-arg-default name default body)
+  (let* ((noneline (cons (lid->pconstr "None" #nil) default))
+         (someline (cons (lid->pconstr "Some" (list (lid->pvar name)))
+                         (lid->evar name)))
+         (default-expr (list 'EMatch (lid->evar name) (list noneline someline))))
+    (list 'ELet #f (list (cons (lid->pvar name) default-expr)) body)))
+
+(define (lower-arg-pat pat name body)
+  (match pat
+   (('PVar _)
+    body)
+   (_
+    (list 'EMatch (lid->evar name) (list (cons pat body))))))
+
 (define (compile-expr env stacksize istail expr)
   (compile-low-expr env stacksize istail
     (lower-expr env istail expr)))
@@ -1719,14 +1748,6 @@
 
 (define (range a b) (if (>= a b) #nil (cons a (range (+ a 1) b))))
 
-(define (lower-fun-body args arg-names basebody)
-  (fold-right (lambda (arg name body) (match arg
-     (($ <arg> pat ('Optional label) ('Some default))
-      (lower-arg-default label default body))
-     (($ <arg> pat _ ('None))
-      (lower-arg-pat pat name body))))
-   basebody args arg-names))
-
 (define (compile-fundef-body env args body nfv lab recvars recshapes recoffset)
   (let* ((arity (length args))
          (envoff (* rec-closure-step (- (- (length recvars) 1) recoffset)))
@@ -1812,27 +1833,6 @@
     nenv
   ))
 
-(define (lower-arg-name a i)
-  (match (arg-get-pat a)
-     (('PVar v)
-      v)
-     (_
-      (string-append "arg#" (number->string i)))))
-
-(define (lower-arg-default name default body)
-  (let* ((noneline (cons (lid->pconstr "None" #nil) default))
-         (someline (cons (lid->pconstr "Some" (list (lid->pvar name)))
-                         (lid->evar name)))
-         (default-expr (list 'EMatch (lid->evar name) (list noneline someline))))
-    (list 'ELet #f (list (cons (lid->pvar name) default-expr)) body)))
-
-(define (lower-arg-pat pat name body)
-  (match pat
-   (('PVar _)
-    body)
-   (_
-    (list 'EMatch (lid->evar name) (list (cons pat body))))))
-
 (define empty-numtags (cons 0 0))
 (define (numtags-next arity numtags)
   (match-let (((const-count . block-count) numtags))