@@ -373,12 +373,19 @@ declared (PFix _ _ _) = []
373373declared (PTy _ _ _ _ n t) = [n]
374374declared (PPostulate _ _ _ _ n t) = [n]
375375declared (PClauses _ _ n _) = [] -- not a declaration
376−declared (PRecord _ _ _ n _ _ c _) = [n, c]
376+declared (PCAF _ n _) = [n]
377377declared (PData _ _ _ _ (PDatadecl n _ ts)) = n : map fstt ts
378378 where fstt (_, a, _, _) = a
379+declared (PData _ _ _ _ (PLaterdecl n _)) = [n]
379380declared (PParams _ _ ds) = concatMap declared ds
380−declared (PMutual _ ds) = concatMap declared ds
381381declared (PNamespace _ ds) = concatMap declared ds
382+declared (PRecord _ _ _ n _ _ c _) = [n, c]
383+declared (PClass _ _ _ _ n _ ms) = n : concatMap declared ms
384+declared (PInstance _ _ _ _ _ _ _ _) = []
385+declared (PDSL n _) = [n]
386+declared (PSyntax _ _) = []
387+declared (PMutual _ ds) = concatMap declared ds
388+declared (PDirective _) = []
382389
383390-- get the names declared, not counting nested parameter blocks
384391tldeclared :: PDecl -> [Name]
@@ -392,20 +399,27 @@ tldeclared (PData _ _ _ _ (PDatadecl n _ ts)) = n : map fstt ts
392399tldeclared (PParams _ _ ds) = []
393400tldeclared (PMutual _ ds) = concatMap tldeclared ds
394401tldeclared (PNamespace _ ds) = concatMap tldeclared ds
395−-- declared (PImport _) = []
402+
396403
397404defined :: PDecl -> [Name]
398405defined (PFix _ _ _) = []
399406defined (PTy _ _ _ _ n t) = []
400407defined (PPostulate _ _ _ _ n t) = []
401408defined (PClauses _ _ n _) = [n] -- not a declaration
402−defined (PRecord _ _ _ n _ _ c _) = [n, c]
409+defined (PCAF _ n _) = [n]
403410defined (PData _ _ _ _ (PDatadecl n _ ts)) = n : map fstt ts
404411 where fstt (_, a, _, _) = a
412+defined (PData _ _ _ _ (PLaterdecl n _)) = []
405413defined (PParams _ _ ds) = concatMap defined ds
406−defined (PMutual _ ds) = concatMap defined ds
407414defined (PNamespace _ ds) = concatMap defined ds
408−-- declared (PImport _) = []
415+defined (PRecord _ _ _ n _ _ c _) = [n, c]
416+defined (PClass _ _ _ _ n _ ms) = n : concatMap defined ms
417+defined (PInstance _ _ _ _ _ _ _ _) = []
418+defined (PDSL n _) = [n]
419+defined (PSyntax _ _) = []
420+defined (PMutual _ ds) = concatMap defined ds
421+defined (PDirective _) = []
422+--defined _ = []
409423
410424updateN :: [(Name, Name)] -> Name -> Name
411425updateN ns n | Just n' <- lookup n ns = n'