[ fix #1224 ] moduleIdent must be capitalised

src/Idris/ModTree.idr

@@ -90,6 +90,7 @@ mkModTree loc done modFP mod
                 (\err =>
                     case err of
                          CyclicImports _ => throw err
+                         ParseFail _ _ => throw err
                          _ => pure (MkModTree mod Nothing []))
 
 data DoneMod : Type where

src/Idris/Parser.idr

@@ -1496,7 +1496,7 @@ import_ fname indents
     = do b <- bounds (do keyword "import"
                          reexp <- option False (do keyword "public"
                                                    pure True)
-                         ns <- moduleIdent
+                         ns <- mustWork moduleIdent
                          nsAs <- option (miAsNamespace ns)
                                         (do exactIdent "as"
                                             mustWork namespaceId)
@@ -1511,7 +1511,7 @@ prog fname
     = do b <- bounds (do doc    <- option "" documentation
                          nspace <- option (nsAsModuleIdent mainNS)
                                      (do keyword "module"
-                                         moduleIdent)
+                                         mustWork moduleIdent)
                          imports <- block (import_ fname)
                          pure (doc, nspace, imports))
          ds      <- block (topDecl fname)
@@ -1525,7 +1525,7 @@ progHdr fname
     = do b <- bounds (do doc    <- option "" documentation
                          nspace <- option (nsAsModuleIdent mainNS)
                                      (do keyword "module"
-                                         moduleIdent)
+                                         mustWork moduleIdent)
                          imports <- block (import_ fname)
                          pure (doc, nspace, imports))
          (doc, nspace, imports) <- pure b.val

src/Parser/Rule/Source.idr

@@ -234,12 +234,7 @@ namespaceId = do
 
 export
 moduleIdent : Rule ModuleIdent
-moduleIdent
-    = terminal "Expected module identifier"
-        (\x => case x of
-            DotSepIdent ns n => Just (mkModuleIdent (Just ns) n)
-            Ident i => Just (mkModuleIdent Nothing i)
-            _ => Nothing)
+moduleIdent = nsAsModuleIdent <$> namespaceId
 
 export
 unqualifiedName : Rule String

src/Parser/Source.idr

@@ -23,7 +23,8 @@ runParserTo fname lit reject str p
 
 export
 runParser : {e : _} ->
-            (fname : String) -> Maybe LiterateStyle -> String -> Grammar Token e ty -> Either Error ty
+            (fname : String) -> Maybe LiterateStyle -> String ->
+            Grammar Token e ty -> Either Error ty
 runParser fname lit = runParserTo fname lit (pred $ const False)
 
 export covering

src/Parser/Support.idr

@@ -29,8 +29,10 @@ fromLexError fname (_, l, c, _)
     = LexFail (MkFC fname (l, c) (l, c + 1)) "Can't recognise token."
 
 export
-fromParsingError : (Show token, Pretty token) => String -> ParsingError token -> Error
-fromParsingError fname (Error msg Nothing) = ParseFail (MkFC fname (0, 0) (0, 0)) (msg +> '.')
+fromParsingError : (Show token, Pretty token) =>
+                   String -> ParsingError token -> Error
+fromParsingError fname (Error msg Nothing)
+    = ParseFail (MkFC fname (0, 0) (0, 0)) (msg +> '.')
 fromParsingError fname (Error msg (Just t))
     = let l = t.startLine
           c = t.startCol in

tests/idris2/perror008/Issue1224a.idr

@@ -0,0 +1,5 @@
+module ggg
+
+export
+yyy : Int
+yyy = 0

tests/idris2/perror008/Issue1224b.idr

@@ -0,0 +1,4 @@
+import ggg
+
+t : Int
+t = yyy

tests/idris2/perror008/expected

@@ -52,3 +52,15 @@ Issue710f.idr:2:15--2:16
  2 |   constructor cons
                    ^
 
+Uncaught error: Error: Expected a capitalised identifier, got: ggg.
+
+Issue1224a.idr:1:8--1:9
+ 1 | module ggg
+            ^
+
+Uncaught error: Error: Expected a capitalised identifier, got: ggg.
+
+Issue1224b.idr:1:8--1:9
+ 1 | import ggg
+            ^
+

tests/idris2/perror008/run

@@ -5,4 +5,7 @@ $1 --no-color --console-width 0 --check Issue710d.idr || true
 $1 --no-color --console-width 0 --check Issue710e.idr || true
 $1 --no-color --console-width 0 --check Issue710f.idr || true
 
+$1 --no-color --console-width 0 --check Issue1224a.idr || true
+$1 --no-color --console-width 0 --check Issue1224b.idr || true
+
 rm -rf build