diff options
| author | kr.angelov <kr.angelov@chalmers.se> | 2008-05-21 13:10:54 +0000 |
|---|---|---|
| committer | kr.angelov <kr.angelov@chalmers.se> | 2008-05-21 13:10:54 +0000 |
| commit | c544ef31823c7d2c28c28cae408cca5d71e6978d (patch) | |
| tree | b9693bc684d1737062e45438cedf7536cf5513d5 /src-3.0/GF/Formalism | |
| parent | 529374caaa6d451400f57f1ff82106d89d603944 (diff) | |
use ByteString internally in Ident, CId and Label
Diffstat (limited to 'src-3.0/GF/Formalism')
| -rw-r--r-- | src-3.0/GF/Formalism/FCFG.hs | 5 | ||||
| -rw-r--r-- | src-3.0/GF/Formalism/SimpleGFC.hs | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src-3.0/GF/Formalism/FCFG.hs b/src-3.0/GF/Formalism/FCFG.hs index 5f9656658..2f3994b6c 100644 --- a/src-3.0/GF/Formalism/FCFG.hs +++ b/src-3.0/GF/Formalism/FCFG.hs @@ -41,7 +41,6 @@ import GF.Formalism.Utilities import qualified GF.GFCC.CId as AbsGFCC import GF.Infra.PrintClass - ------------------------------------------------------------ -- Token type FToken = String @@ -72,7 +71,7 @@ data FSymbol type FName = NameProfile AbsGFCC.CId isCoercionF :: FName -> Bool -isCoercionF (Name fun [Unify [0]]) = fun == AbsGFCC.CId "_" +isCoercionF (Name fun [Unify [0]]) = fun == AbsGFCC.wildCId isCoercionF _ = False @@ -87,7 +86,7 @@ data FRule = FRule FName [FCat] FCat (Array FIndex (Array FPointPos FSymbol) -- pretty-printing instance Print AbsGFCC.CId where - prt (AbsGFCC.CId s) = s + prt = AbsGFCC.prCId instance Print FSymbol where prt (FSymCat c l n) = "($" ++ prt n ++ "!" ++ prt l ++ ")" diff --git a/src-3.0/GF/Formalism/SimpleGFC.hs b/src-3.0/GF/Formalism/SimpleGFC.hs index ea1f9dc12..22298eece 100644 --- a/src-3.0/GF/Formalism/SimpleGFC.hs +++ b/src-3.0/GF/Formalism/SimpleGFC.hs @@ -27,7 +27,7 @@ type Var = Ident.Ident type Label = AbsGFC.Label anyVar :: Var -anyVar = Ident.wildIdent +anyVar = Ident.identW ---------------------------------------------------------------------- -- * simple GFC |