Skip to content

Commit 029c20d

Browse files
committed
Fix bug and demonstrate via tests
1 parent 48e7c4c commit 029c20d

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

ocaml/parsing/jane_syntax_parsing.ml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -800,8 +800,8 @@ module Make_ast (AST : AST_internal) : AST with type ast = AST.ast = struct
800800

801801
let make_entire_jane_syntax ~loc feature ast =
802802
AST.with_location
803-
(make_jane_syntax feature []
804-
(Ast_helper.with_default_loc { loc with loc_ghost = true } ast))
803+
(Ast_helper.with_default_loc { loc with loc_ghost = true } (fun () ->
804+
make_jane_syntax feature [] (ast ())))
805805
loc
806806

807807
(** Generically lift our custom ASTs for our novel syntax from OCaml ASTs. *)

ocaml/testsuite/tests/jane-modular-syntax/attribute_locations.reference

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ Attributes and their locations:
88
jane.non_erasable.comprehensions.for.in
99
jane.non_erasable.comprehensions.for
1010
jane.non_erasable.comprehensions.list
11-
At location File "_none_", line 1:
1211
jane.non_erasable.comprehensions
1312
---
1413
Test: multiple Jane Syntax constructs
@@ -26,36 +25,35 @@ Attributes and their locations:
2625
jane.non_erasable.comprehensions.for.in
2726
jane.non_erasable.comprehensions.for
2827
jane.non_erasable.comprehensions.list
28+
jane.non_erasable.comprehensions
2929
At location File "<no filename in test>", line 2, characters 9-31:
3030
jane.non_erasable.comprehensions.body
3131
jane.non_erasable.comprehensions.for.range.upto
3232
jane.non_erasable.comprehensions.for
3333
jane.non_erasable.comprehensions.list
34+
jane.non_erasable.comprehensions
3435
At location File "<no filename in test>", line 3, characters 9-31:
3536
jane.non_erasable.comprehensions.body
3637
jane.non_erasable.comprehensions.for.range.upto
3738
jane.non_erasable.comprehensions.for
3839
jane.non_erasable.comprehensions.list
40+
jane.non_erasable.comprehensions
3941
At location File "<no filename in test>", line 4, characters 9-35:
4042
jane.non_erasable.comprehensions.body
4143
jane.non_erasable.comprehensions.for.range.downto
4244
jane.non_erasable.comprehensions.for
4345
jane.non_erasable.comprehensions.list
46+
jane.non_erasable.comprehensions
4447
At location File "<no filename in test>", line 5, characters 9-37:
4548
jane.non_erasable.comprehensions.body
4649
jane.non_erasable.comprehensions.for.range.downto
4750
jane.non_erasable.comprehensions.for
4851
jane.non_erasable.comprehensions.array.mutable
52+
jane.non_erasable.comprehensions
4953
At location File "<no filename in test>", line 6, characters 9-43:
5054
jane.non_erasable.comprehensions.body
5155
jane.non_erasable.comprehensions.when
5256
jane.non_erasable.comprehensions.for.range.upto
5357
jane.non_erasable.comprehensions.for
5458
jane.non_erasable.comprehensions.list
55-
At location File "_none_", line 1:
56-
jane.non_erasable.comprehensions
57-
jane.non_erasable.comprehensions
58-
jane.non_erasable.comprehensions
59-
jane.non_erasable.comprehensions
60-
jane.non_erasable.comprehensions
6159
jane.non_erasable.comprehensions

0 commit comments

Comments
 (0)