summaryrefslogtreecommitdiff
path: root/src/GF/Source/AbsGF.hs
diff options
context:
space:
mode:
Diffstat (limited to 'src/GF/Source/AbsGF.hs')
-rw-r--r--src/GF/Source/AbsGF.hs15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/GF/Source/AbsGF.hs b/src/GF/Source/AbsGF.hs
index 4cdc911d2..5e00b938a 100644
--- a/src/GF/Source/AbsGF.hs
+++ b/src/GF/Source/AbsGF.hs
@@ -1,5 +1,4 @@
-
-module GF.Source.AbsGF where
+module GF.Source.AbsGF where --H
import GF.Infra.Ident --H
@@ -189,16 +188,17 @@ data Exp =
| ESelect Exp Exp
| ETupTyp Exp Exp
| EExtend Exp Exp
+ | EGlue Exp Exp
+ | EConcat Exp Exp
| EAbstr [Bind] Exp
| ECTable [Bind] Exp
| EProd Decl Exp
| ETType Exp Exp
- | EConcat Exp Exp
- | EGlue Exp Exp
| ELet [LocDef] Exp
| ELetb [LocDef] Exp
| EWhere Exp [LocDef]
| EEqs [Equation]
+ | EExample Exp String
| ELString LString
| ELin Ident
deriving (Eq,Ord,Show)
@@ -220,6 +220,7 @@ data Patt =
| PTup [PattTupleComp]
| PC Ident [Patt]
| PQC Ident Ident [Patt]
+ | PDisj Patt Patt
deriving (Eq,Ord,Show)
data PattAss =
@@ -239,10 +240,6 @@ data Sort =
| Sort_Strs
deriving (Eq,Ord,Show)
-data PattAlt =
- AltP Patt
- deriving (Eq,Ord,Show)
-
data Bind =
BIdent Ident
| BWild
@@ -262,7 +259,7 @@ data PattTupleComp =
deriving (Eq,Ord,Show)
data Case =
- Case [PattAlt] Exp
+ Case Patt Exp
deriving (Eq,Ord,Show)
data Equation =