GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-05-05 09:12:51 -06:00
Code Issues Packages Projects Releases Wiki Activity

change tabularLinearize in the Haskell binding to return a list instead of map this preserves the order

Browse Source
This commit is contained in:
Krasimir Angelov
2017-08-30 15:59:43 +02:00
parent 97fe5df267
commit 08a728799a
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/runtime-api.html
View File

@@ -363,7 +363,7 @@ then the right method to use is <tt>tabularLinearize</tt>:
</pre> </pre>
<pre class="haskell"> <pre class="haskell">
Prelude PGF2> tabularLinearize eng e Prelude PGF2> tabularLinearize eng e
fromList [("s Pl Gen","red theatres'"),("s Pl Nom","red theatres"),("s Sg Gen","red theatre's"),("s Sg Nom","red theatre")] [("s Sg Nom","red theatre"),("s Sg Gen","red theatre's"),("s Pl Nom","red theatres"),("s Pl Gen","red theatres'")]
</pre> </pre>
<pre class="java"> <pre class="java">
for (Map.Entry&lt;String,String&gt; entry : eng.tabularLinearize(e).entrySet()) { for (Map.Entry&lt;String,String&gt; entry : eng.tabularLinearize(e).entrySet()) {

6
src/runtime/haskell-bind/PGF2.hsc
View File

@@ -648,7 +648,7 @@ linearizeAll lang e = unsafePerformIO $
throwIO (PGFError "The abstract tree cannot be linearized") throwIO (PGFError "The abstract tree cannot be linearized")
-- | Generates a table of linearizations for an expression -- | Generates a table of linearizations for an expression
tabularLinearize :: Concr -> Expr -> Map.Map String String tabularLinearize :: Concr -> Expr -> [(String, String)]
tabularLinearize lang e = unsafePerformIO $ tabularLinearize lang e = unsafePerformIO $
withGuPool $ \tmpPl -> do withGuPool $ \tmpPl -> do
exn <- gu_new_exn tmpPl exn <- gu_new_exn tmpPl
@@ -660,7 +660,7 @@ tabularLinearize lang e = unsafePerformIO $
peek ptr peek ptr
if ctree == nullPtr if ctree == nullPtr
then do touchExpr e then do touchExpr e
return Map.empty return []
else do labels <- alloca $ \p_n_lins -> else do labels <- alloca $ \p_n_lins ->
alloca $ \p_labels -> do alloca $ \p_labels -> do
pgf_lzr_get_table (concr lang) ctree p_n_lins p_labels pgf_lzr_get_table (concr lang) ctree p_n_lins p_labels
@@ -670,7 +670,7 @@ tabularLinearize lang e = unsafePerformIO $
labels <- mapM peekCString labels labels <- mapM peekCString labels
return labels return labels
lins <- collect lang ctree 0 labels exn tmpPl lins <- collect lang ctree 0 labels exn tmpPl
return (Map.fromList lins) return lins
where where
collect lang ctree lin_idx [] exn tmpPl = return [] collect lang ctree lin_idx [] exn tmpPl = return []
collect lang ctree lin_idx (label:labels) exn tmpPl = do collect lang ctree lin_idx (label:labels) exn tmpPl = do