balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Resolve mli merge conflict

Browse Source
This commit is contained in:
Tom Jack 2019-10-07 13:56:48 -05:00
parent 6f414a8ad2
commit 4a5e41faa4
3 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/passes/2-simplify/pascaligo.ml
View File

@ -89,17 +89,6 @@ module Errors = struct
] in ] in
error ~data title message error ~data title message
let unsupported_string_catenation expr =
let title () = "string expressions" in
let message () =
Format.asprintf "string concatenation is not supported yet" in
let expr_loc = Raw.expr_to_region expr in
let data = [
("expr_loc",
fun () -> Format.asprintf "%a" Location.pp_lift @@ expr_loc)
] in
error ~data title message
let unsupported_proc_calls call = let unsupported_proc_calls call =
let title () = "procedure calls" in let title () = "procedure calls" in
let message () = let message () =

1
src/passes/2-simplify/pascaligo.mli
View File

@ -29,7 +29,6 @@ module Errors : sig
*) *)
val unsupported_arith_op : Raw.expr -> unit -> error val unsupported_arith_op : Raw.expr -> unit -> error
(* (*
val unsupported_string_catenation : Raw.expr -> unit -> error
val unsupported_set_expr : Raw.expr -> unit -> error val unsupported_set_expr : Raw.expr -> unit -> error
*) *)
val unsupported_proc_calls : 'a Raw.reg -> unit -> error val unsupported_proc_calls : 'a Raw.reg -> unit -> error

1
src/stages/ast_simplified/combinators.mli
View File

@ -61,6 +61,7 @@ val e_record : ?loc:Location.t -> ( expr * expr ) list -> expression
val e_tuple : ?loc:Location.t -> expression list -> expression val e_tuple : ?loc:Location.t -> expression list -> expression
val e_some : ?loc:Location.t -> expression -> expression val e_some : ?loc:Location.t -> expression -> expression
val e_none : ?loc:Location.t -> unit -> expression val e_none : ?loc:Location.t -> unit -> expression
val e_string_cat : ?loc:Location.t -> expression -> expression -> expression
val e_map_add : ?loc:Location.t -> expression -> expression -> expression -> expression val e_map_add : ?loc:Location.t -> expression -> expression -> expression -> expression
val e_map : ?loc:Location.t -> ( expression * expression ) list -> expression val e_map : ?loc:Location.t -> ( expression * expression ) list -> expression
val e_set : ?loc:Location.t -> expression list -> expression val e_set : ?loc:Location.t -> expression list -> expression