diff --git a/examples/letter/LetterEng.gf b/examples/letter/LetterEng.gf index 3ceb7896c..e5da98b86 100644 --- a/examples/letter/LetterEng.gf +++ b/examples/letter/LetterEng.gf @@ -12,12 +12,12 @@ param Num = sg | pl ; param Kas = nom | acc ; param DepNum = depnum | cnum Num ; -lintype SS = {s : Str} ; -lintype SSDep = {s : Num => Sex => Str} ; -- needs Num and Sex -lintype SSSrc = {s : Str ; n : Num ; x : Sex} ; -- gives Num and Sex -lintype SSSrc2 = {s : Num => Sex => Str ; n : DepNum ; x : Sex} ; -- gives and needs -lintype SSDep2 = {s : DepNum => Sex => Num => Sex => Str} ; -- needs Auth's & Recp's -lintype SSSrcNum = {s : Str ; n : Num} ; -- gives Num only +oper SS = {s : Str} ; +oper SSDep = {s : Num => Sex => Str} ; -- needs Num and Sex +oper SSSrc = {s : Str ; n : Num ; x : Sex} ; -- gives Num and Sex +oper SSSrc2 = {s : Num => Sex => Str ; n : DepNum ; x : Sex} ; -- gives and needs +oper SSDep2 = {s : DepNum => Sex => Num => Sex => Str} ; -- needs Auth's & Recp's +oper SSSrcNum = {s : Str ; n : Num} ; -- gives Num only oper diff --git a/examples/letter/LetterFin.gf b/examples/letter/LetterFin.gf index 19d131fae..f19dfe65c 100644 --- a/examples/letter/LetterFin.gf +++ b/examples/letter/LetterFin.gf @@ -15,12 +15,12 @@ param Kas = nom | acc ; param DepNum = depnum | cnum Num ; param DepGen = depgen | cgen Gen ; -lintype SS = {s : Str} ; -lintype SSDep = {s : Num => Gen => Str} ; -- needs Num and Gen -lintype SSSrc = {s : Str ; n : Num ; g : Gen} ; -- gives Num and Gen -lintype SSSrc2 = {s : Num => Gen => Str ; n : DepNum ; g : DepGen} ; -- gives&needs -lintype SSDep2 = {s : DepNum => DepGen => Num => Gen => Str} ; -- needs Auth's&Rec's -lintype SSSrcGen = {s : Str ; n : Num ; g : Gen} ; -- gives Num and Gen +oper SS = {s : Str} ; +oper SSDep = {s : Num => Gen => Str} ; -- needs Num and Gen +oper SSSrc = {s : Str ; n : Num ; g : Gen} ; -- gives Num and Gen +oper SSSrc2 = {s : Num => Gen => Str ; n : DepNum ; g : DepGen} ; -- gives&needs +oper SSDep2 = {s : DepNum => DepGen => Num => Gen => Str} ; -- needs Auth's&Rec's +oper SSSrcGen = {s : Str ; n : Num ; g : Gen} ; -- gives Num and Gen oper ss : Str -> SS = \s -> {s = s} ; diff --git a/examples/letter/LetterFre.gf b/examples/letter/LetterFre.gf index 6e2bbc850..a89ab7447 100644 --- a/examples/letter/LetterFre.gf +++ b/examples/letter/LetterFre.gf @@ -14,12 +14,12 @@ param Kas = nom | acc ; param DepNum = depnum | cnum Num ; param DepGen = depgen | cgen Gen ; -lintype SS = {s : Str} ; -lintype SSDep = {s : Num => Gen => Str} ; -- needs Num and Gen -lintype SSSrc = {s : Str ; n : Num ; g : Gen} ; -- gives Num and Gen -lintype SSSrc2 = {s : Num => Gen => Str ; n : DepNum ; g : DepGen} ; -- gives&needs -lintype SSDep2 = {s : DepNum => DepGen => Num => Gen => Str} ; -- needs Auth's&Rec's -lintype SSSrcGen = {s : Str ; n : Num ; g : Gen} ; -- gives Num and Gen +oper SS = {s : Str} ; +oper SSDep = {s : Num => Gen => Str} ; -- needs Num and Gen +oper SSSrc = {s : Str ; n : Num ; g : Gen} ; -- gives Num and Gen +oper SSSrc2 = {s : Num => Gen => Str ; n : DepNum ; g : DepGen} ; -- gives&needs +oper SSDep2 = {s : DepNum => DepGen => Num => Gen => Str} ; -- needs Auth's&Rec's +oper SSSrcGen = {s : Str ; n : Num ; g : Gen} ; -- gives Num and Gen oper ss : Str -> SS = \s -> {s = s} ; diff --git a/examples/letter/LetterHeb.gf b/examples/letter/LetterHeb.gf index 62443724a..c50d6102c 100644 --- a/examples/letter/LetterHeb.gf +++ b/examples/letter/LetterHeb.gf @@ -10,12 +10,12 @@ param Kas = nom | dat | acc ; param DepNum = depnum | cnum Num ; param DepGen = depgen | cgen Gen ; -lintype SS = {s : Str} ; -lintype SSDep = {s : Num => Gen => Str} ; -- needs Num and Gen -lintype SSSrc = {s : Str ; n : Num ; g : Gen} ; -- gives Num and Gen -lintype SSSrc2 = {s : Num => Gen => Str ; n : DepNum ; g : DepGen} ; -- gives&needs -lintype SSDep2 = {s : DepNum => DepGen => Num => Gen => Str} ; -- needs Auth's&Rec's -lintype SSSrcGen = {s : Str ; n : Num ; g : Gen} ; -- gives Num and Gen +oper SS = {s : Str} ; +oper SSDep = {s : Num => Gen => Str} ; -- needs Num and Gen +oper SSSrc = {s : Str ; n : Num ; g : Gen} ; -- gives Num and Gen +oper SSSrc2 = {s : Num => Gen => Str ; n : DepNum ; g : DepGen} ; -- gives&needs +oper SSDep2 = {s : DepNum => DepGen => Num => Gen => Str} ; -- needs Auth's&Rec's +oper SSSrcGen = {s : Str ; n : Num ; g : Gen} ; -- gives Num and Gen oper ss : Str -> SS = \s -> {s = s} ; diff --git a/examples/letter/LetterRus.gf b/examples/letter/LetterRus.gf index ef9ec25fe..cad177946 100644 --- a/examples/letter/LetterRus.gf +++ b/examples/letter/LetterRus.gf @@ -8,12 +8,12 @@ param Kas = nom | acc ; param DepNum = depnum | cnum Num ; param DepGen = depgen | cgen Gen ; -lintype SS = {s : Str} ; -lintype SSDep = {s : Num => Gen => Str} ; -- needs Num and Gen -lintype SSSrc = {s : Str ; n : Num ; g : Gen} ; -- gives Num and Gen -lintype SSSrc2 = {s : Num => Gen => Str ; n : DepNum ; g : DepGen} ; -- gives&needs -lintype SSDep2 = {s : DepNum => DepGen => Num => Gen => Str} ; -- needs Auth's&Rec's -lintype SSSrcGen = {s : Str ; n : Num ; g : Gen} ; -- gives Num and Gen +oper SS = {s : Str} ; +oper SSDep = {s : Num => Gen => Str} ; -- needs Num and Gen +oper SSSrc = {s : Str ; n : Num ; g : Gen} ; -- gives Num and Gen +oper SSSrc2 = {s : Num => Gen => Str ; n : DepNum ; g : DepGen} ; -- gives&needs +oper SSDep2 = {s : DepNum => DepGen => Num => Gen => Str} ; -- needs Auth's&Rec's +oper SSSrcGen = {s : Str ; n : Num ; g : Gen} ; -- gives Num and Gen oper ss : Str -> SS = \s -> {s = s} ; diff --git a/examples/letter/LetterSwe.gf b/examples/letter/LetterSwe.gf index e26bfb05b..f1c296323 100644 --- a/examples/letter/LetterSwe.gf +++ b/examples/letter/LetterSwe.gf @@ -8,8 +8,8 @@ concrete LetterSwe of Letter = { flags lexer=textlit ; unlexer=textlit ; -printname Letter = "Brev" ; -printname MkLetter = "brevmall" ; +printname cat Letter = "Brev" ; +printname fun MkLetter = "brevmall" ; param Sex = masc | fem ; param Gen = en | ett ; @@ -17,12 +17,12 @@ param Num = sg | pl ; param Kas = nom | acc ; param DepNum = depnum | cnum Num ; -lintype SS = {s : Str} ; -lintype SSDep = {s : Num => Sex => Str} ; -- needs Num and Sex -lintype SSSrc = {s : Str ; n : Num ; x : Sex} ; -- gives Num and Sex -lintype SSSrc2 = {s : Num => Sex => Str ; n : DepNum ; x : Sex} ; -- gives and needs -lintype SSDep2 = {s : DepNum => Sex => Num => Sex => Str} ; -- needs Auth's & Recp's -lintype SSSrcGen = {s : Str ; n : Num ; g : Gen} ; -- gives Num and Gen +oper SS = {s : Str} ; +oper SSDep = {s : Num => Sex => Str} ; -- needs Num and Sex +oper SSSrc = {s : Str ; n : Num ; x : Sex} ; -- gives Num and Sex +oper SSSrc2 = {s : Num => Sex => Str ; n : DepNum ; x : Sex} ; -- gives and needs +oper SSDep2 = {s : DepNum => Sex => Num => Sex => Str} ; -- needs Auth's & Recp's +oper SSSrcGen = {s : Str ; n : Num ; g : Gen} ; -- gives Num and Gen oper diff --git a/lib/prelude/Precedence.gf b/lib/prelude/Precedence.gf index 1e0b1a77c..62775958c 100644 --- a/lib/prelude/Precedence.gf +++ b/lib/prelude/Precedence.gf @@ -7,7 +7,7 @@ resource Precedence = open Prelude in { param Prec = p4 | p3 | p2 | p1 | p0 ; -lintype +oper PrecTerm = Prec => Str ; oper @@ -75,7 +75,7 @@ mkInfixR : Str -> Prec -> PrecTerm -> PrecTerm -> PrecTerm = -- alternative: -- precedence as inherent feature -lintype TermWithPrec = {s : Str ; p : Prec} ; +oper TermWithPrec = {s : Str ; p : Prec} ; oper mkpPrec : Str -> Prec -> TermWithPrec =