diff --git a/grammars/health/Health.gf b/grammars/health/Health.gf index a55f4fcb9..0ed0d941f 100644 --- a/grammars/health/Health.gf +++ b/grammars/health/Health.gf @@ -9,7 +9,20 @@ fun PainIn : Patient -> BodyPart -> Prop ; Injured : Patient -> BodyPart -> Prop ; Broken : Patient -> BodyPart -> Prop ; - HaveIllness : Patient -> Illness -> Prop ; +-- HaveIllness : Patient -> Illness -> Prop ; + HaveAsthma : Patient -> Prop ; + HaveHeartburn : Patient -> Prop ; + HaveInfluenza : Patient -> Prop ; + HaveRheumatism : Patient -> Prop ; + HaveCystitis : Patient -> Prop ; + HaveAsthma : Patient -> Prop ; + HaveArthritis : Patient -> Prop ; + HaveDiabetes : Patient -> Prop ; + HaveTonsillitis : Patient -> Prop ; + HaveConstipation : Patient -> Prop ; + HaveMalaria : Patient -> Prop ; + HaveDiarrhea : Patient -> Prop ; + HaveSkinAllergy : Patient -> Prop ; NeedDoctor : Patient -> Specialization -> Prop ; NeedMedicine : Patient -> Medicine -> Prop ; TakeMedicine : Patient -> Medicine -> Prop ; @@ -26,18 +39,18 @@ fun IPatientHe : Patient ; IPatientShe : Patient ; - Influenza : Illness ; - Malaria : Illness ; - Diarrhea : Illness ; - SkinAllergy : Illness ; - Heartburn : Illness ; - Rheumatism : Illness ; - Cystitis : Illness ; - Asthma : Illness ; - Arthritis : Illness ; - Diabetes : Illness ; - Tonsillitis : Illness ; - Constipation : Illness ; +-- Influenza : Illness ; +-- Malaria : Illness ; +-- Diarrhea : Illness ; +-- SkinAllergy : Illness ; +-- Heartburn : Illness ; +-- Rheumatism : Illness ; +-- Cystitis : Illness ; +-- Asthma : Illness ; +-- Arthritis : Illness ; +-- Diabetes : Illness ; +-- Tonsillitis : Illness ; +-- Constipation : Illness ; Dentist : Specialization ; Gynecologist : Specialization ; diff --git a/grammars/health/HealthEng.gf b/grammars/health/HealthEng.gf index 2acca0c6b..b834d8020 100644 --- a/grammars/health/HealthEng.gf +++ b/grammars/health/HealthEng.gf @@ -28,18 +28,18 @@ lin And x y = ConjS AndConj (TwoS x y) ; - Influenza = cnNonhuman "influenza" ; - Malaria = cnNonhuman "malaria" ; - Diarrhea = cnNonhuman "diarrhea" ; - SkinAllergy = AppFun (mkFun (nNonhuman "skin") []) (MassNP (cnNonhuman "allergy")) ; - Heartburn = cnNonhuman "heartburn" ; - Rheumatism = cnNonhuman "rheumatism" ; - Cystitis = cnNonhuman "cystitis" ; - Asthma = cnNonhuman "asthma" ; - Arthritis = cnNonhuman "arthritis" ; - Diabetes = cnNonhuman "diabetes" ; - Tonsillitis = cnNonhuman "tonsillitis" ; - Constipation = cnNonhuman "constipation" ; +-- Influenza = cnNonhuman "influenza" ; +-- Malaria = cnNonhuman "malaria" ; +-- Diarrhea = cnNonhuman "diarrhea" ; +-- SkinAllergy = AppFun (mkFun (nNonhuman "skin") []) (MassNP (cnNonhuman "allergy")) ; +-- Heartburn = cnNonhuman "heartburn" ; +-- Rheumatism = cnNonhuman "rheumatism" ; +-- Cystitis = cnNonhuman "cystitis" ; +-- Asthma = cnNonhuman "asthma" ; +-- Arthritis = cnNonhuman "arthritis" ; +-- Diabetes = cnNonhuman "diabetes" ; +-- Tonsillitis = cnNonhuman "tonsillitis" ; +-- Constipation = cnNonhuman "constipation" ; Dentist = cnHuman "dentist" ; Gynecologist = cnHuman "gynecologist" ; @@ -95,7 +95,8 @@ lin Fever = DetNP (aDet** {lock_Det = <>}) (cnNoHum (nounReg "fever")** {lock_CN = <>}) ; - HaveIllness patient illness = predV2 tvHave patient (DetNP (nullDet** {lock_Det = <>}) illness) ; +-- HaveIllness patient illness = predV2 tvHave patient (DetNP (nullDet** {lock_Det = <>}) illness) ; + HaveAsthma patient = predV2 tvHave patient (DetNP (nullDet** {lock_Det = <>}) (cnNonhuman "asthma")) ; Complain = predV2 tvHave ; NeedDoctor patient doctor = predV2 (mkTransVerbDir (regVerbP3 "need")**{lock_TV = <>})