More from Claude Code.

Author: augustss

src/MicroHs/TypeCheck.hs

@@ -335,9 +335,10 @@ mkTCState mdlName globs mdls =
 mergeDefaults :: Defaults -> Defaults -> Defaults
 mergeDefaults ds = foldr (uncurry $ M.insertWith mrg) ds . M.toList
   where mrg :: [EType] -> [EType] -> [EType]
-        mrg ts ts' | not (any (\ t -> not (elemBy eqEType t ts)) ts') = ts
-                   | not (any (\ t -> not (elemBy eqEType t ts')) ts) = ts'
-                   | otherwise = []
+        mrg ts ts' | all (\ t -> elemBy eqEType t ts) ts' = ts
+                   | any (\ t -> elemBy eqEType t ts') ts = ts'
+                   | otherwise = []  -- If neither module's default subsumes the other
+                                     -- then use empty defaults, as per spec.
 
 mergeInstInfo :: InstInfo -> InstInfo -> InstInfo
 mergeInstInfo (InstInfo m1 l1 fds) (InstInfo m2 l2 _) =
@@ -3499,7 +3500,7 @@ getSuperClasses ais = do
         case M.lookup i ct of
           Nothing -> error $ "getSuperClasses: " ++ show i
           Just (ClassInfo _ supers _ _ _) ->
-            loop done (concatMap flatten supers ++ is)
+            loop (i:done) (concatMap flatten supers ++ is)
       flatten a =
         case getApp a of
           (c, ts) ->

src/runtime/eval.c

@@ -3632,7 +3632,7 @@ parse(BFILE *f)
       if (!gobble(f, '"'))
         ERR("parse !");
       r = alloc_node(T_TICK);
-      SETVALUE(r, (value_t)add_tick_table(parse_string(f)););
+      SETVALUE(r, (value_t)add_tick_table(parse_string(f)));
       PUSH(r);
       break;
 #endif
@@ -3977,6 +3977,7 @@ case T_DBL: putb('&', f); putdblb(GETDBLVALUE(n), f); break;
     } else {
       ERR("cannot serialize ThreadId yet");
     }
+    break;
   case T_FORPTR:
     if (n == comb_stdin)
       putsb("IO.stdin", f);
@@ -6029,7 +6030,7 @@ evali(NODEPTR an)
       case T_SUBR64:SUB_OVERFLOW(int64_t, r64u, y64u, x64u); break;
       case T_QUOT64:if (y64u == 0)
                       raise_rts(exn_dividebyzero);
-                    else if ((int64_t)xu == INT64_MIN && (int64_t)yu == -1)
+                    else if ((int64_t)x64u == INT64_MIN && (int64_t)y64u == -1)
                       raise_rts(exn_overflow);
                     else
                       r64u = (uint64_t)((int64_t)x64u / (int64_t)y64u);