Test expectations

spectec/src/middlend/sub.ml

@@ -73,8 +73,9 @@ let register_alias (env : env) (id : id) (id2 : id) =
 let injection_name (sub : id) (sup : id) = sup.it ^ "_" ^ sub.it $ no_region
 
 let var_of_typ typ = match typ.it with
-  | VarT id -> id
-  | _ -> error typ.at ("Non-variable type expression not supported:\n" ^ Il.Print.string_of_typ typ)
+  | VarT id -> Some id
+  | NumT _ -> None
+  | _ -> error typ.at ("Non-variable or number type expression not supported:\n" ^ Il.Print.string_of_typ typ)
 
 (* Step 1 and 4: Collect SubE occurrences, and replace with function *)
 
@@ -83,10 +84,12 @@ let rec t_exp env exp =
   let exp' = t_exp2 env exp in
   match exp'.it with
   | SubE (e, sub_ty, sup_ty) ->
-    let sub = var_of_typ sub_ty in
-    let sup = var_of_typ sup_ty in
-    env.pairs <- S.add (sub, sup) env.pairs;
-    { exp' with it = CallE (injection_name sub sup, e)}
+    begin match var_of_typ sub_ty, var_of_typ sup_ty with
+    | Some sub, Some sup ->
+      env.pairs <- S.add (sub, sup) env.pairs;
+      { exp' with it = CallE (injection_name sub sup, e)}
+    | _, _ -> exp'
+  end
   | _ -> exp'
 
 (* Traversal boilerplate *)