Changed nolr printer to use EBNF format.

src/GF/Compile/Export.hs

@@ -14,7 +14,7 @@ import GF.Speech.SRGS_ABNF
 import GF.Speech.SRGS_XML
 import GF.Speech.JSGF
 import GF.Speech.GSL
-import GF.Speech.SRG (ebnfPrinter)
+import GF.Speech.SRG (ebnfPrinter, nonLeftRecursivePrinter)
 import GF.Speech.VoiceXML
 import GF.Speech.SLF
 import GF.Speech.PrRegExp
@@ -39,7 +39,7 @@ exportPGF opts fmt pgf =
       FmtProlog_Abs   -> multi "pl"  grammar2prolog_abs 
       FmtBNF          -> single "bnf"   bnfPrinter
       FmtEBNF         -> single "ebnf"  ebnfPrinter
-      FmtNoLR         -> single "bnf"   nonLeftRecursivePrinter
+      FmtNoLR         -> single "ebnf"  nonLeftRecursivePrinter
       FmtRegular      -> single "bnf"   regularPrinter
       FmtFCFG         -> single "fcfg"  fcfgPrinter
       FmtSRGS_XML     -> single "grxml" (srgsXmlPrinter sisr)

src/GF/Speech/PGFToCFG.hs

@@ -4,7 +4,7 @@
 --
 -- Approximates PGF grammars with context-free grammars.
 ----------------------------------------------------------------------
-module GF.Speech.PGFToCFG (bnfPrinter, nonLeftRecursivePrinter, regularPrinter, 
+module GF.Speech.PGFToCFG (bnfPrinter, regularPrinter, 
                            fcfgPrinter, pgfToCFG) where
 
 import PGF.CId
@@ -26,9 +26,6 @@ import qualified Data.Set as Set
 bnfPrinter :: PGF -> CId -> String
 bnfPrinter = toBNF id
 
-nonLeftRecursivePrinter :: PGF -> CId -> String
-nonLeftRecursivePrinter = toBNF removeLeftRecursion
-
 regularPrinter :: PGF -> CId -> String
 regularPrinter = toBNF makeRegular
 

src/GF/Speech/SRG.hs

@@ -11,6 +11,7 @@
 module GF.Speech.SRG (SRG(..), SRGRule(..), SRGAlt(..), SRGItem, SRGSymbol
                      , SRGNT, CFTerm
                      , ebnfPrinter
+                     , nonLeftRecursivePrinter
                      , makeSimpleSRG
                      , makeNonRecursiveSRG
                      , getSpeechLanguage
@@ -69,6 +70,9 @@ type SRGNT = (Cat, Int)
 ebnfPrinter :: PGF -> CId -> String
 ebnfPrinter pgf cnc = prSRG $ makeSRG id pgf cnc
 
+nonLeftRecursivePrinter :: PGF -> CId -> String
+nonLeftRecursivePrinter pgf cnc = prSRG $ makeSRG removeLeftRecursion pgf cnc
+
 makeSRG :: (CFG -> CFG) -> PGF -> CId -> SRG
 makeSRG = mkSRG cfgToSRG
     where