change type of pn

This commit is contained in:
Herbert Lange
2019-06-28 16:19:22 +02:00
parent dfbe4b9d93
commit de44443068
5 changed files with 16 additions and 18 deletions

View File

@@ -83,7 +83,7 @@ concrete CatLat of Cat = CommonX-[Adv] ** open ResLat, ParamX, Prelude in {
N = Noun ; N = Noun ;
N2 = Noun ** { c : Prep } ; N2 = Noun ** { c : Prep } ;
N3 = Noun ** { c : Prep ; c2 : Prep } ; N3 = Noun ** { c : Prep ; c2 : Prep } ;
PN = Noun ; PN = { s : Case => Str ; n : Number ; g : Gender } ;
A2 = Adjective ** { c : Prep} ; A2 = Adjective ** { c : Prep} ;
linref linref

View File

@@ -154,7 +154,7 @@ lin
open_V2 = mkV2 (mkV "aperire") ; -- aperio, aperui, apertum 4 (Langenscheidts) open_V2 = mkV2 (mkV "aperire") ; -- aperio, aperui, apertum 4 (Langenscheidts)
paint_V2A = mkV2A (mkV "pingere" "pingo" "pinxi" "pictum" ) Acc_Prep ; -- pingo, pinxi, pictum 3 (Langenscheidts) paint_V2A = mkV2A (mkV "pingere" "pingo" "pinxi" "pictum" ) Acc_Prep ; -- pingo, pinxi, pictum 3 (Langenscheidts)
paper_N = mkN "charta" ; -- -ae f. (http://la.wikipedia.org/wiki/Charta / Pons) paper_N = mkN "charta" ; -- -ae f. (http://la.wikipedia.org/wiki/Charta / Pons)
paris_PN = mkPN (mkN "Lutetia") ; -- -ae f. (http://la.wikipedia.org/wiki/Lutetia) paris_PN = mkPN (mkN "Lutetia") singular ; -- -ae f. (http://la.wikipedia.org/wiki/Lutetia)
peace_N = mkN "pax" "pacis" feminine ; -- pacis f. (Langenscheidts) peace_N = mkN "pax" "pacis" feminine ; -- pacis f. (Langenscheidts)
pen_N = mkN "stilus" ; -- -i m. (Langenscheidts) pen_N = mkN "stilus" ; -- -i m. (Langenscheidts)
planet_N = mkN "planeta" ; -- -ae m. (http://la.wikipedia.org/wiki/Planeta) planet_N = mkN "planeta" ; -- -ae m. (http://la.wikipedia.org/wiki/Planeta)
@@ -384,7 +384,7 @@ lin
rule_N = mkN "regula" ; -- -ae f. (Langenscheidts) rule_N = mkN "regula" ; -- -ae f. (Langenscheidts)
-- added 4/6/2007 -- added 4/6/2007
john_PN = mkPN (mkN "Iohannes") ; -- (http://en.wikipedia.org/wiki/John_(given_name)) john_PN = mkPN (mkN "Iohannes") singular ; -- (http://en.wikipedia.org/wiki/John_(given_name))
question_N = mkN "rogatio" "rogationis" feminine; -- -onis f. (Langenscheidts) question_N = mkN "rogatio" "rogationis" feminine; -- -onis f. (Langenscheidts)
ready_A = mkA "paratus" ; -- 3 (Langenscheidts) ready_A = mkA "paratus" ; -- 3 (Langenscheidts)
reason_N = mkN "causa" ; -- -ae f. (Langenscheidts) reason_N = mkN "causa" ; -- -ae f. (Langenscheidts)

View File

@@ -16,11 +16,9 @@ concrete NounLat of Noun = CatLat ** open ResLat, Prelude, ConjunctionLat in {
-- UsePN : PN -> NP ; -- John -- UsePN : PN -> NP ; -- John
UsePN pn = UsePN pn =
lin NP pn **
{ {
s = pn.s ! Sg ; s = \\_ => pn.s ;
g = pn.g ;
n = Sg ;
p = P3 ; p = P3 ;
adv = "" ; adv = "" ;
preap, postap = { s = \\_ => "" } ; preap, postap = { s = \\_ => "" } ;

View File

@@ -128,7 +128,7 @@ oper
-- } ; -- } ;
-- To be implemented, just place holders -- To be implemented, just place holders
mkPN : N -> PN = \n -> lin PN n ; mkPN : N -> Number -> PN = \noun,num -> lin PN (noun ** { s = noun.s ! num ; n = num } ) ;
mkN2 : N -> Prep -> N2 = \n,p -> lin N2 ( n ** { c = p } ); mkN2 : N -> Prep -> N2 = \n,p -> lin N2 ( n ** { c = p } );
mkN3 : N -> Prep -> Prep -> N3 = \n,p1,p2 -> lin N3 ( n **{ c = p1 ; c2 = p2 } ) ; mkN3 : N -> Prep -> Prep -> N3 = \n,p1,p2 -> lin N3 ( n **{ c = p1 ; c2 = p2 } ) ;
mkV2S : V -> Prep -> V2S = \v,p -> lin V2S ( v ** { c = p } ) ; mkV2S : V -> Prep -> V2S = \v,p -> lin V2S ( v ** { c = p } ) ;

View File

@@ -3,10 +3,10 @@
concrete SymbolLat of Symbol = CatLat ** open Prelude, ResLat, ParadigmsLat, TenseX in { concrete SymbolLat of Symbol = CatLat ** open Prelude, ResLat, ParadigmsLat, TenseX in {
lin lin
SymbPN i = {s = \\n,c => i.s ; g = Neutr} ; --- c SymbPN i = {s = \\c => i.s ; g = Neutr ; n = Sg } ; --- c
IntPN i = {s = \\n,c => i.s ; g = Neutr} ; --- c IntPN i = {s = \\c => i.s ; g = Neutr ; n = Sg } ; --- c
FloatPN i = {s = \\n,c => i.s ; g = Neutr} ; --- c FloatPN i = {s = \\c => i.s ; g = Neutr ; n = Sg } ; --- c
NumPN i = {s = \\n,c => i.s ! Neutr ! c; g = Neutr} ; --- c NumPN i = {s = \\c => i.s ! Neutr ! c; g = Neutr ; n = Pl } ; --- c
CNIntNP cn i = { CNIntNP cn i = {
s = \\c => (cn.s ! Sg ! Nom ++ i.s) ; s = \\c => (cn.s ! Sg ! Nom ++ i.s) ;
g = cn.g ; g = cn.g ;