[add] Conflice 発生時に詳細を表示するようにした

Author: Yuta1004

lib/copager2/src/Copager2/Parse/Common/First.hs

@@ -55,7 +55,7 @@ first :: (TokenSet ts, RuleSet ts rs)
 first _ (EOF:_) = [EOF]
 first _ (t@(Term _):_) = [t]
 
--- -- -- 非終端記号から始まる n 文字
+-- 非終端記号から始まる n 文字
 first firstSet (Epsilon:xs) = first firstSet xs
 first firstSet (NonTerm x:xs) =
  let firstX = HashSet.toList $ firstSet HashMap.! NonTerm x

lib/copager2/src/Copager2/Parse/LR/Common/Table.hs

@@ -108,12 +108,12 @@ tryMarkRow row act = do
  in tables { action = action', eof_action = eof_action' }
  return ()
 
-tryInsert :: (Hashable a, TokenSet ts, RuleSet ts rs)
+tryInsert :: (Show a, Hashable a, TokenSet ts, RuleSet ts rs)
  => a
  -> LRAction rs
  -> HashMap a (LRAction rs)
  -> HashMap a (LRAction rs)
 tryInsert key act table =
  case table !? key of
- Just _ -> error "conflict"
+ Just act' -> error $ "conflict : " ++ show (key, act', act)
  Nothing -> insert key act table