diff options
| author | krasimir <krasimir@chalmers.se> | 2009-09-20 10:15:39 +0000 |
|---|---|---|
| committer | krasimir <krasimir@chalmers.se> | 2009-09-20 10:15:39 +0000 |
| commit | cebd0560c831c6dda09a2841bc24c0e3bd9ea889 (patch) | |
| tree | 9ea2a576f207c0084c4d5895b710c905bbff4045 /src/GF/Grammar/Parser.y | |
| parent | b1a51f46f5d137ab4d65a4381b349af3291a944d (diff) | |
rename Decl in GF.Grammar.Grammar to Hypo to match the convention in PGF
Diffstat (limited to 'src/GF/Grammar/Parser.y')
| -rw-r--r-- | src/GF/Grammar/Parser.y | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/GF/Grammar/Parser.y b/src/GF/Grammar/Parser.y index 89614ed8d..90e035a02 100644 --- a/src/GF/Grammar/Parser.y +++ b/src/GF/Grammar/Parser.y @@ -540,10 +540,10 @@ ListBind : Bind { [$1] } | Bind ',' ListBind { $1 : $3 } -Decl :: { [Decl] } +Decl :: { [Hypo] } Decl : '(' ListBind ':' Exp ')' { [(x,$4) | x <- $2] } - | Exp4 { [mkDecl $1] } + | Exp4 { [mkHypo $1] } ListTupleComp :: { [Term] } ListTupleComp @@ -575,12 +575,12 @@ ListAltern : Altern { [$1] } | Altern ';' ListAltern { $1 : $3 } -DDecl :: { [Decl] } +DDecl :: { [Hypo] } DDecl : '(' ListBind ':' Exp ')' { [(x,$4) | x <- $2] } - | Exp6 { [mkDecl $1] } + | Exp6 { [mkHypo $1] } -ListDDecl :: { [Decl] } +ListDDecl :: { [Hypo] } ListDDecl : {- empty -} { [] } | DDecl ListDDecl { $1 ++ $2 } @@ -615,11 +615,11 @@ listCatDef id pos cont size = [catd,nilfund,consfund] cont' = [(mkId x i,ty) | (i,(x,ty)) <- zip [0..] cont] xs = map (Vr . fst) cont' - cd = mkDecl (mkApp (Vr id) xs) + cd = mkHypo (mkApp (Vr id) xs) lc = mkApp (Vr listId) xs niltyp = mkProdSimple (cont' ++ replicate size cd) lc - constyp = mkProdSimple (cont' ++ [cd, mkDecl lc]) lc + constyp = mkProdSimple (cont' ++ [cd, mkHypo lc]) lc mkId x i = if isWildIdent x then (varX i) else x |