Visible infix info from imports

src/Lib/Parser.idr

@@ -90,6 +90,10 @@ parseApp = do
   rest <- many pArg
   pure $ foldl (\a, (icit,fc,b) => RApp fc a b icit) hd rest
 
+lookup : String -> List OpDef -> Maybe OpDef
+lookup _ [] = Nothing
+lookup name (op :: ops) = if op.name == name then Just op else lookup name ops
+
 parseOp : Parser Raw
 parseOp = parseApp >>= go 0
   where
@@ -100,7 +104,7 @@ parseOp = parseApp >>= go 0
         op <- token Oper
         ops <- getOps
         let op' = "_" ++ op ++ "_"
-        let Just (p,fix) = lookup op' ops
+        let Just (MkOp _ p fix) = lookup op' ops
           -- this is eaten, but we need `->` and `:=` to not be an operator to have fatal here
          | Nothing => case op of
          -- Location is poor on these because we pull off of the remaining token list...
@@ -320,12 +324,21 @@ export
 parseDecl : Parser Decl
 parseDecl = parseMixfix <|> parsePType <|> parsePFunc <|> parseNorm <|> parseData <|> (try $ parseSig) <|> parseDef
 
+
+export
+parseModHeader : Parser String
+parseModHeader = sameLevel (keyword "module") >> uident
+
+export
+parseImports : Parser (List Import)
+parseImports = manySame $ parseImport
+
 export
 parseMod : Parser Module
 parseMod = do
-  keyword "module"
-  name <- uident
   startBlock $ do
+    keyword "module"
+    name <- uident
     imports <- manySame $ parseImport
     decls <- manySame $ parseDecl
     pure $ MkModule name imports decls

src/Lib/Parser/Impl.idr

@@ -49,11 +49,18 @@ showError src (E (line, col) msg) = "ERROR at \{show (line,col)}: \{msg}\n" ++ g
       else if line - 3 < l then "  " ++ x ++ "\n" ++ go (l + 1) xs
       else go (l + 1) xs
 
+public export
+record OpDef where
+  constructor MkOp
+  name : String
+  prec : Int
+  fix : Fixity
+
 -- Result of a parse
 public export
 data Result : Type -> Type where
-  OK : a -> (toks : TokenList) -> (com : Bool) -> List (String, Int, Fixity) -> Result a
-  Fail : Bool -> Error -> (toks : TokenList) -> (com : Bool) -> List (String, Int, Fixity) -> Result a
+  OK : a -> (toks : TokenList) -> (com : Bool) -> List OpDef -> Result a
+  Fail : Bool -> Error -> (toks : TokenList) -> (com : Bool) -> List OpDef -> Result a
 
 export
 Functor Result where
@@ -74,10 +81,10 @@ Functor Result where
 -- This is a Reader in FC, a State in Operators, Commit flag, TokenList
 
 export
-data Parser a = P (TokenList -> Bool -> List (String, Int, Fixity) -> (lc : FC) -> Result a)
+data Parser a = P (TokenList -> Bool -> List OpDef -> (lc : FC) -> Result a)
 
 export
-runP : Parser a -> TokenList -> Bool -> List (String, Int, Fixity) -> FC -> Result a
+runP : Parser a -> TokenList -> Bool -> List OpDef -> FC -> Result a
 runP (P f) = f
 
 error : TokenList -> String -> Error
@@ -91,6 +98,13 @@ parse pa toks = case runP pa toks False [] (-1,-1) of
   OK a [] _ _ => Right a
   OK a ts _ _ => Left (error ts "Extra toks")
 
+||| Intended for parsing a top level declaration
+export
+partialParse : Parser a -> List OpDef -> TokenList -> Either Error (a, List OpDef, TokenList)
+partialParse pa ops toks = case runP pa toks False ops (0,0) of
+  Fail fatal err toks com ops => Left err
+  OK a ts _ ops => Right (a,ops,ts)
+
 -- I think I want to drop the typeclasses for v1
 
 export
@@ -108,13 +122,13 @@ fatal : String -> Parser a
 fatal msg = P $ \toks,com,ops,col => Fail True (error toks msg) toks com ops
 
 export
-getOps : Parser (List (String, Int, Fixity))
+getOps : Parser (List OpDef)
 getOps = P $ \ toks, com, ops, col => OK ops toks com ops
 
 export
 addOp : String -> Int -> Fixity -> Parser ()
 addOp nm prec fix = P $ \ toks, com, ops, col =>
-  OK () toks com ((nm, prec, fix) :: ops)
+  OK () toks com ((MkOp nm prec fix) :: ops)
 
 export
 Functor Parser where

src/Lib/TopContext.idr

@@ -19,11 +19,11 @@ lookup nm top = go top.defs
 export
 covering
 Show TopContext where
-  show (MkTop defs metas _ _ _) = "\nContext:\n [\{ joinBy "\n" $ map show defs}]"
+  show (MkTop defs metas _ _ _ _) = "\nContext:\n [\{ joinBy "\n" $ map show defs}]"
 
 public export
 empty : HasIO m => m TopContext
-empty = pure $ MkTop [] !(newIORef (MC [] 0)) False !(newIORef []) []
+empty = pure $ MkTop [] !(newIORef (MC [] 0)) False !(newIORef []) [] []
 
 ||| set or replace def. probably need to check types and Axiom on replace
 public export

src/Lib/Types.idr

@@ -366,7 +366,7 @@ record TopContext where
   errors : IORef (List Error)
   ||| loaded modules
   loaded : List String
-
+  ops : List OpDef
 
 -- we'll use this for typechecking, but need to keep a TopContext around too.
 public export