GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-05-21 00:52:51 -06:00
Code Issues Packages Projects Releases Wiki Activity

completed OverGrammar with missing params

Browse Source
This commit is contained in:
aarne
2007-07-02 20:00:25 +00:00
parent e465bd5b93
commit 8e4b7f73a2
4 changed files with 276 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
lib/resource-1.0/api/toplevel/constr.gf
View File

@@ -319,9 +319,12 @@
futureTense : Tense = TFut ; --# notpresent
conditionalTense : Tense = TCond ; --# notpresent
-- singularImpForm : ImpForm = ss [] ;
-- pluralImpForm : ImpForm = ss [] ;
-- politeImpForm : ImpForm = ss [] ;
singularImpForm : ImpForm
= {p= IFSg; s= []} ;
pluralImpForm : ImpForm
= {p= IFPl; s= []} ;
politeImpForm : ImpForm
= {p= IFPol; s= []} ;
-- mkUttImp : ImpForm -> Pol -> Imp -> Utt = \f,p,i -> case f of {
IFSg => UttImpSg p i ;
@@ -335,11 +338,11 @@
mkUtt : Cl -> Utt -- John walks
= \c -> UttS (UseCl TPres ASimul PPos c) ;
mkUtt : QS -> Utt -- is it good
= UttQS ;
-- mkUtt : ImpForm -> Pol -> Imp -> Utt -- don't help yourselves
-- = mkUttImp ;
-- mkUtt : ImpForm -> Imp -> Utt -- help yourselves
-- = \f -> mkUttImp f PPos ;
= UttQS
mkUtt : ImpForm -> Pol -> Imp -> Utt -- don't help yourselves
= \f -> mkUttImp f.p f.s ;
mkUtt : ImpForm -> Imp -> Utt -- help yourselves
= \f -> mkUttImp f.p f.s PPos ;
mkUtt : Pol -> Imp -> Utt -- (don't) help yourself
= UttImpSg ;
mkUtt : Imp -> Utt -- help yourself
@@ -509,9 +512,12 @@
oper
emptyText : Text = TEmpty ; -- [empty text]
-- fullStopPunct : Punct = {p = PFullStop ; s = []} ; -- .
-- questMarkPunct : Punct = {p = PQuestMark ; s = []} ; -- .
-- exclMarkPunct : Punct = {p = PExclMark ; s = []} ; -- .
fullStopPunct : Punct
= {p= PFullStop; s= []} ; -- .
questMarkPunct : Punct
= {p= PQuestMark; s= []} ; -- .
exclMarkPunct : Punct
= {p= PExclMark; s= []} ; -- .
-- lincat Impform = {p : PImpForm ; s : Str} ;
-- lincat Punct = {p : PPunct ; s : Str} ;
@@ -519,18 +525,10 @@
-- param PPunct = PFullStop | PExclMark | PQuestMark ;
mkText = overload {
-- mkText : Phr -> Punct -> Text -> Text =
-- \phr,punct,text -> case punct of {
-- PFullStop => TFullStop phr text ;
-- PExclMark => TExclMark phr text ;
-- PQuestMark => TQuestMark phr text
-- } ;
-- mkText : Phr -> Punct -> Text =
-- \phr,punct -> case punct of {
-- PFullStop => TFullStop phr TEmpty ;
-- PExclMark => TExclMark phr TEmpty ;
-- PQuestMark => TQuestMark phr TEmpty
-- } ;
mkText : Phr -> Punct -> Text -> Text
= \p,f -> mkPhrPunct p f.p f.s ;
mkText : Phr -> Punct -> Text
= \p,f -> mkPhrPunct p f.p f.s TEmpty ;
mkText : Phr -> Text -- John walks.
= \x -> TFullStop x TEmpty ;
mkText : Utt -> Text