some more clean-up

lib/ast/astDef.ml

@@ -119,7 +119,11 @@ module QualIdent = struct
     | [] -> qid.qual_base
 
   let pr ppf qid =
-    Print.pr_list_sep "." Ident.pr ppf (to_list qid)
+    let path = match qid.qual_path with
+      | maybe_program :: path when String.(Ident.name maybe_program = "$Program") -> path
+      | path -> path
+    in
+    Print.pr_list_sep "." Ident.pr ppf (path @ [qid.qual_base])
 
   let pr_list ppf qids = Print.pr_list_comma pr ppf qids
 

test/ci/back-end/bind_2.t

@@ -1,6 +1,6 @@
   $ dune exec -- raven --shh bind_2.rav
-  [Error] File "bind_2.rav", line 3, columns 2-23:
+  [Error] File "bind_2.rav", line 3, columns 7-22:
   3 |   x :| x < 7 && 10 < x;
-        ^^^^^^^^^^^^^^^^^^^^^
-  Verification Error: The body of bind stmt could not be shown.
+             ^^^^^^^^^^^^^^^
+  Verification Error: The right-hand side of this bind statement may not hold.
   [1]

test/ci/back-end/bind_4.t

@@ -1,6 +1,6 @@
   $ dune exec -- raven --shh bind_4.rav
-  [Error] File "bind_4.rav", line 7, columns 2-24:
+  [Error] File "bind_4.rav", line 7, columns 7-23:
   7 |   v :| own(x.f, v, 1.0);
-        ^^^^^^^^^^^^^^^^^^^^^^
-  Verification Error: The body of bind stmt could not be shown.
+             ^^^^^^^^^^^^^^^^
+  Verification Error: The right-hand side of this bind statement may not hold.
   [1]