Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to ATD_string_wrap #183

Merged
merged 1 commit into from
Nov 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rule_schema_v2.atd
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ type rule = {
}

(* Rule_ID.t, "^[a-zA-Z0-9._-]*$" *)
type rule_id = string wrap <ocaml module="ATDStringWrap.Ruleid">
type rule_id = string wrap <ocaml module="Rule_ID">

(* Version_info.t *)
type version = string (* TODO wrap <ocaml module="ATDStringWrap.Version"> *)
Expand Down
6 changes: 3 additions & 3 deletions semgrep_metrics.atd
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
(* Basic types *)
(*****************************************************************************)

type uuid = string wrap <ocaml module="ATDStringWrap.Uuidm">
type uuid = string wrap <ocaml module="ATD_string_wrap.Uuidm">

type sha256 = string wrap <ocaml module="ATDStringWrap.Sha256">
type sha256 = string wrap <ocaml module="ATD_string_wrap.Sha256">

(* GMT time (in osemgrep at least), in isoformat *)
type datetime = string wrap <ocaml module="ATDStringWrap.Datetime">
type datetime = string wrap <ocaml module="ATD_string_wrap.Datetime">

type lang = string

Expand Down
14 changes: 6 additions & 8 deletions semgrep_output_v1.atd
Original file line number Diff line number Diff line change
Expand Up @@ -71,16 +71,15 @@ type raw_json <ocaml module="Yojson.Basic" t="t"> = abstract
(*****************************************************************************)

(* File path. less: could convert directly to Path class of pathlib library for Python *)
type fpath <ocaml attr="deriving show"> =
string wrap <ocaml module="ATDStringWrap.Fpath">
type fpath <ocaml attr="deriving show"> = string wrap <ocaml module="ATD_string_wrap.Fpath">

type uri = string wrap <ocaml module="ATDStringWrap.Uri">
type uri = string wrap <ocaml module="ATD_string_wrap.Uri">

type sha1 = string wrap <ocaml module="ATDStringWrap.Sha1">
type sha1 = string wrap <ocaml module="ATD_string_wrap.Sha1">

type uuid = string wrap <ocaml module="ATDStringWrap.Uuidm">
type uuid = string wrap <ocaml module="ATD_string_wrap.Uuidm">

(* GMT time (in osemgrep at least), in isoformat, TODO ATDStringWrap.Datetime *)
(* GMT time (in osemgrep at least), in isoformat, TODO ATD_string_wrap.Datetime *)
type datetime = string

(*****************************************************************************)
Expand Down Expand Up @@ -124,7 +123,7 @@ type location
type rule_id
<ocaml attr="deriving show">
<python decorator="dataclass(frozen=True)"> =
string wrap <ocaml module="ATDStringWrap.Ruleid">
string wrap <ocaml module="Rule_ID">

(*
Error = something wrong that must be fixed
Expand Down Expand Up @@ -1329,4 +1328,3 @@ type ci_scan_failure = {
exit_code: int;
stderr: string;
}