From 8e2424af49dfc8289fe938a36c5cdab96386c074 Mon Sep 17 00:00:00 2001 From: Thomas Hallgren Date: Tue, 12 Mar 2019 22:32:54 +0100 Subject: [PATCH] GF.Grammar.Canonical: add TuplePattern and CommentedValue --- src/compiler/GF/Grammar/Canonical.hs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/compiler/GF/Grammar/Canonical.hs b/src/compiler/GF/Grammar/Canonical.hs index ab9bf280c..8be659e1b 100644 --- a/src/compiler/GF/Grammar/Canonical.hs +++ b/src/compiler/GF/Grammar/Canonical.hs @@ -69,6 +69,7 @@ data LinValue = ConcatValue LinValue LinValue | PreValue [([String], LinValue)] LinValue | Projection LinValue LabelId | Selection LinValue LinValue + | CommentedValue String LinValue deriving (Eq,Ord,Show) data LinLiteral = FloatConstant Float @@ -78,6 +79,7 @@ data LinLiteral = FloatConstant Float data LinPattern = ParamPattern ParamPattern | RecordPattern [RecordRow LinPattern] + | TuplePattern [LinPattern] | WildPattern deriving (Eq,Ord,Show) @@ -213,6 +215,7 @@ instance Pretty LinValue where Projection lv l -> ppA lv<>"."<>l Selection tv pv -> ppA tv<>"!"<>ppA pv VariantValue vs -> "variants"<+>block vs + CommentedValue s v -> "{-" <+> s <+> "-}" $$ v _ -> ppA lv instance PPA LinValue where @@ -253,6 +256,7 @@ instance PPA LinPattern where ppA p = case p of RecordPattern r -> block r + TuplePattern ps -> "<"<>punctuate "," ps<>">" WildPattern -> pp "_" _ -> parens p