From 5ca94d13bac420fd3be532bd4c65321564d02f0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Georges=20Dup=C3=A9ron?= Date: Wed, 13 Mar 2019 17:10:57 +0100 Subject: [PATCH] AST2: simplified some of the pattern-matching nodes --- AST2.ml | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/AST2.ml b/AST2.ml index 9835134ab..c84021624 100644 --- a/AST2.ml +++ b/AST2.ml @@ -277,24 +277,19 @@ and s_list_pattern = function Sugar sugar -> s_sugar sugar | Raw raw -> s_raw raw -and s_sugar {value=(lbracket, sequence, rbracket); _} : O.pattern = +and s_sugar {value=(lbracket, sequence, rbracket); region} : O.pattern = + let () = ignore (lbracket, rbracket, region) in List.fold_left (fun acc p -> O.PCons (s_core_pattern p, acc)) O.PNull (s_sepseq sequence); -and s_raw {value=node; _} = - let lpar, (core_pattern, cons, pattern), rpar = node in - s_token lpar "("; - s_core_pattern core_pattern; - s_token cons "<:"; - s_pattern pattern; - s_token rpar ")" +and s_raw {value=(lpar, (core_pattern, cons, pattern), rpar); region} = + let () = ignore (lpar, cons, rpar, region) in + O.PCons (s_core_pattern core_pattern, s_pattern pattern) -and s_ptuple {value=node; _} = - let lpar, sequence, rpar = node in - s_token lpar "("; - s_nsepseq "," s_core_pattern sequence; - s_token rpar ")" +and s_ptuple {value=(lpar, sequence, rpar); region} = + let () = ignore (lpar, rpar, region) in + PTuple (map s_core_pattern (s_nsepseq sequence)) and s_psome {value=(c_Some,{value=(l,psome,r);region=region2});region} : O.pattern = let () = ignore (c_Some,l,r,region2,region) in