forked from
jonmsterling.com/ocaml-forester
ocaml
syntactic cleanup
+10
-10
+8
-8
lib/compiler/Expand.ml
+8
-8
lib/compiler/Expand.ml
···
106
106
body @ expand_eff ~forest rest
107
107
| Alloc x ->
108
108
let symbol = Symbol.named x in
109
-
Sc.include_singleton x @@ (Term [Range.locate_opt node.loc (Syn.Sym symbol)], node.loc);
109
+
Sc.include_singleton x (Term [Range.locate_opt node.loc (Syn.Sym symbol)], node.loc);
110
110
expand_eff ~forest rest
111
111
| Put (k, v) ->
112
112
let k = expand_ident node.loc k in
···
147
147
| Let (x, ys, def) ->
148
148
let lam = expand_lambda ~forest node.loc (ys, def) in
149
149
let@ () = Sc.section [] in
150
-
Sc.import_singleton x @@ (Term [lam], node.loc);
150
+
Sc.import_singleton x (Term [lam], node.loc);
151
151
expand_eff ~forest rest
152
152
| Def (x, ys, def) ->
153
153
let lam = expand_lambda ~forest node.loc (ys, def) in
154
-
Sc.include_singleton x @@ (Term [lam], node.loc);
154
+
Sc.include_singleton x (Term [lam], node.loc);
155
155
expand_eff ~forest rest
156
156
| Decl_xmlns (prefix, xmlns) ->
157
157
let path = ["xmlns"; prefix] in
158
-
Sc.include_singleton path @@ (Xmlns {prefix; xmlns}, node.loc);
158
+
Sc.include_singleton path (Xmlns {prefix; xmlns}, node.loc);
159
159
expand_eff ~forest rest
160
160
| Object {self; methods} ->
161
161
let methods =
···
163
163
begin
164
164
let@ self = Option.iter @~ self in
165
165
let var = Range.{value = Syn.Var self; loc = node.loc} in (* TODO: correct the location *)
166
-
Sc.import_singleton [self] @@ (Term [var], node.loc) (* TODO: correct the location*)
166
+
Sc.import_singleton [self] (Term [var], node.loc) (* TODO: correct the location*)
167
167
end;
168
168
List.map (expand_method ~forest) methods
169
169
in
···
175
175
begin
176
176
let@ self = Option.iter @~ self in
177
177
let self_var = Range.locate_opt None @@ Syn.Var self in
178
-
Sc.import_singleton [self] @@ (Term [self_var], node.loc);
178
+
Sc.import_singleton [self] (Term [self_var], node.loc);
179
179
let@ super = Option.iter @~ super in
180
180
let super_var = Range.locate_opt None @@ Syn.Var super in
181
-
Sc.import_singleton [super] @@ (Term [super_var], node.loc)
181
+
Sc.import_singleton [super] (Term [super_var], node.loc)
182
182
end;
183
183
List.map (expand_method ~forest) methods
184
184
in
···
268
268
let xs =
269
269
let@ strategy, x = List.map @~ xs in
270
270
let var = Range.locate_opt None @@ Syn.Var x in
271
-
Sc.import_singleton [x] @@ (Term [var], loc);
271
+
Sc.import_singleton [x] (Term [var], loc);
272
272
strategy, x
273
273
in
274
274
Range.{value = Syn.Fun (xs, expand_eff ~forest body); loc}
+1
-1
lib/compiler/test/Test_expansion.ml
+1
-1
lib/compiler/test/Test_expansion.ml