fix formatting

anoma · Jan 22, 2024 · cc6201b · cc6201b
1 parent 126dcd1
commit cc6201b
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 48 deletions.
diff --git a/src/Juvix/Compiler/Tree/Pretty/Base.hs b/src/Juvix/Compiler/Tree/Pretty/Base.hs
@@ -103,7 +103,7 @@ instance PrettyCode TypeConstr where
     let ctrname = fromJust (HashMap.lookup _typeConstrTag tagNames)
     let cname = annotate (AnnKind KNameConstructor) (pretty ctrname)
     args <- mapM ppCode _typeConstrFields
-    return $ iname <> kwColon <> cname <> encloseSep "(" ")" ", " args
+    return $ iname <> kwColon <> cname <> parens (hsep (punctuate comma args))
 
 instance PrettyCode TypeFun where
   ppCode :: (Member (Reader Options) r) => TypeFun -> Sem r (Doc Ann)
@@ -114,7 +114,7 @@ instance PrettyCode TypeFun where
               ppLeftExpression funFixity (head _typeFunArgs)
           | otherwise -> do
               args <- mapM ppCode _typeFunArgs
-              return $ encloseSep "(" ")" ", " (toList args)
+              return $ parens $ hsep $ punctuate comma (toList args)
     r <- ppRightExpression funFixity _typeFunTarget
     return $ l <+> kwArrow <+> r
 
@@ -326,7 +326,7 @@ ppFunInfo ppCode' FunctionInfo {..} = do
   return $
     keyword Str.function
       <+> annotate (AnnKind KNameFunction) (pretty (quoteFunName $ quoteName _functionName))
-        <> encloseSep lparen rparen ", " args
+        <> parens (hsep (punctuate comma args))
       <+> colon
       <+> targetty
       <+> braces' c
@@ -338,7 +338,7 @@ ppFunSig FunctionInfo {..} = do
   return $
     keyword Str.function
       <+> annotate (AnnKind KNameFunction) (pretty (quoteFunName $ quoteName _functionName))
-        <> encloseSep lparen rparen ", " argtys
+        <> parens (hsep (punctuate comma argtys))
       <+> colon
       <+> targetty
         <> semi

diff --git a/tests/Asm/positive/test032.jva b/tests/Asm/positive/test032.jva
@@ -59,7 +59,7 @@ function succ((* -> *, *) -> *, * -> *) : * -> * {
   ret;
 }
 
-function add((* -> *, *) -> *, (* -> *, *) -> *, * -> *) : * -> * {
+function cadd((* -> *, *) -> *, (* -> *, *) -> *, * -> *) : * -> * {
   push arg[2];
   push arg[1];
   cextend 1;
@@ -70,7 +70,7 @@ function add((* -> *, *) -> *, (* -> *, *) -> *, * -> *) : * -> * {
   ret;
 }
 
-function mul((* -> *, *) -> *, (* -> *, *) -> *, * -> *) : * -> * {
+function cmul((* -> *, *) -> *, (* -> *, *) -> *, * -> *) : * -> * {
   push arg[2];
   push arg[1];
   cextend 1;
@@ -178,7 +178,7 @@ function fib((* -> *, *) -> *) : (* -> *, *) -> * {
             call fib;
             push tmp[0];
             call fib;
-            calloc add 2;
+            calloc cadd 2;
             calloc uncurry 1;
             ret;
           };
@@ -199,7 +199,7 @@ function main() {
   calloc num 1;
   push 7;
   calloc num 1;
-  calloc mul 2;
+  calloc cmul 2;
   calloc uncurry 1;
   call toInt;
   trace;

diff --git a/tests/Tree/positive/test016.jvt b/tests/Tree/positive/test016.jvt
@@ -1,9 +1,7 @@
 
 function f(integer, integer) : *;
 function g(integer, integer) : integer;
-function h((integer, integer) → integer
-, integer
-, integer) : integer;
+function h((integer, integer) → integer, integer, integer) : integer;
 function func(integer) : integer;
 function main() : *;
 
@@ -17,9 +15,7 @@ function g(integer, integer) : integer {
   sub(add(1, arg[0]), mul(7, arg[1]))
 }
 
-function h((integer, integer) → integer
-, integer
-, integer) : integer {
+function h((integer, integer) → integer, integer, integer) : integer {
   mul(call(arg[0], arg[1], arg[1]), arg[2])
 }
 

diff --git a/tests/Tree/positive/test017.jvt b/tests/Tree/positive/test017.jvt
@@ -1,8 +1,6 @@
 
 function g(integer, integer) : integer;
-function h(integer → integer
-, integer → integer
-, integer) : integer;
+function h(integer → integer, integer → integer, integer) : integer;
 function f(integer) : integer → integer;
 function g'(integer, integer → integer) : integer;
 function h'(integer) : integer;
@@ -12,9 +10,7 @@ function g(integer, integer) : integer {
   add(arg[1], arg[0])
 }
 
-function h(integer → integer
-, integer → integer
-, integer) : integer {
+function h(integer → integer, integer → integer, integer) : integer {
   call(arg[0], call(arg[1], arg[2]))
 }
 

diff --git a/tests/Tree/positive/test018.jvt b/tests/Tree/positive/test018.jvt
@@ -1,15 +1,13 @@
 
-function ext_10((integer
-, integer) → integer) : integer → integer;
+function ext_10((integer, integer) → integer) : integer → integer;
 function app_0(integer → integer) : integer;
 function f((integer, integer) → integer) : integer;
 function plus(integer, integer) : integer;
 function minus(integer, integer) : integer;
 function mult(integer, integer) : integer;
 function main() : *;
 
-function ext_10((integer
-, integer) → integer) : integer → integer {
+function ext_10((integer, integer) → integer) : integer → integer {
   cextend(arg[0], 10)
 }
 

diff --git a/tests/Tree/positive/test020.jvt b/tests/Tree/positive/test020.jvt
@@ -1,14 +1,10 @@
 
-function sumb((integer, integer) → integer
-, integer
-, integer) : integer;
+function sumb((integer, integer) → integer, integer, integer) : integer;
 function sum'(integer, integer) : integer;
 function sum(integer) : integer;
 function main() : *;
 
-function sumb((integer, integer) → integer
-, integer
-, integer) : integer {
+function sumb((integer, integer) → integer, integer, integer) : integer {
   br(eq(0, arg[1])) {
     true: arg[2]
     false: call(arg[0], sub(arg[1], 1), arg[2])

diff --git a/tests/Tree/positive/test024.jvt b/tests/Tree/positive/test024.jvt
@@ -1,13 +1,9 @@
 
-function f((*, integer → integer, integer) → *
-, integer → integer
-, integer) : *;
+function f((*, integer → integer, integer) → *, integer → integer, integer) : *;
 function g(integer) : integer;
 function main() : *;
 
-function f((*, integer → integer, integer) → *
-, integer → integer
-, integer) : * {
+function f((*, integer → integer, integer) → *, integer → integer, integer) : * {
   seq(seq(seq(save(6) {
     seq(trace(tmp[0]), tmp[0])
   }, save(arg[2]) {

diff --git a/tests/Tree/positive/test026.jvt b/tests/Tree/positive/test026.jvt
@@ -1,8 +1,6 @@
 
 function app(* → *, *) : *;
-function app'((integer → integer, integer) → integer
-, integer → integer
-, integer) : integer;
+function app'((integer → integer, integer) → integer, integer → integer, integer) : integer;
 function inc(integer) : integer;
 function h((* → *, *) → *) : *;
 function capp((*, *) → *, *) : * → *;
@@ -15,9 +13,7 @@ function app(* → *, *) : * {
   call(arg[0], arg[1])
 }
 
-function app'((integer → integer, integer) → integer
-, integer → integer
-, integer) : integer {
+function app'((integer → integer, integer) → integer, integer → integer, integer) : integer {
   call(arg[0], arg[1], arg[2])
 }
 

diff --git a/tests/Tree/positive/test036.jvt b/tests/Tree/positive/test036.jvt
@@ -3,9 +3,7 @@ type stream {
 }
 
 function force(unit → stream) : stream;
-function filter(integer → bool
-, unit → stream
-, unit) : stream;
+function filter(integer → bool, unit → stream, unit) : stream;
 function nth(integer, unit → stream) : integer;
 function numbers(integer, unit) : stream;
 function indivisible(integer, integer) : bool;
@@ -17,9 +15,7 @@ function force(f : unit → stream) : stream {
   call(f, unit)
 }
 
-function filter(f : integer → bool
-, s : unit → stream
-, unit) : stream {
+function filter(f : integer → bool, s : unit → stream, unit) : stream {
   save[s1](call[force](s)) {
     br(call(f, s1.cons[0])) {
       true: alloc[cons](s1.cons[0], calloc[filter](f, s1.cons[1]))