fix dumping of nested abstraction being applied

igorw · igorw · commit 782908eb73b4 · 2014-01-02T16:34:30.000+01:00
diff --git a/src/dumper.php b/src/dumper.php
@@ -14,10 +14,18 @@ function dump($exp)
     }
 
     list($f, $arg) = $exp;
-    return dump($f).' '.(is_application($arg) ? '('.dump($arg).')' : dump($arg));
+    $f = is_abs($f) ? '('.dump($f).')' : dump($f);
+    $arg = is_app($arg) || is_abs($arg) ? '('.dump($arg).')' : dump($arg);
+    return $f.' '.$arg;
 }
 
-function is_application($exp)
+function is_abs($exp)
+{
+    return is_array($exp)
+        && 'λ' === first($exp);
+}
+
+function is_app($exp)
 {
     return is_array($exp)
         && 'λ' !== first($exp)

Original file line number	Diff line number	Diff line change
`@@ -14,10 +14,18 @@ function dump($exp)`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`list($f, $arg) = $exp;`
`17`		`- return dump($f).' '.(is_application($arg) ? '('.dump($arg).')' : dump($arg));`
	`17`	`+ $f = is_abs($f) ? '('.dump($f).')' : dump($f);`
	`18`	`+ $arg = is_app($arg) \|\| is_abs($arg) ? '('.dump($arg).')' : dump($arg);`
	`19`	`+ return $f.' '.$arg;`
`18`	`20`	`}`
`19`	`21`
`20`		`-function is_application($exp)`
	`22`	`+function is_abs($exp)`
	`23`	`+{`
	`24`	`+ return is_array($exp)`
	`25`	`+ && 'λ' === first($exp);`
	`26`	`+}`
	`27`	`+`
	`28`	`+function is_app($exp)`
`21`	`29`	`{`
`22`	`30`	`return is_array($exp)`
`23`	`31`	`&& 'λ' !== first($exp)`