Merge pull request #841 from GaloisInc/issue835

Issue835
GaloisInc · Jul 28, 2020 · cf57a0f · cf57a0f
2 parents 5100132 + e48e9f8
commit cf57a0f
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/src/Cryptol/TypeCheck/Type.hs b/src/Cryptol/TypeCheck/Type.hs
@@ -834,7 +834,16 @@ instance PP (WithNames Newtype) where
 
 
 
-
+-- | The precedence levels used by this pretty-printing instance
+-- correspond with parser non-terminals as follows:
+--
+--   * 0-1: @type@
+--
+--   * 2: @infix_type@
+--
+--   * 3: @app_type@
+--
+--   * 4: @atype@
 instance PP (WithNames Type) where
   ppPrec prec ty0@(WithNames ty nmMap) =
     case ty of
@@ -867,7 +876,7 @@ instance PP (WithNames Type) where
 
           (TCTuple _, fs)     -> parens $ fsep $ punctuate comma $ map (go 0) fs
 
-          (_, _)              -> pp tc <+> fsep (map (go 5) ts)
+          (_, _)              -> optParens (prec > 3) $ pp tc <+> fsep (map (go 4) ts)
 
       TCon (PC pc) ts ->
         case (pc,ts) of

diff --git a/tests/issues/issue835.icry b/tests/issues/issue835.icry
@@ -0,0 +1,2 @@
+:m Float
+:t (zero : Float 5 11) <$ zero
diff --git a/tests/issues/issue835.icry.stdout b/tests/issues/issue835.icry.stdout
@@ -0,0 +1,10 @@
+Loading module Cryptol
+Loading module Cryptol
+Loading module Float
+
+[error] at <interactive>:1:1--1:28:
+  Unsolved constraints:
+    • SignedCmp (Float 5 11)
+        arising from
+        use of expression (<$)
+        at <interactive>:1:1--1:28