diff options
| author | bringert <bringert@cs.chalmers.se> | 2008-01-03 17:10:05 +0000 |
|---|---|---|
| committer | bringert <bringert@cs.chalmers.se> | 2008-01-03 17:10:05 +0000 |
| commit | af1a3a2473747942dcec647a42e5724fcb21d1b9 (patch) | |
| tree | e08020dce28ad35a5434328e6483ec695693fc20 /src/GF/Command/Importing.hs | |
| parent | 43ddb41d314e7d547fa8f8bb1cd23397dfa30f65 (diff) | |
Store FCFPInfo (all information needed for FCFG parsing) in GFCC files, and in the internal DataGFCC.GFCC structure. The parsing information format is still in flux.
Diffstat (limited to 'src/GF/Command/Importing.hs')
| -rw-r--r-- | src/GF/Command/Importing.hs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/GF/Command/Importing.hs b/src/GF/Command/Importing.hs index 676eec37f..788dab20a 100644 --- a/src/GF/Command/Importing.hs +++ b/src/GF/Command/Importing.hs @@ -22,10 +22,8 @@ importGrammar mgr0 opts files = do let name = justModuleName (last files) let (abs,gfcc0) = mkCanon2gfcc opts name gr gfcc1 <- checkGFCCio gfcc0 - return $ if oElem (iOpt "noopt") opts then gfcc1 else optGFCC gfcc1 + return $ addParsers $ if oElem (iOpt "noopt") opts then gfcc1 else optGFCC gfcc1 "gfcc" -> mapM file2gfcc files >>= return . foldl1 unionGFCC let gfcc3 = unionGFCC (gfcc mgr0) gfcc2 - return $ MultiGrammar gfcc3 - (nubBy (\ (x,_) (y,_) -> x == y) (gfcc2parsers gfcc3 ++ parsers mgr0)) - -- later coming parsers override + return $ MultiGrammar gfcc3
\ No newline at end of file |