GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-09 04:59:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

moved phrases like 'I am hungry' from Greetings to Words to make them more general

Browse Source
This commit is contained in:
aarne
2010-03-30 21:48:24 +00:00
parent b4abd2ebba
commit 4867b91778
18 changed files with 61 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
examples/phrasebook/Greetings.gf
View File

@@ -12,7 +12,6 @@ fun
GSorry, GSorryPol : Greeting ;
GGoodbye : Greeting ;
GBye : Greeting ;
GWhatsYourName : Greeting ;
GNiceToMeetYou : Greeting ;
GSeeYouSoon : Greeting ;
GHelp : Greeting ;
@@ -20,16 +19,12 @@ fun
GGoodMorning : Greeting ;
GGoodDay : Greeting ;
GGoodEvening : Greeting ;
GGoodNight : Greeting ;
GImHungry : Greeting ;
GImThirsty : Greeting ;
GImTired : Greeting ;
GImScared : Greeting ;
GIdontUnderstand : Greeting ;
GGoodNight : Greeting ;
GTheCheck : Greeting ;
GYes : Greeting ;
GNo : Greeting ;
GWhatsYourName : Greeting ; ---- move
}

5
examples/phrasebook/GreetingsEng.gf
View File

@@ -21,11 +21,6 @@ lin
GGoodDay = ss "good afternoon" ; ----
GGoodEvening = ss "good evening" ;
GGoodNight = ss "good night" ;
GImHungry = ss "I'm hungry" ;
GImThirsty = ss "I'm thirsty" ;
GImTired = ss "I'm tired" ;
GImScared = ss "I'm scared" ;
GIdontUnderstand = ss "I don't understand" ;
GTheCheck = ss "the bill" ;
GYes = ss "yes" ;

5
examples/phrasebook/GreetingsFin.gf
View File

@@ -24,11 +24,6 @@ lin
GGoodDay = ss "hyvää päivää" ;
GGoodEvening = ss "hyvää iltaa" ;
GGoodNight = ss "hyvää yötä" ;
GImHungry = ss "minun on nälkä" ;
GImThirsty = ss "minun on jano" ;
GImTired = ss "minä olen väsynyt" ;
GImScared = ss "minua pelottaa" ;
GIdontUnderstand = ss "en ymmärrä" ;
GTheCheck = ss "lasku" ;
GYes = ss "kyllä" ;

5
examples/phrasebook/GreetingsFre.gf
View File

@@ -25,11 +25,6 @@ lin
GGoodDay = ss "bonjour" ;
GGoodEvening = ss "bon soir" ;
GGoodNight = ss "bonne nuit" ;
GImHungry = ss "j'ai faim" ;
GImThirsty = ss "j'ai soif" ;
GImTired = ss "je suis fatigué" ; ----
GImScared = ss "j'ai peur" ;
GIdontUnderstand = ss "je ne comprends pas" ;
GTheCheck = ss "l'addition" ;
GYes = ss "oui" ; ---- si

5
examples/phrasebook/GreetingsRon.gf
View File

@@ -23,11 +23,6 @@ lin
GGoodDay = ss "bună ziua" ;
GGoodEvening = ss "bună seara" ;
GGoodNight = ss "noapte bună" ;
GImHungry = ss "mi-e foame" ;
GImThirsty = ss "mi-e sete" ;
GImTired = ss "mi-e somn" ;
GImScared = ss "mi-e frică" ;
GIdontUnderstand = ss "nu înţeleg" ;
GTheCheck = ss "nota de plată" ;
GYes = ss "da" ;

5
examples/phrasebook/GreetingsSwe.gf
View File

@@ -22,11 +22,6 @@ lin
GGoodNight = ss "god natt" ;
GWhatsYourName = ss "vad heter du" ;
GImHungry = ss "jag är hungrig" ;
GImThirsty = ss "jag är törstig" ;
GImTired = ss "jag är trött" ;
GImScared = ss "jag är rädd" ;
GIdontUnderstand = ss "jag förstår inte" ;
GTheCheck = ss "notan" ;

20
examples/phrasebook/PhrasebookDisambEng.gf
View File

@@ -1,20 +0,0 @@
--# -path=.:present
concrete PhrasebookDisambEng of Phrasebook =
PhrasebookEng - [PGreeting, Polite, Familiar, Male, Female] ** open
(R = Roles),
Prelude in {
lin
PGreeting p s h g = mkPhrase
(g.s ++ p.s ++ "(by" ++ s.s ++ ")" ++ "(to" ++ h.s ++ ")") ;
Male = {s = "a man" ; g = R.Male} ;
Female = {s = "a woman" ; g = R.Female} ;
Polite = {s = "(polite)" ; p = R.Polite} ;
Familiar = {s = "(familiar)" ; p = R.Familiar} ;
--oper
-- mkPhrase : Str -> Utt = \s -> lin Utt (ss s) ;
}

6
examples/phrasebook/Words.gf
View File

@@ -21,4 +21,10 @@ abstract Words = Sentences ** {
ASpeak : Person -> Language -> Action ;
ALove : Person -> Person -> Action ;
AHungry : Person -> Action ;
AThirsty : Person -> Action ;
ATired : Person -> Action ;
AScared : Person -> Action ;
AUnderstand : Person -> Action ;
}

5
examples/phrasebook/WordsEng.gf
View File

@@ -39,5 +39,10 @@ concrete WordsEng of Words = SentencesEng **
ASpeak p lang = mkCl p (mkV2 IrregEng.speak_V) lang ;
ALove p q = mkCl p (mkV2 (mkV "love")) q ;
AHungry p = mkCl p (mkA "hungry") ;
AThirsty p = mkCl p (mkA "thirsty") ;
ATired p = mkCl p (mkA "tired") ;
AScared p = mkCl p (mkA "scared") ;
AUnderstand p = mkCl p IrregEng.understand_V ;
}

7
examples/phrasebook/WordsFin.gf
View File

@@ -42,4 +42,11 @@ concrete WordsFin of Words = SentencesFin **
French = mkNP (mkPN "ranska") ;
Romanian = mkNP (mkPN "romania") ;
Swedish = mkNP (mkPN "ruotsi") ;
AHungry p = mkCl p have_V2 (mkNP (mkN "nälkä")) ;
AThirsty p = mkCl p have_V2 (mkNP (mkN "jano")) ;
ATired p = mkCl p (caseV partitive (mkV "väsyttää")) ;
AScared p = mkCl p (caseV partitive (mkV "pelottaa")) ;
AUnderstand p = mkCl p (mkV "ymmärtää") ;
}

7
examples/phrasebook/WordsFre.gf
View File

@@ -4,6 +4,7 @@ concrete WordsFre of Words = SentencesFre ** open
SyntaxFre,
DiffPhrasebookFre,
IrregFre,
(E = ExtraFre),
ParadigmsFre in
{
flags coding=utf8 ;
@@ -47,6 +48,12 @@ Boring = mkAPA "ennuyeux" ;
Romanian = mkNP (mkPN "roumain") ;
Swedish = mkNP (mkPN "suédois") ;
AHungry p = mkCl p (E.ComplCN have_V2 (mkCN (mkN "faim" feminine))) ;
AThirsty p = mkCl p (E.ComplCN have_V2 (mkCN (mkN "soif" feminine))) ;
ATired p = mkCl p (mkA "fatigué") ;
AScared p = mkCl p (E.ComplCN have_V2 (mkCN (mkN "peur" feminine))) ;
AUnderstand p = mkCl p (mkV IrregFre.comprendre_V2) ;
oper
mkAPA : (_ : Str) -> AP = \x -> mkAP (mkA x) ;

7
examples/phrasebook/WordsIta.gf
View File

@@ -4,6 +4,7 @@ concrete WordsIta of Words = SentencesIta ** open
SyntaxIta,
DiffPhrasebookIta,
BeschIta,
(E = ExtraIta),
ParadigmsIta in {
lin
@@ -45,6 +46,12 @@ Boring = mkAPA "noioso" ;
Romanian = mkNP (mkPN "romano") ;
Swedish = mkNP (mkPN "svedese") ;
AHungry p = mkCl p (E.ComplCN have_V2 (mkCN (mkN "fame" feminine))) ;
AThirsty p = mkCl p (E.ComplCN have_V2 (mkCN (mkN "sete" feminine))) ;
ATired p = mkCl p (mkA "stanco") ;
AScared p = mkCl p (E.ComplCN have_V2 (mkCN (mkN "paura" feminine))) ;
AUnderstand p = mkCl p (mkV "capire") ;
oper
mkAPA : (_ : Str) -> AP = \x -> mkAP (mkA x) ;

14
examples/phrasebook/WordsRon.gf
View File

@@ -3,6 +3,7 @@
concrete WordsRon of Words = SentencesRon ** open
SyntaxRon,
ParadigmsRon,
BeschRon,
DiffPhrasebookRon in
{
flags coding=utf8 ;
@@ -46,6 +47,19 @@ Boring = mkAPA "plictisitor" "plictisitoare" "plictisitori" "plictisitoare" ;
Romanian = SyntaxRon.mkNP (mkPN "română") ; ---- ?
-- Swedish = mkNP (mkPN "suédois") ;
-- AHungry p = mkCl p have_V2 (SyntaxRon.mkNP a_Det (mkN "foame")) ;
-- AThirsty p = mkCl p (E.ComplCN have_V2 (mkCN (mkN "sete" feminine))) ;
-- ATired p = mkCl p (mkA "stanco") ;
-- AScared p = mkCl p (E.ComplCN have_V2 (mkCN (mkN "paura" feminine))) ;
AUnderstand p = mkCl p (v_besch83 "înţelege") ;
{-
GImHungry = ss "mi-e foame" ;
GImThirsty = ss "mi-e sete" ;
GImTired = ss "mi-e somn" ;
GImScared = ss "mi-e frică" ;
-}
oper
mkAPA : (_,_,_,_ : Str) -> AP = \x,y,z,u -> mkAP (mkA x y z u) ;

5
examples/phrasebook/WordsSwe.gf
View File

@@ -39,5 +39,10 @@ concrete WordsSwe of Words = SentencesSwe **
ASpeak p lang = mkCl p (mkV2 (mkV "tala")) lang ;
ALove p q = mkCl p (mkV2 (mkV "älska")) q ;
AHungry p = mkCl p (mkA "hungrig") ;
AThirsty p = mkCl p (mkA "törstig") ;
ATired p = mkCl p (mkA "trött") ;
AScared p = mkCl p (mkA "rädd") ;
AUnderstand p = mkCl p (mkV "förstå" "förstod" "förstått") ;
}

2
examples/phrasebook/missing.txt
View File

@@ -3,5 +3,5 @@ PhrasebookEng :
PhrasebookFin :
PhrasebookFre :
PhrasebookIta : GNiceToMeetYou GSeeYouSoon Tea
PhrasebookRon : Coffee Finnish French GExcusePol GPleaseGivePol GSorryPol Swedish Tea
PhrasebookRon : AHungry AScared AThirsty ATired Coffee Finnish French GExcusePol GPleaseGivePol GSorryPol Swedish Tea
PhrasebookSwe : GExcusePol GPleaseGivePol GSorryPol

4
examples/phrasebook/www/phrasebook.js
View File

@@ -53,8 +53,8 @@ function show_languages(grammar) {
menu.setAttribute("onchange","new_language(this)");
menu.grammar=grammar;
menu.innerHTML="";
for(var i=1; i<lang.length; i++) { // 1, to hide Disamb...
if(lang[i].canParse) {
for(var i=0; i<lang.length; i++) {
if(lang[i].canParse && (lang[i].name[0] !='D')) { /// to hide Disamb; should be made properly...
var opt=empty("option");
opt.setAttribute("value",""+i);
opt.innerHTML=short_name(lang[i].name);

2
lib/src/romance/ExtraRomance.gf
View File

@@ -6,6 +6,8 @@ incomplete concrete ExtraRomance of ExtraRomanceAbs = CatRomance **
lin TPasseSimple = {s = []} ** {t = RPasse} ; --# notpresent
lin ComplCN v cn = insertComplement (\\_ => prepCase v.c2.c ++ cn.s ! Sg) (predV v) ;
lincat
VPI = {s : Str} ;
[VPI] = {s1,s2 : Str} ;

5
lib/src/romance/ExtraRomanceAbs.gf
View File

@@ -2,6 +2,7 @@ abstract ExtraRomanceAbs = Cat, Extra[
VPI,ListVPI,BaseVPI,ConsVPI,MkVPI,ComplVPIVV,ConjVPI,
VV,VP,Conj] ** {
fun TPasseSimple : Tense ; --# notpresent
fun
TPasseSimple : Tense ; --# notpresent
ComplCN : V2 -> CN -> VP ; -- j'ai soif
}