diff options
Diffstat (limited to 'src/compiler/GF/Grammar/Parser.y')
| -rw-r--r-- | src/compiler/GF/Grammar/Parser.y | 39 |
1 files changed, 26 insertions, 13 deletions
diff --git a/src/compiler/GF/Grammar/Parser.y b/src/compiler/GF/Grammar/Parser.y index cf1f667da..9f2e7c95a 100644 --- a/src/compiler/GF/Grammar/Parser.y +++ b/src/compiler/GF/Grammar/Parser.y @@ -7,7 +7,7 @@ module GF.Grammar.Parser , pModHeader , pExp , pTopDef - , pCFRules + , pBNFCRules , pEBNFRules ) where @@ -16,7 +16,7 @@ import GF.Infra.Option import GF.Data.Operations import GF.Grammar.Predef import GF.Grammar.Grammar -import GF.Grammar.CFG +import GF.Grammar.BNFC import GF.Grammar.EBNF import GF.Grammar.Macros import GF.Grammar.Lexer @@ -31,7 +31,7 @@ import PGF(mkCId) %name pTopDef TopDef %partial pModHeader ModHeader %name pExp Exp -%name pCFRules ListCFRule +%name pBNFCRules ListCFRule %name pEBNFRules ListEBNFRule -- no lexer declaration @@ -108,6 +108,10 @@ import PGF(mkCId) 'variants' { T_variants } 'where' { T_where } 'with' { T_with } + 'coercions' { T_coercions } + 'terminator' { T_terminator } + 'separator' { T_separator } + 'nonempty' { T_nonempty } Integer { (T_Integer $$) } Double { (T_Double $$) } @@ -611,14 +615,14 @@ ListDDecl : {- empty -} { [] } | DDecl ListDDecl { $1 ++ $2 } -ListCFRule :: { [CFRule] } +ListCFRule :: { [BNFCRule] } ListCFRule : CFRule { $1 } | CFRule ListCFRule { $1 ++ $2 } -CFRule :: { [CFRule] } +CFRule :: { [BNFCRule] } CFRule - : Ident '.' Ident '::=' ListCFSymbol ';' { [CFRule (showIdent $3) $5 (CFObj (mkCId (showIdent $1)) [])] + : Ident '.' Ident '::=' ListCFSymbol ';' { [BNFCRule (showIdent $3) $5 (CFObj (mkCId (showIdent $1)) [])] } | Ident '::=' ListCFRHS ';' { let { cat = showIdent $1; mkFun cat its = @@ -628,25 +632,34 @@ CFRule }; clean sym = case sym of { - Terminal c -> filter isAlphaNum c; - NonTerminal t -> t + Terminal c -> filter isAlphaNum c; + NonTerminal (t,_) -> t } - } in map (\rhs -> CFRule cat rhs (CFObj (mkCId (mkFun cat rhs)) [])) $3 + } in map (\rhs -> BNFCRule cat rhs (CFObj (mkCId (mkFun cat rhs)) [])) $3 } + | 'coercions' Ident Integer ';' { [BNFCCoercions (showIdent $2) $3]} + | 'terminator' NonEmpty Ident String ';' { [BNFCTerminator $2 (showIdent $3) $4] } + | 'separator' NonEmpty Ident String ';' { [BNFCSeparator $2 (showIdent $3) $4] } -ListCFRHS :: { [[CFSymbol]] } +ListCFRHS :: { [[BNFCSymbol]] } ListCFRHS : ListCFSymbol { [$1] } | ListCFSymbol '|' ListCFRHS { $1 : $3 } -ListCFSymbol :: { [CFSymbol] } +ListCFSymbol :: { [BNFCSymbol] } ListCFSymbol : {- empty -} { [] } | CFSymbol ListCFSymbol { $1 : $2 } -CFSymbol :: { CFSymbol } +CFSymbol :: { BNFCSymbol } : String { Terminal $1 } - | Ident { NonTerminal (showIdent $1) } + | Ident { NonTerminal (showIdent $1, False) } + | '[' Ident ']' { NonTerminal (showIdent $2, True) } + +NonEmpty :: { Bool } +NonEmpty : 'nonempty' { True } + | {-empty-} { False } + ListEBNFRule :: { [ERule] } ListEBNFRule |