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

WIP: fixing the build errors

Browse Source
This commit is contained in:
Georges Dupéron 2019-09-29 18:28:19 -04:00
parent 2b5b23f266
commit c1ca3184af
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/passes/4-typer/typer.ml
View File

@ -222,6 +222,7 @@ end
open Errors open Errors
let swap (a,b) = ok (b,a) let swap (a,b) = ok (b,a)
(*
let rec type_program (p:I.program) : O.program result = let rec type_program (p:I.program) : O.program result =
let aux (e, acc:(environment * O.declaration Location.wrap list)) (d:I.declaration Location.wrap) = let aux (e, acc:(environment * O.declaration Location.wrap list)) (d:I.declaration Location.wrap) =
let%bind ed' = (bind_map_location (type_declaration e)) d in let%bind ed' = (bind_map_location (type_declaration e)) d in
@ -235,11 +236,12 @@ let rec type_program (p:I.program) : O.program result =
trace (fun () -> program_error p ()) @@ trace (fun () -> program_error p ()) @@
bind_fold_list aux (Environment.full_empty, []) p in bind_fold_list aux (Environment.full_empty, []) p in
ok @@ List.rev lst ok @@ List.rev lst
*)
(* (*
Extract pairs of (name,type) in the declaration and add it to the environment Extract pairs of (name,type) in the declaration and add it to the environment
*) *)
and type_declaration env state : I.declaration -> (environment * Solver.state * O.declaration option) result = function let rec type_declaration env state : I.declaration -> (environment * Solver.state * O.declaration option) result = function
| Declaration_type (type_name , type_expression) -> | Declaration_type (type_name , type_expression) ->
let%bind tv = evaluate_type env type_expression in let%bind tv = evaluate_type env type_expression in
let env' = Environment.add_type type_name tv env in let env' = Environment.add_type type_name tv env in
@ -409,7 +411,7 @@ and type_expression : environment -> Solver.state -> I.expression -> (O.annotate
] in ] in
error ~data title content in error ~data title content in
trace main_error @@ trace main_error @@
match ae.expression' with match ae.expression with
(* TODO: this file should take care only of the order in which program fragments (* TODO: this file should take care only of the order in which program fragments
are translated by Wrap.xyz are translated by Wrap.xyz