refactor to use new utils

Author: adamhaber

src/frontend/Typechecker.ml

@@ -393,25 +393,9 @@ let check_fn ~is_cond_dist loc tenv id es =
            (Stan_math_signatures.is_stan_math_function_name
               (Utils.normalized_name id.name)) ->
       Semantic_error.returning_fn_expected_nonfn_found loc id.name |> error
-  | [] -> (
-      let gen_prefix l = String.concat ~sep:"_" (List.rev l) in
-      match List.rev (String.split id.name ~on:'_') with
-      | (("lpmf" | "lupmf") as suffix) :: tl
-        when Utils.is_distribution_name
-               (String.concat ~sep:"_" (List.rev tl @ ["lpdf"])) ->
-          Semantic_error.returning_fn_expected_wrong_dist_suffix_found loc
-            (gen_prefix tl, suffix)
-          |> error
-      | (("lpdf" | "lupdf") as suffix) :: tl
-        when Utils.is_distribution_name
-               (String.concat ~sep:"_" (List.rev tl @ ["lpmf"])) ->
-          Semantic_error.returning_fn_expected_wrong_dist_suffix_found loc
-            (gen_prefix tl, suffix)
-          |> error
-      | suffix :: tl
-        when List.mem Utils.cumulative_distribution_suffices_w_rng suffix
-               ~equal:String.equal ->
-          let prefix = gen_prefix tl in
+  | [] ->
+      ( match Utils.split_distribution_suffix id.name with
+      | Some (prefix, suffix) -> (
           let known_families =
             List.map
               ~f:(fun (_, y, _, _) -> y)
@@ -420,18 +404,31 @@ let check_fn ~is_cond_dist loc tenv id es =
           let is_known_family s =
             List.mem known_families s ~equal:String.equal
           in
-          if is_known_family prefix then
-            Semantic_error.returning_fn_expected_undeclared_dist_suffix_found
-              loc (prefix, suffix)
-            |> error
-          else
-            Semantic_error.returning_fn_expected_undeclaredident_found loc
-              id.name
-            |> error
-      | _ ->
+          match suffix with
+          | ("lpmf" | "lumpf")
+            when Utils.is_distribution_name (prefix ^ "_lpdf") ->
+              Semantic_error.returning_fn_expected_wrong_dist_suffix_found loc
+                (prefix, suffix)
+          | ("lpdf" | "lumdf")
+            when Utils.is_distribution_name (prefix ^ "_lpmf") ->
+              Semantic_error.returning_fn_expected_wrong_dist_suffix_found loc
+                (prefix, suffix)
+          | _ ->
+              if
+                is_known_family prefix
+                && List.mem ~equal:String.equal
+                     Utils.cumulative_distribution_suffices_w_rng suffix
+              then
+                Semantic_error
+                .returning_fn_expected_undeclared_dist_suffix_found loc
+                  (prefix, suffix)
+              else
+                Semantic_error.returning_fn_expected_undeclaredident_found loc
+                  id.name )
+      | None ->
           Semantic_error.returning_fn_expected_undeclaredident_found loc
-            id.name
-          |> error )
+            id.name )
+      |> error
   | _ (* a function *) -> (
     match SignatureMismatch.returntype tenv id.name (get_arg_types es) with
     | Ok (Void, _) ->

src/middle/Utils.ml

@@ -14,7 +14,9 @@ let conditioning_suffices =
   ["_lpdf"; "_lupdf"; "_lupmf"; "_lpmf"; "_cdf"; "_lcdf"; "_lccdf"]
 
 let conditioning_suffices_w_log = conditioning_suffices @ ["_log"]
-let cumulative_distribution_suffices = ["cdf"; "lcdf"; "lccdf"]
+
+let cumulative_distribution_suffices =
+  ["cdf"; "lcdf"; "lccdf"; "cdf_log"; "ccdf_log"]
 
 let cumulative_distribution_suffices_w_rng =
   cumulative_distribution_suffices @ ["rng"]