experimenting with discourse particles in DiscourseFin

1 files changed, 27 insertions, 17 deletions

diff --git a/examples/discourse/Discourse.gf b/examples/discourse/Discourse.gf
index 429fbd0c2..2ff18037c 100644
--- a/examples/discourse/Discourse.gf
+++ b/examples/discourse/Discourse.gf
@@ -9,24 +9,34 @@ abstract Discourse =
 flags startcat = S ;
 
 cat
-  Clause ; Part ;
+  Clause ;   -- clause with subject, verb, object
+  Part ;     -- discource particle
 
 fun 
-  ClauseS        : Part -> Temp -> Pol -> Clause -> S ;        -- arihan juo nyt
-  SubjKinS       : Part -> Temp -> Pol -> Clause -> S ;        -- arikinhan juo nyt
-  VerbKinS       : Part -> Temp -> Pol -> Clause -> S ;        -- arihan juokin nyt
-  AdvKinS        : Part -> Temp -> Pol -> Adv -> Clause -> S ; -- arihan juo nytkin
-  PreAdvKinS     : Part -> Temp -> Pol -> Adv -> Clause -> S ; -- nytkinhän ari juo
-  PreAdvS        : Part -> Temp -> Pol -> Adv -> Clause -> S ; -- nythän ari juo
-  PreAdvSubjKinS : Part -> Temp -> Pol -> Adv -> Clause -> S ; -- nythän arikin juo
-  PreAdvVerbKinS : Part -> Temp -> Pol -> Adv -> Clause -> S ; -- nythän ari juokin
-  PreAdvAdvKinS  : Part -> Temp -> Pol -> Adv -> Adv -> Clause -> S ; -- nythän ari juo täälläkin
-
---- AnterVerbS : Part -> PartKin -> Tense -> Pol -> Clause -> S ; -- arihan onkin juonut
---- doesn't put in right place
-
-  PredClause : NP -> VP -> Clause ; 
-
-  noPart, han_Part, pa_Part, pas_Part, ko_Part, kos_Part, kohan_Part, pahan_Part : Part ; 
+  ClauseS        : Part -> Temp -> Pol        -> Clause -> S ;   -- Jussihan juo nyt maitoa
+  SubjKinS       : Part -> Temp -> Pol        -> Clause -> S ;   -- Jussikinhan juo nyt maitoa
+  VerbKinS       : Part -> Temp -> Pol        -> Clause -> S ;   -- Jussihan juokin nyt maitoa
+  AdvKinS        : Part -> Temp -> Pol -> Adv -> Clause -> S ;   -- Jussihan juo nytkin maitoa
+  ObjKinS        : Part -> Temp -> Pol        -> Clause -> S ;   -- Jussihan juo nyt maitoakin
+
+  PreAdvS        : Part -> Temp -> Pol -> Adv -> Clause -> S ;   -- nythän Jussi juo maitoa
+  PreAdvKinS     : Part -> Temp -> Pol -> Adv -> Clause -> S ;   -- nytkinhän Jussi juo maitoa
+  PreAdvSubjKinS : Part -> Temp -> Pol -> Adv -> Clause -> S ;   -- nythän Jussikin juo maitoa
+  PreAdvVerbKinS : Part -> Temp -> Pol -> Adv -> Clause -> S ;   -- nythän Jussi juokin maitoa
+
+  PreObjS        : Part -> Temp -> Pol        -> Clause -> S ;   -- maitoahan Jussi juo nyt
+  PreObjKinS     : Part -> Temp -> Pol        -> Clause -> S ;   -- maitoakinhan Jussi juo nyt
+  PreObjSubjKinS : Part -> Temp -> Pol        -> Clause -> S ;   -- maitoahan Jussikin juo nyt
+  PreObjVerbKinS : Part -> Temp -> Pol        -> Clause -> S ;   -- maitoahan Jussi juokin nyt
+
+  PreVerbS       : Part -> Temp -> Pol        -> Clause -> S ;   -- juohan Jussi nyt maitoa
+  PreVerbSubKinS : Part -> Temp -> Pol        -> Clause -> S ;   -- juohan Jussikin nyt maitoa
+  PreVerbAdvKinS : Part -> Temp -> Pol -> Adv -> Clause -> S ;   -- juohan Jussi nytkin maitoa
+  PreVerbObjKinS : Part -> Temp -> Pol -> NP  -> Clause -> S ;   -- juohan Jussi nyt maitoakin
+
+
+  PredClause  : NP -> VP -> Clause ; 
+
+  noPart, han_Part, pas_Part : Part ; 
 
 }