fix syntax error messages

AshleyYakeley · Apr 22, 2024 · fd1b832 · fd1b832
1 parent 6825b10
commit fd1b832
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/Pinafore/pinafore-language/lib/Pinafore/Language/Error.hs b/Pinafore/pinafore-language/lib/Pinafore/Language/Error.hs
@@ -107,10 +107,9 @@ instance ShowNamedText QErrorType where
                          then Nothing
                          else return $ toText s)
                 msgs
-        msgsUnExpect =
+        msgsSysUnExpect =
             getMsgs $ \case
                 SysUnExpect s -> Just s
-                UnExpect s -> Just s
                 _ -> Nothing
         msgsExpect =
             getMsgs $ \case
@@ -125,15 +124,15 @@ instance ShowNamedText QErrorType where
         semicolon a "" = a
         semicolon a b = a <> "; " <> b
         strUnexpected =
-            case msgsUnExpect of
+            case msgsSysUnExpect of
                 [] -> ""
                 s -> "unexpected: " <> intercalate ", " s
         strExpecting =
             case msgsExpect of
                 [] -> ""
                 s -> "expecting: " <> intercalate ", " s
         strMessage = intercalate "; " msgsMessage
-        in "syntax error: " <> (toNamedText $ strUnexpected `semicolon` strExpecting `semicolon` strMessage)
+        in "syntax: " <> (toNamedText $ strUnexpected `semicolon` strExpecting `semicolon` strMessage)
     showNamedText (PatternErrorError e) = showNamedText e
     showNamedText (ExpressionErrorError nn) =
         "undefined: " <>

diff --git a/Pinafore/pinafore-language/test/Test/Entity.hs b/Pinafore/pinafore-language/test/Test/Entity.hs
@@ -1781,7 +1781,8 @@ testEntity =
               , testExpectSuccess "testaction (Right 5) $ evaluate @Integer \"let x = 5 in x\""
               , testExpectSuccess
                     "do ar <- evaluate @(Integer -> Integer) \"fn x => x +.Integer 1\"; ar >- match Left err => fail err; Right f => testeqval 8 $ f 7 end end"
-              , testExpectSuccess "testaction (Left \"<evaluate>:1:1: expecting: expression\") $ evaluate @Integer \"\""
+              , testExpectSuccess
+                    "testaction (Left \"<evaluate>:1:1: syntax: expecting: expression\") $ evaluate @Integer \"\""
               , testExpectSuccess "testaction (Left \"<evaluate>:1:1: undefined: f: a\") $ evaluate @Integer \"f\""
               , testExpectSuccess "testleft $ evaluate @Integer \"\\\"hello\\\"\""
               , testExpectSuccess

diff --git a/Pinafore/pinafore-language/test/interactive/errors.ref b/Pinafore/pinafore-language/test/interactive/errors.ref
@@ -1,9 +1,9 @@
 pinafore> )
-<input>:1:1: unexpected: ")"; expecting: end of input, pattern, expression
+<input>:1:1: syntax: unexpected: ")"; expecting: end of input, pattern, expression
 pinafore> (
-<input>:1:1: expecting: expression
+<input>:1:1: syntax: expecting: expression
 pinafore> in
-<input>:1:1: unexpected: "in"; expecting: end of input, pattern, expression
+<input>:1:1: syntax: unexpected: "in"; expecting: end of input, pattern, expression
 pinafore> a
 <input>:2:1: undefined: a: a
 pinafore> a