summaryrefslogtreecommitdiff
path: root/src/compiler/GF/Grammar/Canonical.hs
diff options
context:
space:
mode:
authorInari Listenmaa <inari.listenmaa@gmail.com>2021-07-06 09:37:22 +0200
committerGitHub <noreply@github.com>2021-07-06 09:37:22 +0200
commitd2fb755fab8b9ba2dcde20d2854b1f90fb8c2f76 (patch)
tree106d4ff2a5b4548f3bea6a83ffcc9b8664b2f179 /src/compiler/GF/Grammar/Canonical.hs
parent5d7c687cb77ba10fd8a0ae70a605bb02f1ba59cf (diff)
parent1b66bf2773b0feda528d3b22fbaf06227a51b864 (diff)
Merge branch 'master' into concrete-new
Diffstat (limited to 'src/compiler/GF/Grammar/Canonical.hs')
-rw-r--r--src/compiler/GF/Grammar/Canonical.hs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/compiler/GF/Grammar/Canonical.hs b/src/compiler/GF/Grammar/Canonical.hs
index 0df3236ff..80e9f5e7b 100644
--- a/src/compiler/GF/Grammar/Canonical.hs
+++ b/src/compiler/GF/Grammar/Canonical.hs
@@ -11,6 +11,7 @@
module GF.Grammar.Canonical where
import Prelude hiding ((<>))
import GF.Text.Pretty
+import GF.Infra.Ident (RawIdent)
-- | A Complete grammar
data Grammar = Grammar Abstract [Concrete] deriving Show
@@ -126,7 +127,7 @@ data FlagValue = Str String | Int Int | Flt Double deriving Show
-- *** Identifiers
-type Id = String
+type Id = RawIdent
data QualId = Qual ModId Id | Unqual Id deriving (Eq,Ord,Show)
--------------------------------------------------------------------------------