2020-11-25 12:49:53 +03:00
|
|
|
(* This file is part of the Catala compiler, a specification language for tax
|
|
|
|
and social benefits computation rules. Copyright (C) 2020 Inria, contributor:
|
|
|
|
Denis Merigoux <denis.merigoux@inria.fr>
|
|
|
|
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License"); you may not
|
|
|
|
use this file except in compliance with the License. You may obtain a copy of
|
|
|
|
the License at
|
|
|
|
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
|
|
distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
|
|
WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
|
|
License for the specific language governing permissions and limitations under
|
|
|
|
the License. *)
|
|
|
|
|
2020-12-14 19:00:42 +03:00
|
|
|
(** Translation from {!module: Desugared.Ast} to {!module: Scopelang.Ast} *)
|
|
|
|
|
2022-11-21 12:46:17 +03:00
|
|
|
open Catala_utils
|
2022-08-12 23:42:39 +03:00
|
|
|
open Shared_ast
|
2023-02-27 11:50:42 +03:00
|
|
|
module D = Desugared.Ast
|
2020-11-25 16:35:26 +03:00
|
|
|
|
2022-03-01 12:15:44 +03:00
|
|
|
(** {1 Expression translation}*)
|
|
|
|
|
|
|
|
type target_scope_vars =
|
2022-08-17 18:14:29 +03:00
|
|
|
| WholeVar of ScopeVar.t
|
2022-08-25 13:09:51 +03:00
|
|
|
| States of (StateName.t * ScopeVar.t) list
|
2022-03-01 12:15:44 +03:00
|
|
|
|
|
|
|
type ctx = {
|
2022-11-28 18:23:27 +03:00
|
|
|
decl_ctx : decl_ctx;
|
2022-11-21 12:12:45 +03:00
|
|
|
scope_var_mapping : target_scope_vars ScopeVar.Map.t;
|
2023-08-10 17:52:39 +03:00
|
|
|
var_mapping : (D.expr, untyped Ast.expr Var.t) Var.Map.t;
|
|
|
|
modules : ctx ModuleName.Map.t;
|
2022-03-01 12:15:44 +03:00
|
|
|
}
|
|
|
|
|
2022-03-16 13:44:34 +03:00
|
|
|
let tag_with_log_entry
|
2022-11-07 15:50:28 +03:00
|
|
|
(e : untyped Ast.expr boxed)
|
2022-08-12 23:42:39 +03:00
|
|
|
(l : log_entry)
|
2022-11-21 12:46:17 +03:00
|
|
|
(markings : Uid.MarkedString.info list) : untyped Ast.expr boxed =
|
2023-06-28 16:57:52 +03:00
|
|
|
if Cli.globals.trace then
|
2023-04-03 11:56:13 +03:00
|
|
|
Expr.eapp
|
2023-05-17 16:44:57 +03:00
|
|
|
(Expr.eop (Log (l, markings)) [TAny, Expr.pos e] (Mark.get e))
|
|
|
|
[e] (Mark.get e)
|
2023-04-14 11:50:21 +03:00
|
|
|
else e
|
2022-03-16 13:44:34 +03:00
|
|
|
|
2023-08-10 17:52:39 +03:00
|
|
|
let rec translate_expr (ctx : ctx) (e : D.expr) : untyped Ast.expr boxed =
|
2023-05-17 16:44:57 +03:00
|
|
|
let m = Mark.get e in
|
|
|
|
match Mark.remove e with
|
2023-04-19 19:26:50 +03:00
|
|
|
| EVar v -> Expr.evar (Var.Map.find v ctx.var_mapping) m
|
|
|
|
| EAbs { binder; tys } ->
|
|
|
|
let vars, body = Bindlib.unmbind binder in
|
|
|
|
let new_vars = Array.map (fun var -> Var.make (Bindlib.name_of var)) vars in
|
|
|
|
let ctx =
|
|
|
|
List.fold_left2
|
|
|
|
(fun ctx var new_var ->
|
|
|
|
{ ctx with var_mapping = Var.Map.add var new_var ctx.var_mapping })
|
|
|
|
ctx (Array.to_list vars) (Array.to_list new_vars)
|
|
|
|
in
|
|
|
|
Expr.eabs (Expr.bind new_vars (translate_expr ctx body)) tys m
|
2023-08-30 18:49:29 +03:00
|
|
|
| ELocation (SubScopeVar { scope; alias; var }) ->
|
2022-03-01 22:41:01 +03:00
|
|
|
(* When referring to a subscope variable in an expression, we are referring
|
|
|
|
to the output, hence we take the last state. *)
|
2023-08-30 18:49:29 +03:00
|
|
|
let ctx =
|
|
|
|
List.fold_left
|
|
|
|
(fun ctx m -> ModuleName.Map.find m ctx.modules)
|
|
|
|
ctx (ScopeName.path scope)
|
|
|
|
in
|
2023-08-10 17:52:39 +03:00
|
|
|
let var =
|
|
|
|
match ScopeVar.Map.find (Mark.remove var) ctx.scope_var_mapping with
|
|
|
|
| WholeVar new_s_var -> Mark.copy var new_s_var
|
|
|
|
| States states -> Mark.copy var (snd (List.hd (List.rev states)))
|
2022-03-01 22:41:01 +03:00
|
|
|
in
|
2023-08-30 18:49:29 +03:00
|
|
|
Expr.elocation (SubScopeVar { scope; alias; var }) m
|
2023-08-10 17:52:39 +03:00
|
|
|
| ELocation (DesugaredScopeVar { name; state = None }) ->
|
Swap boxing and annotations in expressions
This was the only reasonable solution I found to the issue raised
[here](https://github.com/CatalaLang/catala/pull/334#discussion_r987175884).
This was a pretty tedious rewrite, but it should now ensure we are doing things
correctly. As a bonus, the "smart" expression constructors are now used
everywhere to build expressions (so another refactoring like this one should be
much easier) and this makes the code overall feel more
straightforward (`Bindlib.box_apply` or `let+` no longer need to be visible!)
---
Basically, we were using values of type `gexpr box = naked_gexpr marked box`
throughout when (re-)building expressions. This was done 99% of the time by
using `Bindlib.box_apply add_mark naked_e` right after building `naked_e`. In
lots of places, we needed to recover the annotation of this expression later on,
typically to build its parent term (to inherit the position, or build the type).
Since it wasn't always possible to wrap these uses within `box_apply` (esp. as
bindlib boxes aren't a monad), here and there we had to call `Bindlib.unbox`,
just to recover the position or type. This had the very unpleasant effect of
forcing the resolution of the whole box (including applying any stored closures)
to reach the top-level annotation which isn't even dependant on specific
variable bindings. Then, generally, throwing away the result.
Therefore, the change proposed here transforms
- `naked_gexpr marked Bindlib.box` into
- `naked_gexpr Bindlib.box marked` (aliased to `boxed_gexpr` or `gexpr boxed` for
convenience)
This means only
1. not fitting the mark into the box right away when building, and
2. accessing the top-level mark directly without unboxing
The functions for building terms from module `Shared_ast.Expr` could be changed
easily. But then they needed to be consistently used throughout, without
manually building terms through `Bindlib.apply_box` -- which covers most of the
changes in this patch.
`Expr.Box.inj` is provided to swap back to a box, before binding for example.
Additionally, this gives a 40% speedup on `make -C examples pass_all_tests`,
which hints at the amount of unnecessary work we were doing --'
2022-10-06 20:13:45 +03:00
|
|
|
Expr.elocation
|
|
|
|
(ScopelangScopeVar
|
2023-08-10 17:52:39 +03:00
|
|
|
{
|
|
|
|
name =
|
|
|
|
(match
|
|
|
|
ScopeVar.Map.find (Mark.remove name) ctx.scope_var_mapping
|
|
|
|
with
|
|
|
|
| WholeVar new_s_var -> Mark.copy name new_s_var
|
|
|
|
| States _ -> failwith "should not happen");
|
|
|
|
})
|
Swap boxing and annotations in expressions
This was the only reasonable solution I found to the issue raised
[here](https://github.com/CatalaLang/catala/pull/334#discussion_r987175884).
This was a pretty tedious rewrite, but it should now ensure we are doing things
correctly. As a bonus, the "smart" expression constructors are now used
everywhere to build expressions (so another refactoring like this one should be
much easier) and this makes the code overall feel more
straightforward (`Bindlib.box_apply` or `let+` no longer need to be visible!)
---
Basically, we were using values of type `gexpr box = naked_gexpr marked box`
throughout when (re-)building expressions. This was done 99% of the time by
using `Bindlib.box_apply add_mark naked_e` right after building `naked_e`. In
lots of places, we needed to recover the annotation of this expression later on,
typically to build its parent term (to inherit the position, or build the type).
Since it wasn't always possible to wrap these uses within `box_apply` (esp. as
bindlib boxes aren't a monad), here and there we had to call `Bindlib.unbox`,
just to recover the position or type. This had the very unpleasant effect of
forcing the resolution of the whole box (including applying any stored closures)
to reach the top-level annotation which isn't even dependant on specific
variable bindings. Then, generally, throwing away the result.
Therefore, the change proposed here transforms
- `naked_gexpr marked Bindlib.box` into
- `naked_gexpr Bindlib.box marked` (aliased to `boxed_gexpr` or `gexpr boxed` for
convenience)
This means only
1. not fitting the mark into the box right away when building, and
2. accessing the top-level mark directly without unboxing
The functions for building terms from module `Shared_ast.Expr` could be changed
easily. But then they needed to be consistently used throughout, without
manually building terms through `Bindlib.apply_box` -- which covers most of the
changes in this patch.
`Expr.Box.inj` is provided to swap back to a box, before binding for example.
Additionally, this gives a 40% speedup on `make -C examples pass_all_tests`,
which hints at the amount of unnecessary work we were doing --'
2022-10-06 20:13:45 +03:00
|
|
|
m
|
2023-08-10 17:52:39 +03:00
|
|
|
| ELocation (DesugaredScopeVar { name; state = Some state }) ->
|
|
|
|
Expr.elocation
|
Swap boxing and annotations in expressions
This was the only reasonable solution I found to the issue raised
[here](https://github.com/CatalaLang/catala/pull/334#discussion_r987175884).
This was a pretty tedious rewrite, but it should now ensure we are doing things
correctly. As a bonus, the "smart" expression constructors are now used
everywhere to build expressions (so another refactoring like this one should be
much easier) and this makes the code overall feel more
straightforward (`Bindlib.box_apply` or `let+` no longer need to be visible!)
---
Basically, we were using values of type `gexpr box = naked_gexpr marked box`
throughout when (re-)building expressions. This was done 99% of the time by
using `Bindlib.box_apply add_mark naked_e` right after building `naked_e`. In
lots of places, we needed to recover the annotation of this expression later on,
typically to build its parent term (to inherit the position, or build the type).
Since it wasn't always possible to wrap these uses within `box_apply` (esp. as
bindlib boxes aren't a monad), here and there we had to call `Bindlib.unbox`,
just to recover the position or type. This had the very unpleasant effect of
forcing the resolution of the whole box (including applying any stored closures)
to reach the top-level annotation which isn't even dependant on specific
variable bindings. Then, generally, throwing away the result.
Therefore, the change proposed here transforms
- `naked_gexpr marked Bindlib.box` into
- `naked_gexpr Bindlib.box marked` (aliased to `boxed_gexpr` or `gexpr boxed` for
convenience)
This means only
1. not fitting the mark into the box right away when building, and
2. accessing the top-level mark directly without unboxing
The functions for building terms from module `Shared_ast.Expr` could be changed
easily. But then they needed to be consistently used throughout, without
manually building terms through `Bindlib.apply_box` -- which covers most of the
changes in this patch.
`Expr.Box.inj` is provided to swap back to a box, before binding for example.
Additionally, this gives a 40% speedup on `make -C examples pass_all_tests`,
which hints at the amount of unnecessary work we were doing --'
2022-10-06 20:13:45 +03:00
|
|
|
(ScopelangScopeVar
|
2023-08-10 17:52:39 +03:00
|
|
|
{
|
|
|
|
name =
|
|
|
|
(match
|
|
|
|
ScopeVar.Map.find (Mark.remove name) ctx.scope_var_mapping
|
|
|
|
with
|
|
|
|
| WholeVar _ -> failwith "should not happen"
|
|
|
|
| States states -> Mark.copy name (List.assoc state states));
|
|
|
|
})
|
Swap boxing and annotations in expressions
This was the only reasonable solution I found to the issue raised
[here](https://github.com/CatalaLang/catala/pull/334#discussion_r987175884).
This was a pretty tedious rewrite, but it should now ensure we are doing things
correctly. As a bonus, the "smart" expression constructors are now used
everywhere to build expressions (so another refactoring like this one should be
much easier) and this makes the code overall feel more
straightforward (`Bindlib.box_apply` or `let+` no longer need to be visible!)
---
Basically, we were using values of type `gexpr box = naked_gexpr marked box`
throughout when (re-)building expressions. This was done 99% of the time by
using `Bindlib.box_apply add_mark naked_e` right after building `naked_e`. In
lots of places, we needed to recover the annotation of this expression later on,
typically to build its parent term (to inherit the position, or build the type).
Since it wasn't always possible to wrap these uses within `box_apply` (esp. as
bindlib boxes aren't a monad), here and there we had to call `Bindlib.unbox`,
just to recover the position or type. This had the very unpleasant effect of
forcing the resolution of the whole box (including applying any stored closures)
to reach the top-level annotation which isn't even dependant on specific
variable bindings. Then, generally, throwing away the result.
Therefore, the change proposed here transforms
- `naked_gexpr marked Bindlib.box` into
- `naked_gexpr Bindlib.box marked` (aliased to `boxed_gexpr` or `gexpr boxed` for
convenience)
This means only
1. not fitting the mark into the box right away when building, and
2. accessing the top-level mark directly without unboxing
The functions for building terms from module `Shared_ast.Expr` could be changed
easily. But then they needed to be consistently used throughout, without
manually building terms through `Bindlib.apply_box` -- which covers most of the
changes in this patch.
`Expr.Box.inj` is provided to swap back to a box, before binding for example.
Additionally, this gives a 40% speedup on `make -C examples pass_all_tests`,
which hints at the amount of unnecessary work we were doing --'
2022-10-06 20:13:45 +03:00
|
|
|
m
|
2023-02-13 17:00:23 +03:00
|
|
|
| ELocation (ToplevelVar v) -> Expr.elocation (ToplevelVar v) m
|
2022-11-28 18:23:27 +03:00
|
|
|
| EDStructAccess { name_opt = None; _ } ->
|
|
|
|
(* Note: this could only happen if disambiguation was disabled. If we want
|
|
|
|
to support it, we should still allow this case when the field has only
|
|
|
|
one possible matching structure *)
|
2023-06-13 12:27:45 +03:00
|
|
|
Message.raise_spanned_error (Expr.mark_pos m)
|
2022-11-28 18:23:27 +03:00
|
|
|
"Ambiguous structure field access"
|
2023-08-30 18:49:29 +03:00
|
|
|
| EDStructAccess { e; field; name_opt = Some name } ->
|
2022-11-28 18:23:27 +03:00
|
|
|
let e' = translate_expr ctx e in
|
|
|
|
let field =
|
2023-10-03 19:19:41 +03:00
|
|
|
let decl_ctx = Program.module_ctx ctx.decl_ctx (StructName.path name) in
|
2022-11-28 18:23:27 +03:00
|
|
|
try
|
|
|
|
StructName.Map.find name
|
2023-10-03 19:19:41 +03:00
|
|
|
(Ident.Map.find field decl_ctx.ctx_struct_fields)
|
2023-08-15 17:57:52 +03:00
|
|
|
with StructName.Map.Not_found _ | Ident.Map.Not_found _ ->
|
2022-11-28 18:23:27 +03:00
|
|
|
(* Should not happen after disambiguation *)
|
2023-06-13 12:27:45 +03:00
|
|
|
Message.raise_spanned_error (Expr.mark_pos m)
|
2023-06-07 19:10:50 +03:00
|
|
|
"Field @{<yellow>\"%s\"@} does not belong to structure \
|
|
|
|
@{<yellow>\"%a\"@}"
|
2023-07-12 12:48:46 +03:00
|
|
|
field StructName.format name
|
2022-11-28 18:23:27 +03:00
|
|
|
in
|
2023-08-10 17:52:39 +03:00
|
|
|
Expr.estructaccess ~e:e' ~field ~name m
|
2023-08-30 18:49:29 +03:00
|
|
|
| EScopeCall { scope; args } ->
|
|
|
|
Expr.escopecall ~scope
|
2023-08-10 17:52:39 +03:00
|
|
|
~args:
|
|
|
|
(ScopeVar.Map.fold
|
2022-11-17 19:13:35 +03:00
|
|
|
(fun v e args' ->
|
2022-10-21 16:47:17 +03:00
|
|
|
let v' =
|
2022-11-21 12:12:45 +03:00
|
|
|
match ScopeVar.Map.find v ctx.scope_var_mapping with
|
2022-10-21 16:47:17 +03:00
|
|
|
| WholeVar v' -> v'
|
2022-11-03 17:18:51 +03:00
|
|
|
| States ((_, v') :: _) ->
|
|
|
|
(* When there are multiple states, the input is always the
|
|
|
|
first one *)
|
|
|
|
v'
|
2022-10-26 12:08:50 +03:00
|
|
|
| States [] -> assert false
|
2022-10-21 16:47:17 +03:00
|
|
|
in
|
2022-11-21 12:12:45 +03:00
|
|
|
ScopeVar.Map.add v' (translate_expr ctx e) args')
|
|
|
|
args ScopeVar.Map.empty)
|
2022-10-21 16:47:17 +03:00
|
|
|
m
|
Add overloaded operators for the common operations
This uses the same disambiguation mechanism put in place for
structures, calling the typer on individual rules on the desugared AST
to propagate types, in order to resolve ambiguous operators like `+`
to their strongly typed counterparts (`+!`, `+.`, `+$`, `+@`, `+$`) in
the translation to scopelang.
The patch includes some normalisation of the definition of all the
operators, and classifies them based on their typing policy instead of
their arity. It also adds a little more flexibility:
- a couple new operators, like `-` on date and duration
- optional type annotation on some aggregation constructions
The `Shared_ast` lib is also lightly restructured, with the `Expr`
module split into `Type`, `Operator` and `Expr`.
2022-11-29 11:47:53 +03:00
|
|
|
| EApp { f = EOp { op; tys }, m1; args } ->
|
|
|
|
let args = List.map (translate_expr ctx) args in
|
|
|
|
Operator.kind_dispatch op
|
|
|
|
~monomorphic:(fun op -> Expr.eapp (Expr.eop op tys m1) args m)
|
|
|
|
~polymorphic:(fun op -> Expr.eapp (Expr.eop op tys m1) args m)
|
|
|
|
~overloaded:(fun op ->
|
|
|
|
match
|
2023-05-17 16:44:57 +03:00
|
|
|
Operator.resolve_overload ctx.decl_ctx (Mark.add (Expr.pos e) op) tys
|
Add overloaded operators for the common operations
This uses the same disambiguation mechanism put in place for
structures, calling the typer on individual rules on the desugared AST
to propagate types, in order to resolve ambiguous operators like `+`
to their strongly typed counterparts (`+!`, `+.`, `+$`, `+@`, `+$`) in
the translation to scopelang.
The patch includes some normalisation of the definition of all the
operators, and classifies them based on their typing policy instead of
their arity. It also adds a little more flexibility:
- a couple new operators, like `-` on date and duration
- optional type annotation on some aggregation constructions
The `Shared_ast` lib is also lightly restructured, with the `Expr`
module split into `Type`, `Operator` and `Expr`.
2022-11-29 11:47:53 +03:00
|
|
|
with
|
|
|
|
| op, `Straight -> Expr.eapp (Expr.eop op tys m1) args m
|
|
|
|
| op, `Reversed ->
|
|
|
|
Expr.eapp (Expr.eop op (List.rev tys) m1) (List.rev args) m)
|
|
|
|
| EOp _ -> assert false (* Only allowed within [EApp] *)
|
2023-04-19 19:26:50 +03:00
|
|
|
| ( EStruct _ | ETuple _ | ETupleAccess _ | EInj _ | EMatch _ | ELit _
|
|
|
|
| EApp _ | EDefault _ | EIfThenElse _ | EArray _ | EEmptyError
|
2023-08-10 17:52:39 +03:00
|
|
|
| EErrorOnEmpty _ ) as e ->
|
2023-04-19 19:26:50 +03:00
|
|
|
Expr.map ~f:(translate_expr ctx) (e, m)
|
2022-03-01 12:15:44 +03:00
|
|
|
|
2020-12-14 19:00:42 +03:00
|
|
|
(** {1 Rule tree construction} *)
|
|
|
|
|
2022-01-05 12:42:46 +03:00
|
|
|
(** Intermediate representation for the exception tree of rules for a particular
|
|
|
|
scope definition. *)
|
|
|
|
type rule_tree =
|
2023-08-10 17:52:39 +03:00
|
|
|
| Leaf of D.rule list
|
2022-01-05 12:42:46 +03:00
|
|
|
(** Rules defining a base case piecewise. List is non-empty. *)
|
2023-08-10 17:52:39 +03:00
|
|
|
| Node of rule_tree list * D.rule list
|
2022-07-13 16:00:57 +03:00
|
|
|
(** [Node (exceptions, base_case)] is a list of exceptions to a non-empty
|
|
|
|
list of rules defining a base case piecewise. *)
|
2020-11-25 18:51:19 +03:00
|
|
|
|
2020-12-14 19:00:42 +03:00
|
|
|
(** Transforms a flat list of rules into a tree, taking into account the
|
|
|
|
priorities declared between rules *)
|
2023-04-18 12:06:58 +03:00
|
|
|
let def_to_exception_graph
|
2023-08-10 17:52:39 +03:00
|
|
|
(def_info : D.ScopeDef.t)
|
|
|
|
(def : D.rule RuleName.Map.t) :
|
2023-04-18 12:06:58 +03:00
|
|
|
Desugared.Dependency.ExceptionsDependencies.t =
|
2022-11-07 15:50:28 +03:00
|
|
|
let exc_graph = Desugared.Dependency.build_exceptions_graph def def_info in
|
2023-02-28 16:40:05 +03:00
|
|
|
Desugared.Dependency.check_for_exception_cycle def exc_graph;
|
2023-04-18 12:06:58 +03:00
|
|
|
exc_graph
|
|
|
|
|
2023-08-10 17:52:39 +03:00
|
|
|
let rule_to_exception_graph (scope : D.scope) = function
|
2023-04-18 12:06:58 +03:00
|
|
|
| Desugared.Dependency.Vertex.Var (var, state) -> (
|
|
|
|
let scope_def =
|
2023-08-10 17:52:39 +03:00
|
|
|
D.ScopeDef.Map.find (D.ScopeDef.Var (var, state)) scope.scope_defs
|
2023-04-18 12:06:58 +03:00
|
|
|
in
|
|
|
|
let var_def = scope_def.D.scope_def_rules in
|
2023-08-10 17:52:39 +03:00
|
|
|
match Mark.remove scope_def.D.scope_def_io.io_input with
|
2023-04-18 12:06:58 +03:00
|
|
|
| OnlyInput when not (RuleName.Map.is_empty var_def) ->
|
|
|
|
(* If the variable is tagged as input, then it shall not be redefined. *)
|
2023-06-13 12:27:45 +03:00
|
|
|
Message.raise_multispanned_error
|
2023-05-17 16:44:57 +03:00
|
|
|
((Some "Incriminated variable:", Mark.get (ScopeVar.get_info var))
|
2023-04-18 12:06:58 +03:00
|
|
|
:: List.map
|
2023-07-12 12:48:46 +03:00
|
|
|
(fun rule ->
|
2023-04-18 12:06:58 +03:00
|
|
|
( Some "Incriminated variable definition:",
|
2023-05-17 16:44:57 +03:00
|
|
|
Mark.get (RuleName.get_info rule) ))
|
2023-07-12 12:48:46 +03:00
|
|
|
(RuleName.Map.keys var_def))
|
2023-04-18 12:06:58 +03:00
|
|
|
"It is impossible to give a definition to a scope variable tagged as \
|
|
|
|
input."
|
2023-08-10 17:52:39 +03:00
|
|
|
| OnlyInput -> D.ScopeDef.Map.empty
|
2023-04-18 12:06:58 +03:00
|
|
|
(* we do not provide any definition for an input-only variable *)
|
|
|
|
| _ ->
|
2023-08-10 17:52:39 +03:00
|
|
|
D.ScopeDef.Map.singleton
|
|
|
|
(D.ScopeDef.Var (var, state))
|
|
|
|
(def_to_exception_graph (D.ScopeDef.Var (var, state)) var_def))
|
2023-04-18 12:06:58 +03:00
|
|
|
| Desugared.Dependency.Vertex.SubScope sub_scope_index ->
|
|
|
|
(* Before calling the sub_scope, we need to include all the re-definitions
|
|
|
|
of subscope parameters*)
|
|
|
|
let sub_scope_vars_redefs_candidates =
|
2023-08-10 17:52:39 +03:00
|
|
|
D.ScopeDef.Map.filter
|
2023-04-18 12:06:58 +03:00
|
|
|
(fun def_key scope_def ->
|
|
|
|
match def_key with
|
2023-08-10 17:52:39 +03:00
|
|
|
| D.ScopeDef.Var _ -> false
|
|
|
|
| D.ScopeDef.SubScopeVar (sub_scope_index', _, _) ->
|
2023-04-18 12:06:58 +03:00
|
|
|
sub_scope_index = sub_scope_index'
|
|
|
|
(* We exclude subscope variables that have 0 re-definitions and are
|
|
|
|
not visible in the input of the subscope *)
|
|
|
|
&& not
|
2023-08-10 17:52:39 +03:00
|
|
|
((match Mark.remove scope_def.D.scope_def_io.io_input with
|
2023-05-26 17:03:26 +03:00
|
|
|
| NoInput -> true
|
2023-04-18 12:06:58 +03:00
|
|
|
| _ -> false)
|
|
|
|
&& RuleName.Map.is_empty scope_def.scope_def_rules))
|
|
|
|
scope.scope_defs
|
|
|
|
in
|
|
|
|
let sub_scope_vars_redefs =
|
2023-08-10 17:52:39 +03:00
|
|
|
D.ScopeDef.Map.mapi
|
2023-04-18 12:06:58 +03:00
|
|
|
(fun def_key scope_def ->
|
2023-08-10 17:52:39 +03:00
|
|
|
let def = scope_def.D.scope_def_rules in
|
2023-04-18 12:06:58 +03:00
|
|
|
let is_cond = scope_def.scope_def_is_condition in
|
|
|
|
match def_key with
|
2023-08-10 17:52:39 +03:00
|
|
|
| D.ScopeDef.Var _ -> assert false (* should not happen *)
|
|
|
|
| D.ScopeDef.SubScopeVar (sscope, sub_scope_var, pos) ->
|
2023-04-18 12:06:58 +03:00
|
|
|
(* This definition redefines a variable of the correct subscope. But
|
|
|
|
we have to check that this redefinition is allowed with respect
|
|
|
|
to the io parameters of that subscope variable. *)
|
2023-08-10 17:52:39 +03:00
|
|
|
(match Mark.remove scope_def.D.scope_def_io.io_input with
|
2023-05-26 17:03:26 +03:00
|
|
|
| NoInput ->
|
2023-06-13 12:27:45 +03:00
|
|
|
Message.raise_multispanned_error
|
2023-04-18 12:06:58 +03:00
|
|
|
(( Some "Incriminated subscope:",
|
2023-05-17 16:44:57 +03:00
|
|
|
Mark.get (SubScopeName.get_info sscope) )
|
2023-04-18 12:06:58 +03:00
|
|
|
:: ( Some "Incriminated variable:",
|
2023-05-17 16:44:57 +03:00
|
|
|
Mark.get (ScopeVar.get_info sub_scope_var) )
|
2023-04-18 12:06:58 +03:00
|
|
|
:: List.map
|
2023-07-12 12:48:46 +03:00
|
|
|
(fun rule ->
|
2023-04-18 12:06:58 +03:00
|
|
|
( Some "Incriminated subscope variable definition:",
|
2023-05-17 16:44:57 +03:00
|
|
|
Mark.get (RuleName.get_info rule) ))
|
2023-07-12 12:48:46 +03:00
|
|
|
(RuleName.Map.keys def))
|
2023-04-18 12:06:58 +03:00
|
|
|
"It is impossible to give a definition to a subscope variable \
|
|
|
|
not tagged as input or context."
|
|
|
|
| OnlyInput when RuleName.Map.is_empty def && not is_cond ->
|
|
|
|
(* If the subscope variable is tagged as input, then it shall be
|
|
|
|
defined. *)
|
2023-06-13 12:27:45 +03:00
|
|
|
Message.raise_multispanned_error
|
2023-04-18 12:06:58 +03:00
|
|
|
[
|
|
|
|
( Some "Incriminated subscope:",
|
2023-05-17 16:44:57 +03:00
|
|
|
Mark.get (SubScopeName.get_info sscope) );
|
2023-04-18 12:06:58 +03:00
|
|
|
Some "Incriminated variable:", pos;
|
|
|
|
]
|
|
|
|
"This subscope variable is a mandatory input but no definition \
|
|
|
|
was provided."
|
|
|
|
| _ -> ());
|
|
|
|
let exc_graph = def_to_exception_graph def_key def in
|
2023-08-10 17:52:39 +03:00
|
|
|
let var_pos = D.ScopeDef.get_position def_key in
|
2023-04-18 12:06:58 +03:00
|
|
|
exc_graph, sub_scope_var, var_pos)
|
|
|
|
sub_scope_vars_redefs_candidates
|
|
|
|
in
|
|
|
|
List.fold_left
|
|
|
|
(fun exc_graphs (new_exc_graph, subscope_var, var_pos) ->
|
2023-08-10 17:52:39 +03:00
|
|
|
D.ScopeDef.Map.add
|
2023-04-18 12:06:58 +03:00
|
|
|
(D.ScopeDef.SubScopeVar (sub_scope_index, subscope_var, var_pos))
|
|
|
|
new_exc_graph exc_graphs)
|
2023-08-10 17:52:39 +03:00
|
|
|
D.ScopeDef.Map.empty
|
|
|
|
(D.ScopeDef.Map.values sub_scope_vars_redefs)
|
|
|
|
| Assertion _ -> D.ScopeDef.Map.empty (* no exceptions for assertions *)
|
2023-04-18 12:06:58 +03:00
|
|
|
|
2023-08-10 17:52:39 +03:00
|
|
|
let scope_to_exception_graphs (scope : D.scope) :
|
|
|
|
Desugared.Dependency.ExceptionsDependencies.t D.ScopeDef.Map.t =
|
2023-04-18 12:06:58 +03:00
|
|
|
let scope_dependencies =
|
|
|
|
Desugared.Dependency.build_scope_dependencies scope
|
|
|
|
in
|
|
|
|
Desugared.Dependency.check_for_cycle scope scope_dependencies;
|
|
|
|
let scope_ordering =
|
|
|
|
Desugared.Dependency.correct_computation_ordering scope_dependencies
|
|
|
|
in
|
|
|
|
List.fold_left
|
|
|
|
(fun exceptions_graphs scope_def_key ->
|
|
|
|
let new_exceptions_graphs = rule_to_exception_graph scope scope_def_key in
|
2023-08-10 17:52:39 +03:00
|
|
|
D.ScopeDef.Map.union
|
2023-04-18 12:06:58 +03:00
|
|
|
(fun _ _ _ -> assert false (* there should not be key conflicts *))
|
|
|
|
new_exceptions_graphs exceptions_graphs)
|
2023-08-10 17:52:39 +03:00
|
|
|
D.ScopeDef.Map.empty scope_ordering
|
2023-04-18 12:06:58 +03:00
|
|
|
|
2023-08-10 17:52:39 +03:00
|
|
|
let build_exceptions_graph (pgrm : D.program) :
|
|
|
|
Desugared.Dependency.ExceptionsDependencies.t D.ScopeDef.Map.t =
|
2023-04-18 12:06:58 +03:00
|
|
|
ScopeName.Map.fold
|
|
|
|
(fun _ scope exceptions_graph ->
|
|
|
|
let new_exceptions_graphs = scope_to_exception_graphs scope in
|
2023-08-10 17:52:39 +03:00
|
|
|
D.ScopeDef.Map.union
|
2023-04-18 12:06:58 +03:00
|
|
|
(fun _ _ _ -> assert false (* key conflicts should not happen*))
|
|
|
|
new_exceptions_graphs exceptions_graph)
|
2023-08-10 17:52:39 +03:00
|
|
|
pgrm.program_scopes D.ScopeDef.Map.empty
|
2023-04-18 12:06:58 +03:00
|
|
|
|
|
|
|
(** Transforms a flat list of rules into a tree, taking into account the
|
|
|
|
priorities declared between rules *)
|
|
|
|
let def_map_to_tree
|
2023-08-10 17:52:39 +03:00
|
|
|
(def : D.rule RuleName.Map.t)
|
2023-04-18 12:06:58 +03:00
|
|
|
(exc_graph : Desugared.Dependency.ExceptionsDependencies.t) : rule_tree list
|
|
|
|
=
|
2021-01-13 21:07:35 +03:00
|
|
|
(* we start by the base cases: they are the vertices which have no
|
|
|
|
successors *)
|
|
|
|
let base_cases =
|
2022-11-07 15:50:28 +03:00
|
|
|
Desugared.Dependency.ExceptionsDependencies.fold_vertex
|
2021-01-13 21:07:35 +03:00
|
|
|
(fun v base_cases ->
|
2022-11-07 15:50:28 +03:00
|
|
|
if
|
|
|
|
Desugared.Dependency.ExceptionsDependencies.out_degree exc_graph v = 0
|
|
|
|
then v :: base_cases
|
2021-01-13 21:07:35 +03:00
|
|
|
else base_cases)
|
|
|
|
exc_graph []
|
2020-12-18 17:59:15 +03:00
|
|
|
in
|
2023-04-07 17:35:09 +03:00
|
|
|
let rec build_tree (base_cases : Desugared.Dependency.ExceptionVertex.t) :
|
|
|
|
rule_tree =
|
2022-01-05 12:42:46 +03:00
|
|
|
let exceptions =
|
2022-11-07 15:50:28 +03:00
|
|
|
Desugared.Dependency.ExceptionsDependencies.pred exc_graph base_cases
|
2022-01-05 12:42:46 +03:00
|
|
|
in
|
|
|
|
let base_case_as_rule_list =
|
2022-11-21 12:12:45 +03:00
|
|
|
List.map
|
2023-07-12 12:48:46 +03:00
|
|
|
(fun r -> RuleName.Map.find r def)
|
|
|
|
(RuleName.Map.keys base_cases.rules)
|
2022-01-05 12:42:46 +03:00
|
|
|
in
|
2021-01-13 21:07:35 +03:00
|
|
|
match exceptions with
|
2022-01-05 12:42:46 +03:00
|
|
|
| [] -> Leaf base_case_as_rule_list
|
|
|
|
| _ -> Node (List.map build_tree exceptions, base_case_as_rule_list)
|
2020-11-25 18:51:19 +03:00
|
|
|
in
|
2021-01-13 21:07:35 +03:00
|
|
|
List.map build_tree base_cases
|
2020-11-25 18:51:19 +03:00
|
|
|
|
2022-08-25 17:08:08 +03:00
|
|
|
(** From the {!type: rule_tree}, builds an {!constructor: Dcalc.EDefault}
|
2020-12-14 19:00:42 +03:00
|
|
|
expression in the scope language. The [~toplevel] parameter is used to know
|
|
|
|
when to place the toplevel binding in the case of functions. *)
|
2022-03-06 16:15:09 +03:00
|
|
|
let rec rule_tree_to_expr
|
|
|
|
~(toplevel : bool)
|
2022-12-02 18:42:29 +03:00
|
|
|
~(is_reentrant_var : bool)
|
2022-03-06 16:15:09 +03:00
|
|
|
(ctx : ctx)
|
|
|
|
(def_pos : Pos.t)
|
2023-08-10 17:52:39 +03:00
|
|
|
(params : D.expr Var.t list option)
|
2022-11-07 15:50:28 +03:00
|
|
|
(tree : rule_tree) : untyped Ast.expr boxed =
|
2022-08-26 16:21:47 +03:00
|
|
|
let emark = Untyped { pos = def_pos } in
|
2022-01-05 12:42:46 +03:00
|
|
|
let exceptions, base_rules =
|
2020-12-18 17:59:15 +03:00
|
|
|
match tree with Leaf r -> [], r | Node (exceptions, r) -> exceptions, r
|
|
|
|
in
|
2023-02-20 19:21:44 +03:00
|
|
|
(* because each rule has its own variables parameters and we want to convert
|
|
|
|
the whole rule tree into a function, we need to perform some alpha-renaming
|
|
|
|
of all the expressions *)
|
2023-08-10 17:52:39 +03:00
|
|
|
let substitute_parameter (e : D.expr boxed) (rule : D.rule) : D.expr boxed =
|
|
|
|
match params, rule.D.rule_parameter with
|
2023-02-28 16:40:05 +03:00
|
|
|
| Some new_params, Some (old_params_with_types, _) ->
|
2023-02-20 19:21:44 +03:00
|
|
|
let old_params, _ = List.split old_params_with_types in
|
2023-05-17 16:44:57 +03:00
|
|
|
let old_params = Array.of_list (List.map Mark.remove old_params) in
|
2023-02-20 19:21:44 +03:00
|
|
|
let new_params = Array.of_list new_params in
|
2023-05-17 16:44:57 +03:00
|
|
|
let binder = Bindlib.bind_mvar old_params (Mark.remove e) in
|
|
|
|
Mark.add (Mark.get e)
|
Swap boxing and annotations in expressions
This was the only reasonable solution I found to the issue raised
[here](https://github.com/CatalaLang/catala/pull/334#discussion_r987175884).
This was a pretty tedious rewrite, but it should now ensure we are doing things
correctly. As a bonus, the "smart" expression constructors are now used
everywhere to build expressions (so another refactoring like this one should be
much easier) and this makes the code overall feel more
straightforward (`Bindlib.box_apply` or `let+` no longer need to be visible!)
---
Basically, we were using values of type `gexpr box = naked_gexpr marked box`
throughout when (re-)building expressions. This was done 99% of the time by
using `Bindlib.box_apply add_mark naked_e` right after building `naked_e`. In
lots of places, we needed to recover the annotation of this expression later on,
typically to build its parent term (to inherit the position, or build the type).
Since it wasn't always possible to wrap these uses within `box_apply` (esp. as
bindlib boxes aren't a monad), here and there we had to call `Bindlib.unbox`,
just to recover the position or type. This had the very unpleasant effect of
forcing the resolution of the whole box (including applying any stored closures)
to reach the top-level annotation which isn't even dependant on specific
variable bindings. Then, generally, throwing away the result.
Therefore, the change proposed here transforms
- `naked_gexpr marked Bindlib.box` into
- `naked_gexpr Bindlib.box marked` (aliased to `boxed_gexpr` or `gexpr boxed` for
convenience)
This means only
1. not fitting the mark into the box right away when building, and
2. accessing the top-level mark directly without unboxing
The functions for building terms from module `Shared_ast.Expr` could be changed
easily. But then they needed to be consistently used throughout, without
manually building terms through `Bindlib.apply_box` -- which covers most of the
changes in this patch.
`Expr.Box.inj` is provided to swap back to a box, before binding for example.
Additionally, this gives a 40% speedup on `make -C examples pass_all_tests`,
which hints at the amount of unnecessary work we were doing --'
2022-10-06 20:13:45 +03:00
|
|
|
@@ Bindlib.box_apply2
|
2023-02-20 19:21:44 +03:00
|
|
|
(fun binder new_param -> Bindlib.msubst binder new_param)
|
Swap boxing and annotations in expressions
This was the only reasonable solution I found to the issue raised
[here](https://github.com/CatalaLang/catala/pull/334#discussion_r987175884).
This was a pretty tedious rewrite, but it should now ensure we are doing things
correctly. As a bonus, the "smart" expression constructors are now used
everywhere to build expressions (so another refactoring like this one should be
much easier) and this makes the code overall feel more
straightforward (`Bindlib.box_apply` or `let+` no longer need to be visible!)
---
Basically, we were using values of type `gexpr box = naked_gexpr marked box`
throughout when (re-)building expressions. This was done 99% of the time by
using `Bindlib.box_apply add_mark naked_e` right after building `naked_e`. In
lots of places, we needed to recover the annotation of this expression later on,
typically to build its parent term (to inherit the position, or build the type).
Since it wasn't always possible to wrap these uses within `box_apply` (esp. as
bindlib boxes aren't a monad), here and there we had to call `Bindlib.unbox`,
just to recover the position or type. This had the very unpleasant effect of
forcing the resolution of the whole box (including applying any stored closures)
to reach the top-level annotation which isn't even dependant on specific
variable bindings. Then, generally, throwing away the result.
Therefore, the change proposed here transforms
- `naked_gexpr marked Bindlib.box` into
- `naked_gexpr Bindlib.box marked` (aliased to `boxed_gexpr` or `gexpr boxed` for
convenience)
This means only
1. not fitting the mark into the box right away when building, and
2. accessing the top-level mark directly without unboxing
The functions for building terms from module `Shared_ast.Expr` could be changed
easily. But then they needed to be consistently used throughout, without
manually building terms through `Bindlib.apply_box` -- which covers most of the
changes in this patch.
`Expr.Box.inj` is provided to swap back to a box, before binding for example.
Additionally, this gives a 40% speedup on `make -C examples pass_all_tests`,
which hints at the amount of unnecessary work we were doing --'
2022-10-06 20:13:45 +03:00
|
|
|
binder
|
2023-02-20 19:21:44 +03:00
|
|
|
(new_params |> Array.map Bindlib.box_var |> Bindlib.box_array)
|
2020-11-25 18:51:19 +03:00
|
|
|
| None, None -> e
|
|
|
|
| _ -> assert false
|
|
|
|
(* should not happen *)
|
|
|
|
in
|
2022-03-06 16:15:09 +03:00
|
|
|
let ctx =
|
2023-02-27 11:50:42 +03:00
|
|
|
match params with
|
2022-03-06 16:15:09 +03:00
|
|
|
| None -> ctx
|
2023-02-20 19:21:44 +03:00
|
|
|
| Some new_params ->
|
|
|
|
ListLabels.fold_left new_params ~init:ctx ~f:(fun ctx new_param ->
|
|
|
|
match Var.Map.find_opt new_param ctx.var_mapping with
|
|
|
|
| None ->
|
|
|
|
let new_param_scope = Var.make (Bindlib.name_of new_param) in
|
|
|
|
{
|
|
|
|
ctx with
|
|
|
|
var_mapping =
|
|
|
|
Var.Map.add new_param new_param_scope ctx.var_mapping;
|
|
|
|
}
|
|
|
|
| Some _ ->
|
|
|
|
(* We only create a mapping if none exists because
|
|
|
|
[rule_tree_to_expr] is called recursively on the exceptions of
|
|
|
|
the tree and we don't want to create a new Scopelang variable for
|
|
|
|
the parameter at each tree level. *)
|
|
|
|
ctx)
|
2022-03-06 16:15:09 +03:00
|
|
|
in
|
2022-01-05 12:42:46 +03:00
|
|
|
let base_just_list =
|
2023-08-10 17:52:39 +03:00
|
|
|
List.map (fun rule -> substitute_parameter rule.D.rule_just rule) base_rules
|
2022-01-05 12:42:46 +03:00
|
|
|
in
|
|
|
|
let base_cons_list =
|
2023-08-10 17:52:39 +03:00
|
|
|
List.map (fun rule -> substitute_parameter rule.D.rule_cons rule) base_rules
|
2022-01-05 12:42:46 +03:00
|
|
|
in
|
2023-08-10 17:52:39 +03:00
|
|
|
let translate_and_unbox_list (list : D.expr boxed list) :
|
2022-11-07 15:50:28 +03:00
|
|
|
untyped Ast.expr boxed list =
|
2022-03-06 16:15:09 +03:00
|
|
|
List.map
|
|
|
|
(fun e ->
|
2022-07-13 16:25:11 +03:00
|
|
|
(* There are two levels of boxing here, the outermost is introduced by
|
2022-03-06 16:15:09 +03:00
|
|
|
the [translate_expr] function for which all of the bindings should
|
|
|
|
have been closed by now, so we can safely unbox. *)
|
Swap boxing and annotations in expressions
This was the only reasonable solution I found to the issue raised
[here](https://github.com/CatalaLang/catala/pull/334#discussion_r987175884).
This was a pretty tedious rewrite, but it should now ensure we are doing things
correctly. As a bonus, the "smart" expression constructors are now used
everywhere to build expressions (so another refactoring like this one should be
much easier) and this makes the code overall feel more
straightforward (`Bindlib.box_apply` or `let+` no longer need to be visible!)
---
Basically, we were using values of type `gexpr box = naked_gexpr marked box`
throughout when (re-)building expressions. This was done 99% of the time by
using `Bindlib.box_apply add_mark naked_e` right after building `naked_e`. In
lots of places, we needed to recover the annotation of this expression later on,
typically to build its parent term (to inherit the position, or build the type).
Since it wasn't always possible to wrap these uses within `box_apply` (esp. as
bindlib boxes aren't a monad), here and there we had to call `Bindlib.unbox`,
just to recover the position or type. This had the very unpleasant effect of
forcing the resolution of the whole box (including applying any stored closures)
to reach the top-level annotation which isn't even dependant on specific
variable bindings. Then, generally, throwing away the result.
Therefore, the change proposed here transforms
- `naked_gexpr marked Bindlib.box` into
- `naked_gexpr Bindlib.box marked` (aliased to `boxed_gexpr` or `gexpr boxed` for
convenience)
This means only
1. not fitting the mark into the box right away when building, and
2. accessing the top-level mark directly without unboxing
The functions for building terms from module `Shared_ast.Expr` could be changed
easily. But then they needed to be consistently used throughout, without
manually building terms through `Bindlib.apply_box` -- which covers most of the
changes in this patch.
`Expr.Box.inj` is provided to swap back to a box, before binding for example.
Additionally, this gives a 40% speedup on `make -C examples pass_all_tests`,
which hints at the amount of unnecessary work we were doing --'
2022-10-06 20:13:45 +03:00
|
|
|
translate_expr ctx (Expr.unbox e))
|
2022-03-06 16:15:09 +03:00
|
|
|
list
|
|
|
|
in
|
2022-01-05 12:42:46 +03:00
|
|
|
let default_containing_base_cases =
|
Swap boxing and annotations in expressions
This was the only reasonable solution I found to the issue raised
[here](https://github.com/CatalaLang/catala/pull/334#discussion_r987175884).
This was a pretty tedious rewrite, but it should now ensure we are doing things
correctly. As a bonus, the "smart" expression constructors are now used
everywhere to build expressions (so another refactoring like this one should be
much easier) and this makes the code overall feel more
straightforward (`Bindlib.box_apply` or `let+` no longer need to be visible!)
---
Basically, we were using values of type `gexpr box = naked_gexpr marked box`
throughout when (re-)building expressions. This was done 99% of the time by
using `Bindlib.box_apply add_mark naked_e` right after building `naked_e`. In
lots of places, we needed to recover the annotation of this expression later on,
typically to build its parent term (to inherit the position, or build the type).
Since it wasn't always possible to wrap these uses within `box_apply` (esp. as
bindlib boxes aren't a monad), here and there we had to call `Bindlib.unbox`,
just to recover the position or type. This had the very unpleasant effect of
forcing the resolution of the whole box (including applying any stored closures)
to reach the top-level annotation which isn't even dependant on specific
variable bindings. Then, generally, throwing away the result.
Therefore, the change proposed here transforms
- `naked_gexpr marked Bindlib.box` into
- `naked_gexpr Bindlib.box marked` (aliased to `boxed_gexpr` or `gexpr boxed` for
convenience)
This means only
1. not fitting the mark into the box right away when building, and
2. accessing the top-level mark directly without unboxing
The functions for building terms from module `Shared_ast.Expr` could be changed
easily. But then they needed to be consistently used throughout, without
manually building terms through `Bindlib.apply_box` -- which covers most of the
changes in this patch.
`Expr.Box.inj` is provided to swap back to a box, before binding for example.
Additionally, this gives a 40% speedup on `make -C examples pass_all_tests`,
which hints at the amount of unnecessary work we were doing --'
2022-10-06 20:13:45 +03:00
|
|
|
Expr.make_default
|
|
|
|
(List.map2
|
|
|
|
(fun base_just base_cons ->
|
|
|
|
Expr.make_default []
|
|
|
|
(* Here we insert the logging command that records when a decision
|
|
|
|
is taken for the value of a variable. *)
|
|
|
|
(tag_with_log_entry base_just PosRecordIfTrueBool [])
|
|
|
|
base_cons emark)
|
|
|
|
(translate_and_unbox_list base_just_list)
|
|
|
|
(translate_and_unbox_list base_cons_list))
|
|
|
|
(Expr.elit (LBool false) emark)
|
2023-03-30 19:53:07 +03:00
|
|
|
(Expr.eemptyerror emark) emark
|
2022-01-05 12:42:46 +03:00
|
|
|
in
|
2020-12-18 17:59:15 +03:00
|
|
|
let exceptions =
|
2022-12-02 14:07:26 +03:00
|
|
|
List.map
|
2023-02-27 11:50:42 +03:00
|
|
|
(rule_tree_to_expr ~toplevel:false ~is_reentrant_var ctx def_pos params)
|
2022-12-02 14:07:26 +03:00
|
|
|
exceptions
|
2020-12-18 17:59:15 +03:00
|
|
|
in
|
2020-11-27 18:27:10 +03:00
|
|
|
let default =
|
Swap boxing and annotations in expressions
This was the only reasonable solution I found to the issue raised
[here](https://github.com/CatalaLang/catala/pull/334#discussion_r987175884).
This was a pretty tedious rewrite, but it should now ensure we are doing things
correctly. As a bonus, the "smart" expression constructors are now used
everywhere to build expressions (so another refactoring like this one should be
much easier) and this makes the code overall feel more
straightforward (`Bindlib.box_apply` or `let+` no longer need to be visible!)
---
Basically, we were using values of type `gexpr box = naked_gexpr marked box`
throughout when (re-)building expressions. This was done 99% of the time by
using `Bindlib.box_apply add_mark naked_e` right after building `naked_e`. In
lots of places, we needed to recover the annotation of this expression later on,
typically to build its parent term (to inherit the position, or build the type).
Since it wasn't always possible to wrap these uses within `box_apply` (esp. as
bindlib boxes aren't a monad), here and there we had to call `Bindlib.unbox`,
just to recover the position or type. This had the very unpleasant effect of
forcing the resolution of the whole box (including applying any stored closures)
to reach the top-level annotation which isn't even dependant on specific
variable bindings. Then, generally, throwing away the result.
Therefore, the change proposed here transforms
- `naked_gexpr marked Bindlib.box` into
- `naked_gexpr Bindlib.box marked` (aliased to `boxed_gexpr` or `gexpr boxed` for
convenience)
This means only
1. not fitting the mark into the box right away when building, and
2. accessing the top-level mark directly without unboxing
The functions for building terms from module `Shared_ast.Expr` could be changed
easily. But then they needed to be consistently used throughout, without
manually building terms through `Bindlib.apply_box` -- which covers most of the
changes in this patch.
`Expr.Box.inj` is provided to swap back to a box, before binding for example.
Additionally, this gives a 40% speedup on `make -C examples pass_all_tests`,
which hints at the amount of unnecessary work we were doing --'
2022-10-06 20:13:45 +03:00
|
|
|
Expr.make_default exceptions
|
|
|
|
(Expr.elit (LBool true) emark)
|
|
|
|
default_containing_base_cases emark
|
2020-11-27 18:27:10 +03:00
|
|
|
in
|
2023-08-10 17:52:39 +03:00
|
|
|
match params, (List.hd base_rules).D.rule_parameter with
|
2020-11-25 18:51:19 +03:00
|
|
|
| None, None -> default
|
2023-02-28 16:40:05 +03:00
|
|
|
| Some new_params, Some (ls, _) ->
|
2023-02-20 19:21:44 +03:00
|
|
|
let _, tys = List.split ls in
|
2020-11-27 18:27:10 +03:00
|
|
|
if toplevel then
|
2020-12-31 02:28:26 +03:00
|
|
|
(* When we're creating a function from multiple defaults, we must check
|
2022-12-02 14:07:26 +03:00
|
|
|
that the result returned by the function is not empty, unless we're
|
2022-12-02 18:42:29 +03:00
|
|
|
dealing with a context variable which is reentrant (either in the
|
|
|
|
caller or callee). In this case the ErrorOnEmpty will be added later in
|
|
|
|
the scopelang->dcalc translation. *)
|
2022-12-02 14:07:26 +03:00
|
|
|
let default =
|
2022-12-02 18:42:29 +03:00
|
|
|
if is_reentrant_var then default else Expr.eerroronempty default emark
|
2022-12-02 14:07:26 +03:00
|
|
|
in
|
2023-02-20 19:21:44 +03:00
|
|
|
|
2022-08-25 13:09:51 +03:00
|
|
|
Expr.make_abs
|
2023-02-20 19:21:44 +03:00
|
|
|
(new_params
|
|
|
|
|> List.map (fun x -> Var.Map.find x ctx.var_mapping)
|
|
|
|
|> Array.of_list)
|
|
|
|
default tys def_pos
|
2020-11-27 18:27:10 +03:00
|
|
|
else default
|
2020-12-14 19:00:42 +03:00
|
|
|
| _ -> (* should not happen *) assert false
|
2020-11-25 18:51:19 +03:00
|
|
|
|
2020-12-14 19:00:42 +03:00
|
|
|
(** {1 AST translation} *)
|
2020-11-25 18:51:19 +03:00
|
|
|
|
2020-12-14 19:00:42 +03:00
|
|
|
(** Translates a definition inside a scope, the resulting expression should be
|
2022-08-25 17:08:08 +03:00
|
|
|
an {!constructor: Dcalc.EDefault} *)
|
2022-03-06 16:15:09 +03:00
|
|
|
let translate_def
|
2023-04-18 12:06:58 +03:00
|
|
|
~(is_cond : bool)
|
|
|
|
~(is_subscope_var : bool)
|
2022-03-06 16:15:09 +03:00
|
|
|
(ctx : ctx)
|
2023-08-10 17:52:39 +03:00
|
|
|
(def_info : D.ScopeDef.t)
|
|
|
|
(def : D.rule RuleName.Map.t)
|
2023-05-17 16:44:57 +03:00
|
|
|
(params : (Uid.MarkedString.info * typ) list Mark.pos option)
|
2022-08-25 18:29:00 +03:00
|
|
|
(typ : typ)
|
2023-08-10 17:52:39 +03:00
|
|
|
(io : D.io)
|
2023-04-18 12:06:58 +03:00
|
|
|
(exc_graph : Desugared.Dependency.ExceptionsDependencies.t) :
|
|
|
|
untyped Ast.expr boxed =
|
2020-11-25 16:35:26 +03:00
|
|
|
(* Here, we have to transform this list of rules into a default tree. *)
|
2023-04-18 12:06:58 +03:00
|
|
|
let top_list = def_map_to_tree def exc_graph in
|
2023-02-28 16:40:05 +03:00
|
|
|
let is_input =
|
2023-08-10 17:52:39 +03:00
|
|
|
match Mark.remove io.D.io_input with OnlyInput -> true | _ -> false
|
2022-12-02 18:42:29 +03:00
|
|
|
in
|
2023-02-28 16:40:05 +03:00
|
|
|
let is_reentrant =
|
2023-08-10 17:52:39 +03:00
|
|
|
match Mark.remove io.D.io_input with Reentrant -> true | _ -> false
|
2020-12-31 02:28:26 +03:00
|
|
|
in
|
2023-08-10 17:52:39 +03:00
|
|
|
let top_value : D.rule option =
|
2023-02-28 16:40:05 +03:00
|
|
|
if is_cond && ((not is_subscope_var) || (is_subscope_var && is_input)) then
|
|
|
|
(* We add the bottom [false] value for conditions, only for the scope
|
|
|
|
where the condition is declared. Except when the variable is an input,
|
|
|
|
where we want the [false] to be added at each caller parent scope. *)
|
2023-08-10 17:52:39 +03:00
|
|
|
Some (D.always_false_rule (D.ScopeDef.get_position def_info) params)
|
2023-02-28 16:40:05 +03:00
|
|
|
else None
|
|
|
|
in
|
|
|
|
if
|
|
|
|
RuleName.Map.cardinal def = 0
|
|
|
|
&& is_subscope_var
|
|
|
|
(* Here we have a special case for the empty definitions. Indeed, we could
|
|
|
|
use the code for the regular case below that would create a convoluted
|
|
|
|
default always returning empty error, and this would be correct. But it
|
|
|
|
gets more complicated with functions. Indeed, if we create an empty
|
|
|
|
definition for a subscope argument whose type is a function, we get
|
|
|
|
something like [fun () -> (fun real_param -> < ... >)] that is passed as
|
|
|
|
an argument to the subscope. The sub-scope de-thunks but the de-thunking
|
|
|
|
does not return empty error, signalling there is not reentrant variable,
|
|
|
|
because functions are values! So the subscope does not see that there is
|
|
|
|
not reentrant variable and does not pick its internal definition instead.
|
|
|
|
See [test/test_scope/subscope_function_arg_not_defined.catala_en] for a
|
|
|
|
test case exercising that subtlety.
|
|
|
|
|
|
|
|
To avoid this complication we special case here and put an empty error
|
|
|
|
for all subscope variables that are not defined. It covers the subtlety
|
|
|
|
with functions described above but also conditions with the false default
|
|
|
|
value. *)
|
|
|
|
&& not (is_cond && is_input)
|
|
|
|
(* However, this special case suffers from an exception: when a condition is
|
|
|
|
defined as an OnlyInput to a subscope, since the [false] default value
|
|
|
|
will not be provided by the calee scope, it has to be placed in the
|
|
|
|
caller. *)
|
|
|
|
then
|
2023-08-10 17:52:39 +03:00
|
|
|
let m = Untyped { pos = D.ScopeDef.get_position def_info } in
|
2023-03-30 19:53:07 +03:00
|
|
|
let empty_error = Expr.eemptyerror m in
|
2023-02-28 16:40:05 +03:00
|
|
|
match params with
|
|
|
|
| Some (ps, _) ->
|
|
|
|
let labels, tys = List.split ps in
|
|
|
|
Expr.make_abs
|
|
|
|
(Array.of_list
|
2023-05-17 16:44:57 +03:00
|
|
|
(List.map (fun lbl -> Var.make (Mark.remove lbl)) labels))
|
2023-02-28 16:40:05 +03:00
|
|
|
empty_error tys (Expr.mark_pos m)
|
|
|
|
| _ -> empty_error
|
|
|
|
else
|
|
|
|
rule_tree_to_expr ~toplevel:true ~is_reentrant_var:is_reentrant ctx
|
2023-08-10 17:52:39 +03:00
|
|
|
(D.ScopeDef.get_position def_info)
|
2023-02-28 16:40:05 +03:00
|
|
|
(Option.map
|
|
|
|
(fun (ps, _) ->
|
2023-05-17 16:44:57 +03:00
|
|
|
(List.map (fun (lbl, _) -> Var.make (Mark.remove lbl))) ps)
|
2023-02-28 16:40:05 +03:00
|
|
|
params)
|
|
|
|
(match top_list, top_value with
|
|
|
|
| [], None ->
|
|
|
|
(* In this case, there are no rules to define the expression and no
|
|
|
|
default value so we put an empty rule. *)
|
2023-08-10 17:52:39 +03:00
|
|
|
Leaf [D.empty_rule (Mark.get typ) params]
|
2023-02-28 16:40:05 +03:00
|
|
|
| [], Some top_value ->
|
|
|
|
(* In this case, there are no rules to define the expression but a
|
|
|
|
default value so we put it. *)
|
|
|
|
Leaf [top_value]
|
|
|
|
| _, Some top_value ->
|
|
|
|
(* When there are rules + a default value, we put the rules as
|
|
|
|
exceptions to the default value *)
|
|
|
|
Node (top_list, [top_value])
|
|
|
|
| [top_tree], None -> top_tree
|
2023-08-10 17:52:39 +03:00
|
|
|
| _, None -> Node (top_list, [D.empty_rule (Mark.get typ) params]))
|
2020-11-25 16:35:26 +03:00
|
|
|
|
2023-04-18 12:06:58 +03:00
|
|
|
let translate_rule
|
|
|
|
ctx
|
2023-08-10 17:52:39 +03:00
|
|
|
(scope : D.scope)
|
2023-04-18 12:06:58 +03:00
|
|
|
(exc_graphs :
|
2023-08-10 17:52:39 +03:00
|
|
|
Desugared.Dependency.ExceptionsDependencies.t D.ScopeDef.Map.t) = function
|
2022-11-28 17:37:32 +03:00
|
|
|
| Desugared.Dependency.Vertex.Var (var, state) -> (
|
|
|
|
let scope_def =
|
2023-08-10 17:52:39 +03:00
|
|
|
D.ScopeDef.Map.find (D.ScopeDef.Var (var, state)) scope.scope_defs
|
2022-11-28 17:37:32 +03:00
|
|
|
in
|
2023-02-27 11:50:42 +03:00
|
|
|
let var_def = scope_def.D.scope_def_rules in
|
|
|
|
let var_params = scope_def.D.scope_def_parameters in
|
|
|
|
let var_typ = scope_def.D.scope_def_typ in
|
|
|
|
let is_cond = scope_def.D.scope_def_is_condition in
|
2023-08-10 17:52:39 +03:00
|
|
|
match Mark.remove scope_def.D.scope_def_io.io_input with
|
2022-11-28 17:37:32 +03:00
|
|
|
| OnlyInput when not (RuleName.Map.is_empty var_def) ->
|
2023-04-18 12:06:58 +03:00
|
|
|
assert false (* error already raised *)
|
2022-11-28 17:37:32 +03:00
|
|
|
| OnlyInput -> []
|
|
|
|
(* we do not provide any definition for an input-only variable *)
|
|
|
|
| _ ->
|
2023-08-10 17:52:39 +03:00
|
|
|
let scope_def_key = D.ScopeDef.Var (var, state) in
|
2022-11-28 17:37:32 +03:00
|
|
|
let expr_def =
|
2023-04-18 12:06:58 +03:00
|
|
|
translate_def ctx scope_def_key var_def var_params var_typ
|
2023-08-10 17:52:39 +03:00
|
|
|
scope_def.D.scope_def_io
|
|
|
|
(D.ScopeDef.Map.find scope_def_key exc_graphs)
|
2023-02-27 11:50:42 +03:00
|
|
|
~is_cond ~is_subscope_var:false
|
2022-11-28 17:37:32 +03:00
|
|
|
in
|
|
|
|
let scope_var =
|
|
|
|
match ScopeVar.Map.find var ctx.scope_var_mapping, state with
|
|
|
|
| WholeVar v, None -> v
|
|
|
|
| States states, Some state -> List.assoc state states
|
|
|
|
| _ -> failwith "should not happen"
|
|
|
|
in
|
|
|
|
[
|
|
|
|
Ast.Definition
|
|
|
|
( ( ScopelangScopeVar
|
2023-08-10 17:52:39 +03:00
|
|
|
{ name = scope_var, Mark.get (ScopeVar.get_info scope_var) },
|
2023-05-17 16:44:57 +03:00
|
|
|
Mark.get (ScopeVar.get_info scope_var) ),
|
2022-11-28 17:37:32 +03:00
|
|
|
var_typ,
|
2023-08-10 17:52:39 +03:00
|
|
|
scope_def.D.scope_def_io,
|
2022-11-28 17:37:32 +03:00
|
|
|
Expr.unbox expr_def );
|
|
|
|
])
|
|
|
|
| Desugared.Dependency.Vertex.SubScope sub_scope_index ->
|
|
|
|
(* Before calling the sub_scope, we need to include all the re-definitions
|
|
|
|
of subscope parameters*)
|
|
|
|
let sub_scope =
|
|
|
|
SubScopeName.Map.find sub_scope_index scope.scope_sub_scopes
|
|
|
|
in
|
|
|
|
let sub_scope_vars_redefs_candidates =
|
2023-08-10 17:52:39 +03:00
|
|
|
D.ScopeDef.Map.filter
|
2022-11-28 17:37:32 +03:00
|
|
|
(fun def_key scope_def ->
|
|
|
|
match def_key with
|
2023-08-10 17:52:39 +03:00
|
|
|
| D.ScopeDef.Var _ -> false
|
|
|
|
| D.ScopeDef.SubScopeVar (sub_scope_index', _, _) ->
|
2022-11-28 17:37:32 +03:00
|
|
|
sub_scope_index = sub_scope_index'
|
|
|
|
(* We exclude subscope variables that have 0 re-definitions and are
|
|
|
|
not visible in the input of the subscope *)
|
|
|
|
&& not
|
2023-08-10 17:52:39 +03:00
|
|
|
((match Mark.remove scope_def.D.scope_def_io.io_input with
|
2023-05-26 17:03:26 +03:00
|
|
|
| NoInput -> true
|
2022-11-28 17:37:32 +03:00
|
|
|
| _ -> false)
|
|
|
|
&& RuleName.Map.is_empty scope_def.scope_def_rules))
|
|
|
|
scope.scope_defs
|
|
|
|
in
|
|
|
|
let sub_scope_vars_redefs =
|
2023-08-10 17:52:39 +03:00
|
|
|
D.ScopeDef.Map.mapi
|
2022-11-28 17:37:32 +03:00
|
|
|
(fun def_key scope_def ->
|
2023-08-10 17:52:39 +03:00
|
|
|
let def = scope_def.D.scope_def_rules in
|
2022-11-28 17:37:32 +03:00
|
|
|
let def_typ = scope_def.scope_def_typ in
|
|
|
|
let is_cond = scope_def.scope_def_is_condition in
|
|
|
|
match def_key with
|
2023-08-10 17:52:39 +03:00
|
|
|
| D.ScopeDef.Var _ -> assert false (* should not happen *)
|
|
|
|
| D.ScopeDef.SubScopeVar (_, sub_scope_var, var_pos) ->
|
2022-11-28 17:37:32 +03:00
|
|
|
(* This definition redefines a variable of the correct subscope. But
|
|
|
|
we have to check that this redefinition is allowed with respect
|
|
|
|
to the io parameters of that subscope variable. *)
|
2023-08-10 17:52:39 +03:00
|
|
|
(match Mark.remove scope_def.D.scope_def_io.io_input with
|
2023-05-26 17:03:26 +03:00
|
|
|
| NoInput -> assert false (* error already raised *)
|
2022-11-28 17:37:32 +03:00
|
|
|
| OnlyInput when RuleName.Map.is_empty def && not is_cond ->
|
2023-04-18 12:06:58 +03:00
|
|
|
assert false (* error already raised *)
|
2022-11-28 17:37:32 +03:00
|
|
|
| _ -> ());
|
|
|
|
(* Now that all is good, we can proceed with translating this
|
|
|
|
redefinition to a proper Scopelang term. *)
|
|
|
|
let expr_def =
|
2023-02-27 11:50:42 +03:00
|
|
|
translate_def ctx def_key def scope_def.D.scope_def_parameters
|
2023-08-10 17:52:39 +03:00
|
|
|
def_typ scope_def.D.scope_def_io
|
|
|
|
(D.ScopeDef.Map.find def_key exc_graphs)
|
2023-04-18 12:06:58 +03:00
|
|
|
~is_cond ~is_subscope_var:true
|
2022-11-28 17:37:32 +03:00
|
|
|
in
|
2023-11-02 17:43:44 +03:00
|
|
|
let def_typ =
|
|
|
|
match scope_def.D.scope_def_io.D.io_input with
|
|
|
|
| Runtime.NoInput, _ -> assert false
|
|
|
|
| Runtime.OnlyInput, _ -> def_typ
|
|
|
|
| Runtime.Reentrant, pos ->
|
|
|
|
match def_typ with
|
|
|
|
| TArrow (args, ret), tpos ->
|
|
|
|
TArrow (args, (TDefault ret, pos)), tpos
|
|
|
|
| _ ->
|
|
|
|
TDefault def_typ, pos
|
|
|
|
in
|
2023-08-30 18:49:29 +03:00
|
|
|
let subscop_real_name =
|
2022-11-28 17:37:32 +03:00
|
|
|
SubScopeName.Map.find sub_scope_index scope.scope_sub_scopes
|
|
|
|
in
|
|
|
|
Ast.Definition
|
2023-08-10 17:52:39 +03:00
|
|
|
( ( SubScopeVar
|
|
|
|
{
|
|
|
|
scope = subscop_real_name;
|
|
|
|
alias = sub_scope_index, var_pos;
|
|
|
|
var =
|
2022-11-28 17:37:32 +03:00
|
|
|
(match
|
|
|
|
ScopeVar.Map.find sub_scope_var ctx.scope_var_mapping
|
|
|
|
with
|
|
|
|
| WholeVar v -> v, var_pos
|
|
|
|
| States states ->
|
|
|
|
(* When defining a sub-scope variable, we always
|
|
|
|
define its first state in the sub-scope. *)
|
2023-08-10 17:52:39 +03:00
|
|
|
snd (List.hd states), var_pos);
|
|
|
|
},
|
2022-11-28 17:37:32 +03:00
|
|
|
var_pos ),
|
|
|
|
def_typ,
|
2023-08-10 17:52:39 +03:00
|
|
|
scope_def.D.scope_def_io,
|
2022-11-28 17:37:32 +03:00
|
|
|
Expr.unbox expr_def ))
|
|
|
|
sub_scope_vars_redefs_candidates
|
|
|
|
in
|
2023-08-10 17:52:39 +03:00
|
|
|
let sub_scope_vars_redefs = D.ScopeDef.Map.values sub_scope_vars_redefs in
|
2022-11-28 17:37:32 +03:00
|
|
|
sub_scope_vars_redefs
|
|
|
|
@ [
|
|
|
|
Ast.Call
|
|
|
|
( sub_scope,
|
|
|
|
sub_scope_index,
|
2023-05-17 16:44:57 +03:00
|
|
|
Untyped { pos = Mark.get (SubScopeName.get_info sub_scope_index) }
|
2022-11-28 17:37:32 +03:00
|
|
|
);
|
|
|
|
]
|
2023-04-28 15:15:43 +03:00
|
|
|
| Assertion a_name ->
|
|
|
|
let assertion_expr =
|
2023-08-10 17:52:39 +03:00
|
|
|
D.AssertionName.Map.find a_name scope.scope_assertions
|
2023-04-28 15:15:43 +03:00
|
|
|
in
|
|
|
|
(* we unbox here because assertions do not have free variables (at this
|
|
|
|
point Bindlib variables are only for fuhnction parameters)*)
|
|
|
|
let assertion_expr = translate_expr ctx (Expr.unbox assertion_expr) in
|
|
|
|
[Ast.Assertion (Expr.unbox assertion_expr)]
|
2022-11-28 17:37:32 +03:00
|
|
|
|
2023-08-10 17:52:39 +03:00
|
|
|
let translate_scope_interface ctx scope =
|
2020-11-27 13:37:21 +03:00
|
|
|
let scope_sig =
|
2022-11-21 12:12:45 +03:00
|
|
|
ScopeVar.Map.fold
|
2023-08-10 17:52:39 +03:00
|
|
|
(fun var (states : D.var_or_states) acc ->
|
2022-03-06 16:15:09 +03:00
|
|
|
match states with
|
|
|
|
| WholeVar ->
|
|
|
|
let scope_def =
|
2023-08-10 17:52:39 +03:00
|
|
|
D.ScopeDef.Map.find (D.ScopeDef.Var (var, None)) scope.D.scope_defs
|
2022-03-06 16:15:09 +03:00
|
|
|
in
|
|
|
|
let typ = scope_def.scope_def_typ in
|
2022-11-21 12:12:45 +03:00
|
|
|
ScopeVar.Map.add
|
|
|
|
(match ScopeVar.Map.find var ctx.scope_var_mapping with
|
2022-03-06 16:15:09 +03:00
|
|
|
| WholeVar v -> v
|
|
|
|
| States _ -> failwith "should not happen")
|
|
|
|
(typ, scope_def.scope_def_io)
|
|
|
|
acc
|
|
|
|
| States states ->
|
|
|
|
(* What happens in the case of variables with multiple states is
|
2022-11-07 15:50:28 +03:00
|
|
|
interesting. We need to create as many Var entries in the scope
|
|
|
|
signature as there are states. *)
|
2022-03-06 16:15:09 +03:00
|
|
|
List.fold_left
|
2022-08-25 13:09:51 +03:00
|
|
|
(fun acc (state : StateName.t) ->
|
2022-03-06 16:15:09 +03:00
|
|
|
let scope_def =
|
2023-08-10 17:52:39 +03:00
|
|
|
D.ScopeDef.Map.find
|
|
|
|
(D.ScopeDef.Var (var, Some state))
|
|
|
|
scope.D.scope_defs
|
2022-03-06 16:15:09 +03:00
|
|
|
in
|
2022-11-21 12:12:45 +03:00
|
|
|
ScopeVar.Map.add
|
|
|
|
(match ScopeVar.Map.find var ctx.scope_var_mapping with
|
2022-03-06 16:15:09 +03:00
|
|
|
| WholeVar _ -> failwith "should not happen"
|
|
|
|
| States states' -> List.assoc state states')
|
|
|
|
(scope_def.scope_def_typ, scope_def.scope_def_io)
|
|
|
|
acc)
|
|
|
|
acc states)
|
2022-11-21 12:12:45 +03:00
|
|
|
scope.scope_vars ScopeVar.Map.empty
|
2020-11-27 13:37:21 +03:00
|
|
|
in
|
2023-05-17 16:44:57 +03:00
|
|
|
let pos = Mark.get (ScopeName.get_info scope.scope_uid) in
|
2023-08-10 17:52:39 +03:00
|
|
|
Mark.add pos
|
2020-11-27 13:37:21 +03:00
|
|
|
{
|
2022-11-07 15:50:28 +03:00
|
|
|
Ast.scope_decl_name = scope.scope_uid;
|
2023-08-10 17:52:39 +03:00
|
|
|
Ast.scope_decl_rules = [];
|
2022-11-07 15:50:28 +03:00
|
|
|
Ast.scope_sig;
|
2023-01-20 20:18:53 +03:00
|
|
|
Ast.scope_options = scope.scope_options;
|
2020-11-27 13:37:21 +03:00
|
|
|
}
|
2020-11-25 16:35:26 +03:00
|
|
|
|
2023-08-10 17:52:39 +03:00
|
|
|
let translate_scope
|
|
|
|
(ctx : ctx)
|
|
|
|
(exc_graphs :
|
|
|
|
Desugared.Dependency.ExceptionsDependencies.t D.ScopeDef.Map.t)
|
|
|
|
(scope : D.scope) : untyped Ast.scope_decl Mark.pos =
|
|
|
|
let scope_dependencies =
|
|
|
|
Desugared.Dependency.build_scope_dependencies scope
|
|
|
|
in
|
|
|
|
Desugared.Dependency.check_for_cycle scope scope_dependencies;
|
|
|
|
let scope_ordering =
|
|
|
|
Desugared.Dependency.correct_computation_ordering scope_dependencies
|
|
|
|
in
|
|
|
|
let scope_decl_rules =
|
|
|
|
List.fold_left
|
|
|
|
(fun scope_decl_rules scope_def_key ->
|
|
|
|
let new_rules = translate_rule ctx scope exc_graphs scope_def_key in
|
|
|
|
scope_decl_rules @ new_rules)
|
|
|
|
[] scope_ordering
|
|
|
|
in
|
|
|
|
Mark.map
|
|
|
|
(fun s -> { s with Ast.scope_decl_rules })
|
|
|
|
(translate_scope_interface ctx scope)
|
|
|
|
|
2020-12-14 19:00:42 +03:00
|
|
|
(** {1 API} *)
|
|
|
|
|
2023-04-18 12:06:58 +03:00
|
|
|
let translate_program
|
2023-08-10 17:52:39 +03:00
|
|
|
(desugared : D.program)
|
2023-04-18 12:06:58 +03:00
|
|
|
(exc_graphs :
|
2023-08-10 17:52:39 +03:00
|
|
|
Desugared.Dependency.ExceptionsDependencies.t D.ScopeDef.Map.t) :
|
2023-04-18 12:06:58 +03:00
|
|
|
untyped Ast.program =
|
2022-11-07 15:50:28 +03:00
|
|
|
(* First we give mappings to all the locations between Desugared and This
|
|
|
|
involves creating a new Scopelang scope variable for every state of a
|
|
|
|
Desugared variable. *)
|
2023-08-10 17:52:39 +03:00
|
|
|
let rec make_ctx desugared =
|
|
|
|
let modules = ModuleName.Map.map make_ctx desugared.D.program_modules in
|
2022-11-17 19:13:35 +03:00
|
|
|
(* Todo: since we rename all scope vars at this point, it would be better to
|
|
|
|
have different types for Desugared.ScopeVar.t and Scopelang.ScopeVar.t *)
|
2022-11-21 12:12:45 +03:00
|
|
|
ScopeName.Map.fold
|
2022-03-06 16:15:09 +03:00
|
|
|
(fun _scope scope_decl ctx ->
|
2023-08-10 17:52:39 +03:00
|
|
|
ScopeVar.Map.fold
|
|
|
|
(fun scope_var (states : D.var_or_states) ctx ->
|
|
|
|
let var_name, var_pos = ScopeVar.get_info scope_var in
|
|
|
|
let new_var =
|
|
|
|
match states with
|
|
|
|
| D.WholeVar -> WholeVar (ScopeVar.fresh (var_name, var_pos))
|
|
|
|
| States states ->
|
|
|
|
let var_prefix = var_name ^ "_" in
|
|
|
|
let state_var state =
|
|
|
|
ScopeVar.fresh
|
|
|
|
(Mark.map (( ^ ) var_prefix) (StateName.get_info state))
|
|
|
|
in
|
|
|
|
States (List.map (fun state -> state, state_var state) states)
|
|
|
|
in
|
|
|
|
{
|
|
|
|
ctx with
|
|
|
|
scope_var_mapping =
|
|
|
|
ScopeVar.Map.add scope_var new_var ctx.scope_var_mapping;
|
|
|
|
})
|
|
|
|
scope_decl.D.scope_vars ctx)
|
|
|
|
desugared.D.program_scopes
|
2022-11-28 18:23:27 +03:00
|
|
|
{
|
|
|
|
scope_var_mapping = ScopeVar.Map.empty;
|
|
|
|
var_mapping = Var.Map.empty;
|
2023-08-10 17:52:39 +03:00
|
|
|
decl_ctx = desugared.program_ctx;
|
|
|
|
modules;
|
2022-11-28 18:23:27 +03:00
|
|
|
}
|
2022-03-06 16:15:09 +03:00
|
|
|
in
|
2023-08-10 17:52:39 +03:00
|
|
|
let ctx = make_ctx desugared in
|
2023-08-16 00:52:03 +03:00
|
|
|
let rec gather_scope_vars acc modules =
|
|
|
|
ModuleName.Map.fold
|
|
|
|
(fun _modname mctx acc ->
|
|
|
|
let acc = gather_scope_vars acc mctx.modules in
|
|
|
|
ScopeVar.Map.union (fun _ _ -> assert false) acc mctx.scope_var_mapping)
|
|
|
|
modules acc
|
|
|
|
in
|
|
|
|
let ctx =
|
|
|
|
{
|
|
|
|
ctx with
|
|
|
|
scope_var_mapping = gather_scope_vars ctx.scope_var_mapping ctx.modules;
|
|
|
|
}
|
|
|
|
in
|
2023-08-10 17:52:39 +03:00
|
|
|
let rec process_decl_ctx ctx decl_ctx =
|
|
|
|
let ctx_scopes =
|
|
|
|
ScopeName.Map.map
|
|
|
|
(fun out_str ->
|
|
|
|
let out_struct_fields =
|
|
|
|
ScopeVar.Map.fold
|
|
|
|
(fun var fld out_map ->
|
|
|
|
let var' =
|
|
|
|
match ScopeVar.Map.find var ctx.scope_var_mapping with
|
|
|
|
| WholeVar v -> v
|
|
|
|
| States l -> snd (List.hd (List.rev l))
|
|
|
|
in
|
|
|
|
ScopeVar.Map.add var' fld out_map)
|
|
|
|
out_str.out_struct_fields ScopeVar.Map.empty
|
|
|
|
in
|
|
|
|
{ out_str with out_struct_fields })
|
|
|
|
decl_ctx.ctx_scopes
|
|
|
|
in
|
|
|
|
{
|
|
|
|
decl_ctx with
|
|
|
|
ctx_modules =
|
|
|
|
ModuleName.Map.mapi
|
|
|
|
(fun modname decl_ctx ->
|
|
|
|
let ctx = ModuleName.Map.find modname ctx.modules in
|
|
|
|
process_decl_ctx ctx decl_ctx)
|
|
|
|
decl_ctx.ctx_modules;
|
|
|
|
ctx_scopes;
|
|
|
|
}
|
2022-11-17 19:13:35 +03:00
|
|
|
in
|
2023-08-10 17:52:39 +03:00
|
|
|
let rec process_modules program_ctx desugared =
|
|
|
|
ModuleName.Map.mapi
|
|
|
|
(fun modname m_desugared ->
|
|
|
|
let ctx = ModuleName.Map.find modname ctx.modules in
|
|
|
|
{
|
2023-09-19 12:44:18 +03:00
|
|
|
Ast.program_module_name = Some modname;
|
2023-08-10 17:52:39 +03:00
|
|
|
Ast.program_topdefs = TopdefName.Map.empty;
|
|
|
|
program_scopes =
|
|
|
|
ScopeName.Map.map
|
|
|
|
(translate_scope_interface ctx)
|
|
|
|
m_desugared.D.program_scopes;
|
2023-08-31 17:54:45 +03:00
|
|
|
program_ctx = ModuleName.Map.find modname program_ctx.ctx_modules;
|
2023-08-10 17:52:39 +03:00
|
|
|
program_modules =
|
|
|
|
process_modules
|
|
|
|
(ModuleName.Map.find modname program_ctx.ctx_modules)
|
|
|
|
m_desugared;
|
2023-09-22 18:50:19 +03:00
|
|
|
Ast.program_lang = desugared.program_lang;
|
2023-08-10 17:52:39 +03:00
|
|
|
})
|
|
|
|
desugared.D.program_modules
|
2023-04-07 13:39:26 +03:00
|
|
|
in
|
2023-08-10 17:52:39 +03:00
|
|
|
let program_ctx = process_decl_ctx ctx desugared.D.program_ctx in
|
|
|
|
let program_modules = process_modules program_ctx desugared in
|
2023-05-11 18:39:38 +03:00
|
|
|
let program_topdefs =
|
|
|
|
TopdefName.Map.mapi
|
|
|
|
(fun id -> function
|
2023-08-10 17:52:39 +03:00
|
|
|
| Some e, ty -> Expr.unbox (translate_expr ctx e), ty
|
|
|
|
| None, (_, pos) ->
|
|
|
|
Message.raise_spanned_error pos "No definition found for %a"
|
|
|
|
TopdefName.format id)
|
|
|
|
desugared.program_topdefs
|
|
|
|
in
|
|
|
|
let program_scopes =
|
|
|
|
ScopeName.Map.map
|
|
|
|
(translate_scope ctx exc_graphs)
|
|
|
|
desugared.D.program_scopes
|
2023-05-11 18:39:38 +03:00
|
|
|
in
|
|
|
|
{
|
2023-09-19 12:44:18 +03:00
|
|
|
Ast.program_module_name = desugared.D.program_module_name;
|
2023-05-11 18:39:38 +03:00
|
|
|
Ast.program_topdefs;
|
2023-08-10 17:52:39 +03:00
|
|
|
Ast.program_scopes;
|
|
|
|
Ast.program_ctx;
|
|
|
|
Ast.program_modules;
|
2023-09-22 18:50:19 +03:00
|
|
|
Ast.program_lang = desugared.program_lang;
|
2020-12-04 18:40:17 +03:00
|
|
|
}
|