diff options
| author | hallgren <hallgren@chalmers.se> | 2013-09-19 20:48:10 +0000 |
|---|---|---|
| committer | hallgren <hallgren@chalmers.se> | 2013-09-19 20:48:10 +0000 |
| commit | 021b5f06d3900fe2b10d5d3ccf6ac286a779ef16 (patch) | |
| tree | cff0a0ca9c945dcef34f58a6e09fc5042c7abd65 /src/compiler/GF/Command | |
| parent | 3d5b9bd1fd46a51651cbfbd45f03e5b878aebbac (diff) | |
Introduce type RawIdent; only 9 imports of Data.ByteString.Char8 remain
The fact that identifiers are represented as ByteStrings is now an internal
implentation detail in module GF.Infra.Ident. Conversion between ByteString
and identifiers is only needed in the lexer and the Binary instances.
Diffstat (limited to 'src/compiler/GF/Command')
| -rw-r--r-- | src/compiler/GF/Command/Importing.hs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/compiler/GF/Command/Importing.hs b/src/compiler/GF/Command/Importing.hs index d8b7f0e0c..ce06156e4 100644 --- a/src/compiler/GF/Command/Importing.hs +++ b/src/compiler/GF/Command/Importing.hs @@ -5,7 +5,7 @@ import PGF.Data import GF.Compile import GF.Compile.Multi (readMulti) -import GF.Grammar (identC, SourceGrammar) -- for cc command +import GF.Grammar (identS, SourceGrammar) -- for cc command import GF.Grammar.CF import GF.Grammar.EBNF import GF.Infra.UseIO @@ -13,7 +13,6 @@ import GF.Infra.Option import GF.Data.ErrM import Data.List (nubBy) -import qualified Data.ByteString.Char8 as BS import System.FilePath -- import a grammar in an environment where it extends an existing grammar @@ -59,7 +58,7 @@ importCF opts files get = do Ok gf -> return gf Bad s -> error s ---- Ok gr <- appIOE $ compileSourceGrammar opts gf - epgf <- appIOE $ link opts (identC (BS.pack (justModuleName (last files) ++ "Abs"))) gr + epgf <- appIOE $ link opts (identS (justModuleName (last files) ++ "Abs")) gr case epgf of Ok pgf -> return pgf Bad s -> error s ---- |