msyds/gf-core
1
0
Fork 0
forked from GitHub/gf-core
Code Pull Requests Activity

save the original concrete category in BracketedString

Browse Source
This commit is contained in:
Krasimir Angelov
2018-12-20 10:52:45 +01:00
parent 54204d2d95
commit 26dabeab9b
4 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/runtime/c/pgf/parser.c
View File

@@ -10,7 +10,7 @@
#include <math.h> #include <math.h>
#include <stdlib.h> #include <stdlib.h>
//#define PGF_PARSER_DEBUG #define PGF_PARSER_DEBUG
//#define PGF_COUNTS_DEBUG //#define PGF_COUNTS_DEBUG
//#define PGF_RESULT_DEBUG //#define PGF_RESULT_DEBUG

4
src/runtime/haskell/PGF/Forest.hs
View File

@@ -58,8 +58,8 @@ bracketedTokn :: Maybe Int -> Forest -> BracketedTokn
bracketedTokn dp f@(Forest abs cnc forest root) = bracketedTokn dp f@(Forest abs cnc forest root) =
case [computeSeq isTrusted seq (map (render forest) args) | (seq,args) <- root] of case [computeSeq isTrusted seq (map (render forest) args) | (seq,args) <- root] of
([bs@(Bracket_{})]:_) -> bs ([bs@(Bracket_{})]:_) -> bs
(bss:_) -> Bracket_ wildCId 0 0 wildCId [] bss (bss:_) -> Bracket_ wildCId 0 0 0 wildCId [] bss
[] -> Bracket_ wildCId 0 0 wildCId [] [] [] -> Bracket_ wildCId 0 0 0 wildCId [] []
where where
isTrusted (_,fid) = IntSet.member fid trusted isTrusted (_,fid) = IntSet.member fid trusted

24
src/runtime/haskell/PGF/Macros.hs
View File

@@ -138,7 +138,7 @@ cidVar = mkCId "__gfVar"
-- mark the beginning and the end of each constituent. -- mark the beginning and the end of each constituent.
data BracketedString data BracketedString
= Leaf Token -- ^ this is the leaf i.e. a single token = Leaf Token -- ^ this is the leaf i.e. a single token
| Bracket CId {-# UNPACK #-} !FId {-# UNPACK #-} !LIndex CId [Expr] [BracketedString] | Bracket CId {-# UNPACK #-} !FId {-# UNPACK #-} !FId {-# UNPACK #-} !LIndex CId [Expr] [BracketedString]
-- ^ this is a bracket. The 'CId' is the category of -- ^ this is a bracket. The 'CId' is the category of
-- the phrase. The 'FId' is an unique identifier for -- the phrase. The 'FId' is an unique identifier for
-- every phrase in the sentence. For context-free grammars -- every phrase in the sentence. For context-free grammars
@@ -152,7 +152,7 @@ data BracketedString
-- that represents the same constituent. -- that represents the same constituent.
data BracketedTokn data BracketedTokn
= Bracket_ CId {-# UNPACK #-} !FId {-# UNPACK #-} !LIndex CId [Expr] [BracketedTokn] -- Invariant: the list is not empty = Bracket_ CId {-# UNPACK #-} !FId {-# UNPACK #-} !FId {-# UNPACK #-} !LIndex CId [Expr] [BracketedTokn] -- Invariant: the list is not empty
| LeafKS Token | LeafKS Token
| LeafNE | LeafNE
| LeafBIND | LeafBIND
@@ -170,12 +170,12 @@ showBracketedString :: BracketedString -> String
showBracketedString = render . ppBracketedString showBracketedString = render . ppBracketedString
ppBracketedString (Leaf t) = text t ppBracketedString (Leaf t) = text t
ppBracketedString (Bracket cat fid index _ _ bss) = parens (ppCId cat <> colon <> int fid <+> hsep (map ppBracketedString bss)) ppBracketedString (Bracket cat fid fid' index _ _ bss) = parens (ppCId cat <> colon <> int fid' <+> hsep (map ppBracketedString bss))
-- | The length of the bracketed string in number of tokens. -- | The length of the bracketed string in number of tokens.
lengthBracketedString :: BracketedString -> Int lengthBracketedString :: BracketedString -> Int
lengthBracketedString (Leaf _) = 1 lengthBracketedString (Leaf _) = 1
lengthBracketedString (Bracket _ _ _ _ _ bss) = sum (map lengthBracketedString bss) lengthBracketedString (Bracket _ _ _ _ _ _ bss) = sum (map lengthBracketedString bss)
untokn :: Maybe String -> [BracketedTokn] -> (Maybe String,[BracketedString]) untokn :: Maybe String -> [BracketedTokn] -> (Maybe String,[BracketedString])
untokn nw bss = untokn nw bss =
@@ -184,10 +184,10 @@ untokn nw bss =
Just bss -> (nw,concat bss) Just bss -> (nw,concat bss)
Nothing -> (nw,[]) Nothing -> (nw,[])
where where
untokn nw (Bracket_ cat fid index fun es bss) = untokn nw (Bracket_ cat fid fid' index fun es bss) =
let (nw',bss') = mapAccumR untokn nw bss let (nw',bss') = mapAccumR untokn nw bss
in case sequence bss' of in case sequence bss' of
Just bss -> (nw',Just [Bracket cat fid index fun es (concat bss)]) Just bss -> (nw',Just [Bracket cat fid fid' index fun es (concat bss)])
Nothing -> (Nothing, Nothing) Nothing -> (Nothing, Nothing)
untokn nw (LeafKS t) untokn nw (LeafKS t)
| null t = (nw,Just []) | null t = (nw,Just [])
@@ -228,16 +228,16 @@ computeSeq filter seq args = concatMap compute seq
getArg d r getArg d r
| not (null arg_lin) && | not (null arg_lin) &&
filter ct = [Bracket_ cat fid r fun es arg_lin] filter ct = [Bracket_ cat fid fid' r fun es arg_lin]
| otherwise = arg_lin | otherwise = arg_lin
where where
arg_lin = lin ! r arg_lin = lin ! r
(ct@(cat,fid),_,fun,es,(_xs,lin)) = args !! d (ct@(cat,fid),fid',fun,es,(_xs,lin)) = args !! d
getVar d r = [LeafKS (showCId (xs !! r))] getVar d r = [LeafKS (showCId (xs !! r))]
where where
(_ct,_,_fun,_es,(xs,_lin)) = args !! d (_ct,_,_fun,_es,(xs,_lin)) = args !! d
flattenBracketedString :: BracketedString -> [String] flattenBracketedString :: BracketedString -> [String]
flattenBracketedString (Leaf w) = [w] flattenBracketedString (Leaf w) = [w]
flattenBracketedString (Bracket _ _ _ _ _ bss) = concatMap flattenBracketedString bss flattenBracketedString (Bracket _ _ _ _ _ _ bss) = concatMap flattenBracketedString bss

14
src/runtime/haskell/PGF/VisualizeTree.hs
View File

@@ -182,8 +182,8 @@ graphvizDependencyTree format debug mlab mclab pgf lang t =
getLeaves parent bs = getLeaves parent bs =
case bs of case bs of
Leaf w -> [(parent,w)] Leaf w -> [(parent,w)]
Bracket cat fid lind fun _ bss -> concatMap (getLeaves (cat,fid,fun,lind)) bss Bracket cat fid _ lind fun _ bss -> concatMap (getLeaves (cat,fid,fun,lind)) bss
mkNode ((_,p,_,_),i,w) = mkNode ((_,p,_,_),i,w) =
tag p <+> brackets (text "label = " <> doubleQuotes (int i <> char '.' <+> text w)) <+> semi tag p <+> brackets (text "label = " <> doubleQuotes (int i <> char '.' <+> text w)) <+> semi
@@ -301,13 +301,13 @@ graphvizBracketedString opts mbl tree bss = render graphviz_code
getInternals [] = [] getInternals [] = []
getInternals nodes getInternals nodes
= nub [(parent, fid, mkNode fun cat) | = nub [(parent, fid, mkNode fun cat) |
(parent, Bracket cat fid _ fun _ _) <- nodes] (parent, Bracket cat fid _ _ fun _ _) <- nodes]
: getInternals [(fid, child) | : getInternals [(fid, child) |
(_, Bracket _ fid _ _ _ children) <- nodes, (_, Bracket _ fid _ _ _ _ children) <- nodes,
child <- children] child <- children]
getLeaves cat parent (Leaf word) = [(parent, (cat, word))] -- the lowest cat before the word getLeaves cat parent (Leaf word) = [(parent, (cat, word))] -- the lowest cat before the word
getLeaves _ parent (Bracket cat fid i _ _ children) getLeaves _ parent (Bracket cat fid _ i _ _ children)
= concatMap (getLeaves cat fid) children = concatMap (getLeaves cat fid) children
mkLevel nodes mkLevel nodes
@@ -411,8 +411,8 @@ genPreAlignment pgf langs = lin2align . linsBracketed
getLeaves parent bs = getLeaves parent bs =
case bs of case bs of
Leaf w -> [(parent,w)] Leaf w -> [(parent,w)]
Bracket _ fid _ _ _ bss -> concatMap (getLeaves fid) bss Bracket _ fid _ _ _ _ bss -> concatMap (getLeaves fid) bss
mkLayers (cs:css:rest) = let (lrest, rrest) = mkLayers (css:rest) mkLayers (cs:css:rest) = let (lrest, rrest) = mkLayers (css:rest)
in ((fields cs) : lrest, (map (mkLinks css) cs) : rrest) in ((fields cs) : lrest, (map (mkLinks css) cs) : rrest)