Use functions that show line/column errors when parsing special fields

tarides · Mar 22, 2022 · 3aadbbd · 3aadbbd
1 parent c02cacd
commit 3aadbbd
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/lib/source_opam_config.ml b/lib/source_opam_config.ml
@@ -166,16 +166,20 @@ module Opam_provided = struct
   let from_opam_value opam_chunk =
     let open Result.O in
     let* names =
-      match opam_chunk.OpamParserTypes.FullPos.pelem with
-      | OpamParserTypes.FullPos.String s -> Ok [ s ]
-      | List items ->
-          items.OpamParserTypes.FullPos.pelem
+      match (opam_chunk : OpamParserTypes.FullPos.value) with
+      | { pelem = String s; _ } -> Ok [ s ]
+      | { pelem = List items; _ } ->
+          items.pelem
           |> List.map ~f:(fun item ->
-                 match item.OpamParserTypes.FullPos.pelem with
-                 | OpamParserTypes.FullPos.String s -> Ok s
-                 | _ -> Error (`Msg "String required"))
+                 match (item : OpamParserTypes.FullPos.value) with
+                 | { pelem = String s; _ } -> Ok s
+                 | otherwise ->
+                     Opam.Pos.unexpected_value_error ~expected:"a string"
+                       otherwise)
           |> Result.List.all
-      | _ -> Error (`Msg "String or List required")
+      | otherwise ->
+          Opam.Pos.unexpected_value_error
+            ~expected:"a string or a list of strings" otherwise
     in
     let names = List.map ~f:OpamPackage.Name.of_string names in
     Ok (OpamPackage.Name.Set.of_list names)

diff --git a/test/bin/opam-provided.t/run.t b/test/bin/opam-provided.t/run.t
@@ -112,7 +112,7 @@ be ignored is not a string.
   42
 
   $ opam-monorepo lock warning > /dev/null
-  opam-monorepo: String or List required
+  opam-monorepo: Error in opam file $TESTCASE_ROOT/warning.opam, [8:31]-[8:33]: Expected a string or a list of strings, got: 42
   [1]
 
 Similarly, we accept a list but it needs to be a list of strings which this is
@@ -121,5 +121,5 @@ not:
   $ opam show --no-lint --raw -fx-opam-monorepo-opam-provided ./warning-list.opam
   42 "fourtytwo"
   $ opam-monorepo lock warning > /dev/null
-  opam-monorepo: String or List required
+  opam-monorepo: Error in opam file $TESTCASE_ROOT/warning.opam, [8:31]-[8:33]: Expected a string or a list of strings, got: 42
   [1]