diff options
| author | Gaëtan Gilbert | 2019-07-03 10:12:04 +0200 |
|---|---|---|
| committer | Gaëtan Gilbert | 2019-07-03 17:05:29 +0200 |
| commit | 6e22817c6dab5043f1bdcbb1a1c8da281d4b3d7b (patch) | |
| tree | 94b89889210aa81e22208de97d90271e797a99be /interp | |
| parent | bffe3e43a51420293960cc3c32845687bdee5f9b (diff) | |
declare_variable: path is always Lib.cwd()
Diffstat (limited to 'interp')
| -rw-r--r-- | interp/decls.ml | 19 | ||||
| -rw-r--r-- | interp/decls.mli | 9 |
2 files changed, 13 insertions, 15 deletions
diff --git a/interp/decls.ml b/interp/decls.ml index ec5d4fa3cb..ef22a393e4 100644 --- a/interp/decls.ml +++ b/interp/decls.ml @@ -59,20 +59,19 @@ type logical_kind = (** Data associated to section variables and local definitions *) -type variable_data = - { path:DirPath.t - ; opaque:bool - ; kind:logical_kind - } +type variable_data = { + opaque:bool; + kind:logical_kind; +} let vartab = - Summary.ref (Id.Map.empty : variable_data Id.Map.t) ~name:"VARIABLE" + Summary.ref (Id.Map.empty : (variable_data*DirPath.t) Id.Map.t) ~name:"VARIABLE" -let add_variable_data id o = vartab := Id.Map.add id o !vartab +let add_variable_data id o = vartab := Id.Map.add id (o,Lib.cwd()) !vartab -let variable_path id = let {path} = Id.Map.find id !vartab in path -let variable_opacity id = let {opaque} = Id.Map.find id !vartab in opaque -let variable_kind id = let {kind} = Id.Map.find id !vartab in kind +let variable_path id = let _,path = Id.Map.find id !vartab in path +let variable_opacity id = let {opaque},_ = Id.Map.find id !vartab in opaque +let variable_kind id = let {kind},_ = Id.Map.find id !vartab in kind let variable_secpath id = let dir = drop_dirpath_prefix (Lib.library_dp()) (variable_path id) in diff --git a/interp/decls.mli b/interp/decls.mli index 2a11a271cc..ba355999c2 100644 --- a/interp/decls.mli +++ b/interp/decls.mli @@ -60,11 +60,10 @@ type logical_kind = (** Registration and access to the table of variable *) -type variable_data = - { path:DirPath.t - ; opaque:bool - ; kind:logical_kind - } +type variable_data = { + opaque:bool; + kind:logical_kind; +} val add_variable_data : variable -> variable_data -> unit |