From 805c12c49a82888fc791a238c39b8c1cf725345a Mon Sep 17 00:00:00 2001 From: aarne Date: Wed, 9 Feb 2011 17:11:45 +0000 Subject: factored DiscourseFin to 4+5 constructors --- examples/discourse/DiscourseFin.gf | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) (limited to 'examples/discourse/DiscourseFin.gf') diff --git a/examples/discourse/DiscourseFin.gf b/examples/discourse/DiscourseFin.gf index c9fc0c6d2..5e708207c 100644 --- a/examples/discourse/DiscourseFin.gf +++ b/examples/discourse/DiscourseFin.gf @@ -1,4 +1,4 @@ ---# -path=.:alltenses +--# -path=.:present concrete DiscourseFin of Discourse = LexiconFin, @@ -9,9 +9,31 @@ concrete DiscourseFin of Discourse = ** open SyntaxFin, (P = ParadigmsFin), (R = ParamX), (E = ExtraFin), Prelude in { lincat + Clause = E.ClPlus ; Marker = E.Part ; lin + PreSubjS marker temp pol cl = + E.S_SVO marker temp pol cl ; + PreVerbS marker temp pol cl = + E.S_VSO marker temp pol cl ; + PreObjS marker temp pol cl = + E.S_OSV marker temp pol cl ; + PreAdvS marker temp pol cl = + E.S_ASV marker temp pol cl ; + + NoFocClause np vp = + E.PredClPlus np vp ; + FocSubjClause np vp = + E.PredClPlusFocSubj np vp ; + FocVerbClause np vp = + E.PredClPlusFocVerb np vp ; + FocObjClause np vp obj = + lin ClPlus (E.PredClPlusFocObj np vp obj) ; + FocAdvS np vp adv = + lin ClPlus (E.PredClPlusFocAdv np vp adv) ; + +{- ClauseS marker temp pol np vp = E.S_SVO marker temp pol (E.PredClPlus np vp) ; FocSubjS marker temp pol np vp = @@ -22,7 +44,7 @@ lin E.S_SVO marker temp pol (E.PredClPlusFocObj np vp obj) ; FocAdvS marker temp pol np vp adv = E.S_SVO marker temp pol (E.PredClPlusFocAdv np vp adv) ; - +-} neutralMarker = E.noPart ; remindMarker = E.han_Part ; contrastMarker = E.pas_Part ; -- cgit v1.2.3