Merge branch 'master' of https://github.com/GrammaticalFramework/GF

2 files changed, 8 insertions, 1 deletions

diff --git a/src/runtime/haskell/PGF.hs b/src/runtime/haskell/PGF.hs
index 6c0002a8a..134a13c3b 100644
--- a/src/runtime/haskell/PGF.hs
+++ b/src/runtime/haskell/PGF.hs
@@ -58,7 +58,7 @@ module PGF(
 
            -- * Operations
            -- ** Linearization
-           linearize, linearizeAllLang, linearizeAll, bracketedLinearize, tabularLinearizes,
+           linearize, linearizeAllLang, linearizeAll, bracketedLinearize, bracketedLinearizeAll, tabularLinearizes,
            groupResults, -- lins of trees by language, removing duplicates
            showPrintName,
            
diff --git a/src/runtime/haskell/PGF/Linearize.hs b/src/runtime/haskell/PGF/Linearize.hs
index e3e8d92db..5fdb186c1 100644
--- a/src/runtime/haskell/PGF/Linearize.hs
+++ b/src/runtime/haskell/PGF/Linearize.hs
@@ -4,6 +4,7 @@ module PGF.Linearize
             , linearizeAll
             , linearizeAllLang
             , bracketedLinearize
+            , bracketedLinearizeAll
             , tabularLinearizes
             ) where
 
@@ -47,6 +48,12 @@ bracketedLinearize pgf lang = head . map (snd . untokn Nothing . firstLin cnc) .
     head []       = []
     head (bs:bss) = bs
 
+-- | Linearizes given expression as a bracketed string in the language
+bracketedLinearizeAll :: PGF -> Language -> Tree -> [[BracketedString]]
+bracketedLinearizeAll pgf lang = map (snd . untokn Nothing . firstLin cnc) . linTree pgf cnc
+  where
+    cnc = lookMap (error "no lang") lang (concretes pgf)
+
 firstLin cnc arg@(ct@(cat,n_fid),fid,fun,es,(xs,lin)) =
   case IntMap.lookup fid (linrefs cnc) of
     Just (funid:_) -> snd (mkLinTable cnc (const True) [] funid [arg]) ! 0