diff options
| author | peb <unknown> | 2005-03-15 10:18:51 +0000 |
|---|---|---|
| committer | peb <unknown> | 2005-03-15 10:18:51 +0000 |
| commit | 581ead0a73b09444593cd652c18d514ba4fc8fae (patch) | |
| tree | ac46faacbd2e7c9c71a52695164827fdd6224553 | |
| parent | 2edae8de54ebbfead80ca94f7b938163c95115fb (diff) | |
"Committed_by_peb"
| -rw-r--r-- | grammars/testConversions/MicroAbs.gf | 12 | ||||
| -rw-r--r-- | grammars/testConversions/MicroCnc.gf | 22 | ||||
| -rw-r--r-- | src/GF/Infra/Ident.hs | 5 |
3 files changed, 11 insertions, 28 deletions
diff --git a/grammars/testConversions/MicroAbs.gf b/grammars/testConversions/MicroAbs.gf index 3e2e6c24b..64cada72e 100644 --- a/grammars/testConversions/MicroAbs.gf +++ b/grammars/testConversions/MicroAbs.gf @@ -1,16 +1,10 @@ abstract MicroAbs = { -cat S; V; VV; W; +cat A; fun -sv : V -> S; -vars : VV; -ww : W -> W; -svw : V -> W -> S; +a, ab : A; +redup : A -> A; -supr : V -> V -> S; -supredup : S -> S -> S; -suplbl : V -> S; -reorder : V -> V -> V; } diff --git a/grammars/testConversions/MicroCnc.gf b/grammars/testConversions/MicroCnc.gf index a88795ec4..ed4891c7d 100644 --- a/grammars/testConversions/MicroCnc.gf +++ b/grammars/testConversions/MicroCnc.gf @@ -1,26 +1,14 @@ -concrete MicroCnc of MicroAbs = open MicroRes in { +concrete MicroCnc of MicroAbs = { lincat -S = {s : Str}; -VV = {a : {s1:Str ; s2:Str}}; -V = {s1 : Str ; s2 : Str ; p : PQ}; -W = {s : Num => Str ; p : PQ => Num}; +A = {s : Str}; lin -sv x = {s = x.s1 ++ x.s2}; -vars = {a = variants { {s1="a" ; s2=variants{"b";"c"}} ; {s1="d";s2="e"} }}; -ww x = {s = table {Sg => x.s!(x.p!P); - Pl => x.s!(x.p!Q Pl)}; - p = table {P => Sg ; Q n => n}}; -svw x y = {s = x.s2 ++ y.s!(y.p!x.p) ++ x.s1}; +a = {s = "a"}; +ab = {s = variants{"c";"b"}}; +redup x = {s = x.s ++ x.s}; -supr x y = {s = x.s1 ++ "a" ++ x.s2}; -supredup x y = {s = x.s ++ "b" ++ x.s}; -suplbl x = {s = x.s1}; -reorder x y = {s1 = x.s2 ++ y.s1 ++ x.s1; - s2 = y.s2 ++ y.s1; - p = x.p}; } diff --git a/src/GF/Infra/Ident.hs b/src/GF/Infra/Ident.hs index 2589357ef..6b5c51bf3 100644 --- a/src/GF/Infra/Ident.hs +++ b/src/GF/Infra/Ident.hs @@ -5,9 +5,9 @@ -- Stability : (stable) -- Portability : (portable) -- --- > CVS $Date: 2005/02/24 11:46:34 $ +-- > CVS $Date: 2005/03/15 11:18:07 $ -- > CVS $Author: peb $ --- > CVS $Revision: 1.5 $ +-- > CVS $Revision: 1.6 $ -- -- (Description of the module) ----------------------------------------------------------------------------- @@ -36,6 +36,7 @@ data Ident = | IV (Int,String) -- ^ /INTERNAL/ variable | IA (String,Int) -- ^ /INTERNAL/ argument of cat at position | IAV (String,Int,Int) -- ^ /INTERNAL/ argument of cat with bindings at position +-- deriving (Eq, Ord, Show, Read) |