CatalaLang/catala
1
1
Fork 0
mirror of https://github.com/CatalaLang/catala.git synced 2024-11-08 07:51:43 +03:00
Code Issues Projects Releases Wiki Activity

Scopelang: fix scope definition incorrect position

Browse Source
This commit is contained in:
vbot 2024-07-17 15:06:38 +02:00
parent 6e5e99a60a
commit d78f004848
No known key found for this signature in database
GPG Key ID: A2CE1BDBED95DA38
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
compiler/scopelang/from_desugared.ml
View File

@ -598,12 +598,15 @@ let translate_rule
(exc_graphs : (exc_graphs :
Desugared.Dependency.ExceptionsDependencies.t D.ScopeDef.Map.t) = function Desugared.Dependency.ExceptionsDependencies.t D.ScopeDef.Map.t) = function
| Desugared.Dependency.Vertex.Var (var, state) -> ( | Desugared.Dependency.Vertex.Var (var, state) -> (
let pos = Mark.get (ScopeVar.get_info var) in
(* TODO: this may point to the place where the variable was declared instead
of the binding in the definition being explored. Needs double-checking
and maybe adding more position information *)
let scope_def = let scope_def =
D.ScopeDef.Map.find ((var, pos), D.ScopeDef.Var state) scope.scope_defs D.ScopeDef.Map.find
((var, Pos.no_pos), D.ScopeDef.Var state)
scope.scope_defs
in
let pos =
match RuleName.Map.choose_opt scope_def.scope_def_rules with
| None -> Mark.get (ScopeVar.get_info var)
| Some (r, _) -> Mark.get (RuleName.get_info r)
in in
match ScopeVar.Map.find_opt var scope.scope_sub_scopes with match ScopeVar.Map.find_opt var scope.scope_sub_scopes with
| None -> ( | None -> (