(Som) Make Cl, S etc. discontinuous, to add Subj to the right place

This commit is contained in:
Inari Listenmaa
2019-07-26 22:20:00 +03:00
parent e4bc20e482
commit 99e7e61863
6 changed files with 33 additions and 24 deletions
+6 -5
View File
@@ -27,7 +27,7 @@ lin
-}
-- : Temp -> Pol -> ClSlash -> SSlash ; -- (that) she had not seen
UseSlash t p cls = {s = \\b => t.s ++ p.s ++ cls.s ! b ! t.t ! t.a ! p.p} ;
--UseSlash t p cls = {s = \\b => t.s ++ p.s ++ cls.s ! b ! t.t ! t.a ! p.p} ;
--2 Imperatives
-- : VP -> Imp ;
@@ -50,8 +50,9 @@ lin
-}
-- : Temp -> Pol -> Cl -> S ;
UseCl t p cl = {s = \\b =>
let cltyp = if_then_else ClType b Subord Statement in
t.s ++ p.s ++ cl.s ! cltyp ! t.t ! t.a ! p.p
let cltyp = if_then_else ClType b Subord Statement ;
sent = cl.s ! cltyp ! t.t ! t.a ! p.p in
sent ** {beforeSTM = t.s ++ p.s ++ sent.beforeSTM} ;
} ;
-- : Temp -> Pol -> QCl -> QS ;
@@ -73,7 +74,7 @@ lin
oper
advS : Adverb -> S -> S = \a,s -> s ** {s = \\b =>
linAdv a ++ s.s ! b} ;
advS : Adverb -> S -> S = \a,s -> s ** {s = \\b => let ss = s.s ! b in
ss ** {beforeSTM = linAdv a ++ ss.beforeSTM}} ;
}