mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-04-09 04:59:31 -06:00
more passives in App. Import changes are now produced with MkApp.hs, which copies the exclude list from App.gf to the concrete syntax files.
This commit is contained in:
@@ -4,7 +4,7 @@ abstract App =
|
||||
ComplVS, ComplVQ, ComplVA,
|
||||
Slash2V3, Slash3V3, SlashV2V, SlashV2S, SlashV2Q, SlashV2A,
|
||||
SlashVV, SlashV2VNP,
|
||||
ReflVP,
|
||||
PassVP, ReflVP,
|
||||
AdvVPSlash, AdVVPSlash, VPSlashPrep,
|
||||
-- Sentence
|
||||
PredSCVP,
|
||||
@@ -22,9 +22,8 @@ abstract App =
|
||||
-- Construction
|
||||
hungry_VP, thirsty_VP, has_age_VP, have_name_Cl, married_Cl, what_name_QCl, how_old_QCl, how_far_QCl,
|
||||
weather_adjCl, is_right_VP, is_wrong_VP, n_units_AP, bottle_of_CN, cup_of_CN, glass_of_CN,
|
||||
where_go_QCl, where_come_from_QCl, go_here_VP, come_here_VP, come_from_here_VP, go_there_VP, come_there_VP, come_from_there_VP,
|
||||
where_go_QCl, where_come_from_QCl, go_here_VP, come_here_VP, come_from_here_VP, go_there_VP, come_there_VP, come_from_there_VP
|
||||
-- Extensions
|
||||
PassVPSlash, PassAgentVPSlash
|
||||
]
|
||||
,Phrasebook
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ concrete AppBul of App =
|
||||
ComplVS, ComplVQ, ComplVA,
|
||||
Slash2V3, Slash3V3, SlashV2V, SlashV2S, SlashV2Q, SlashV2A,
|
||||
SlashVV, SlashV2VNP,
|
||||
ReflVP,
|
||||
PassVP, ReflVP,
|
||||
AdvVPSlash, AdVVPSlash, VPSlashPrep,
|
||||
-- Sentence
|
||||
PredSCVP,
|
||||
@@ -21,12 +21,12 @@ concrete AppBul of App =
|
||||
ExistNPAdv, ExistIPAdv,
|
||||
ImpP3,
|
||||
SelfAdvVP, SelfAdVVP, SelfNP,
|
||||
|
||||
-- Construction
|
||||
hungry_VP, thirsty_VP, has_age_VP, have_name_Cl, married_Cl, what_name_QCl, how_old_QCl, how_far_QCl,
|
||||
weather_adjCl, is_right_VP, is_wrong_VP, n_units_AP, bottle_of_CN, cup_of_CN, glass_of_CN,
|
||||
where_go_QCl, where_come_from_QCl, go_here_VP, come_here_VP, come_from_here_VP, go_there_VP, come_there_VP, come_from_there_VP,
|
||||
where_go_QCl, where_come_from_QCl, go_here_VP, come_here_VP, come_from_here_VP, go_there_VP, come_there_VP, come_from_there_VP
|
||||
-- Extensions
|
||||
PassVPSlash, PassAgentVPSlash
|
||||
]
|
||||
|
||||
,PhrasebookBul - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A]
|
||||
|
||||
@@ -7,7 +7,7 @@ concrete AppChi of App =
|
||||
ComplVS, ComplVQ, ComplVA,
|
||||
Slash2V3, Slash3V3, SlashV2V, SlashV2S, SlashV2Q, SlashV2A,
|
||||
SlashVV, SlashV2VNP,
|
||||
ReflVP,
|
||||
PassVP, ReflVP,
|
||||
AdvVPSlash, AdVVPSlash, VPSlashPrep,
|
||||
-- Sentence
|
||||
PredSCVP,
|
||||
@@ -21,12 +21,12 @@ concrete AppChi of App =
|
||||
ExistNPAdv, ExistIPAdv,
|
||||
ImpP3,
|
||||
SelfAdvVP, SelfAdVVP, SelfNP,
|
||||
|
||||
-- Construction
|
||||
hungry_VP, thirsty_VP, has_age_VP, have_name_Cl, married_Cl, what_name_QCl, how_old_QCl, how_far_QCl,
|
||||
weather_adjCl, is_right_VP, is_wrong_VP, n_units_AP, bottle_of_CN, cup_of_CN, glass_of_CN,
|
||||
where_go_QCl, where_come_from_QCl, go_here_VP, come_here_VP, come_from_here_VP, go_there_VP, come_there_VP, come_from_there_VP,
|
||||
where_go_QCl, where_come_from_QCl, go_here_VP, come_here_VP, come_from_here_VP, go_there_VP, come_there_VP, come_from_there_VP
|
||||
-- Extensions
|
||||
PassVPSlash, PassAgentVPSlash
|
||||
]
|
||||
|
||||
,PhrasebookChi - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A, at_Prep]
|
||||
|
||||
@@ -7,7 +7,7 @@ concrete AppEng of App =
|
||||
ComplVS, ComplVQ, ComplVA,
|
||||
Slash2V3, Slash3V3, SlashV2V, SlashV2S, SlashV2Q, SlashV2A,
|
||||
SlashVV, SlashV2VNP,
|
||||
ReflVP,
|
||||
PassVP, ReflVP,
|
||||
AdvVPSlash, AdVVPSlash, VPSlashPrep,
|
||||
-- Sentence
|
||||
PredSCVP,
|
||||
@@ -21,12 +21,12 @@ concrete AppEng of App =
|
||||
ExistNPAdv, ExistIPAdv,
|
||||
ImpP3,
|
||||
SelfAdvVP, SelfAdVVP, SelfNP,
|
||||
|
||||
-- Construction
|
||||
hungry_VP, thirsty_VP, has_age_VP, have_name_Cl, married_Cl, what_name_QCl, how_old_QCl, how_far_QCl,
|
||||
weather_adjCl, is_right_VP, is_wrong_VP, n_units_AP, bottle_of_CN, cup_of_CN, glass_of_CN,
|
||||
where_go_QCl, where_come_from_QCl, go_here_VP, come_here_VP, come_from_here_VP, go_there_VP, come_there_VP, come_from_there_VP,
|
||||
where_go_QCl, where_come_from_QCl, go_here_VP, come_here_VP, come_from_here_VP, go_there_VP, come_there_VP, come_from_there_VP
|
||||
-- Extensions
|
||||
PassVPSlash, PassAgentVPSlash
|
||||
]
|
||||
|
||||
,PhrasebookEng - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv]
|
||||
|
||||
@@ -7,7 +7,7 @@ concrete AppFin of App =
|
||||
ComplVS, ComplVQ, ComplVA,
|
||||
Slash2V3, Slash3V3, SlashV2V, SlashV2S, SlashV2Q, SlashV2A,
|
||||
SlashVV, SlashV2VNP,
|
||||
ReflVP,
|
||||
PassVP, ReflVP,
|
||||
AdvVPSlash, AdVVPSlash, VPSlashPrep,
|
||||
-- Sentence
|
||||
PredSCVP,
|
||||
@@ -21,12 +21,12 @@ concrete AppFin of App =
|
||||
ExistNPAdv, ExistIPAdv,
|
||||
ImpP3,
|
||||
SelfAdvVP, SelfAdVVP, SelfNP,
|
||||
|
||||
-- Construction
|
||||
hungry_VP, thirsty_VP, has_age_VP, have_name_Cl, married_Cl, what_name_QCl, how_old_QCl, how_far_QCl,
|
||||
weather_adjCl, is_right_VP, is_wrong_VP, n_units_AP, bottle_of_CN, cup_of_CN, glass_of_CN,
|
||||
where_go_QCl, where_come_from_QCl, go_here_VP, come_here_VP, come_from_here_VP, go_there_VP, come_there_VP, come_from_there_VP,
|
||||
where_go_QCl, where_come_from_QCl, go_here_VP, come_here_VP, come_from_here_VP, go_there_VP, come_there_VP, come_from_there_VP
|
||||
-- Extensions
|
||||
PassVPSlash, PassAgentVPSlash
|
||||
]
|
||||
|
||||
,PhrasebookFin - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_A]
|
||||
|
||||
@@ -7,7 +7,7 @@ concrete AppFre of App =
|
||||
ComplVS, ComplVQ, ComplVA,
|
||||
Slash2V3, Slash3V3, SlashV2V, SlashV2S, SlashV2Q, SlashV2A,
|
||||
SlashVV, SlashV2VNP,
|
||||
ReflVP,
|
||||
PassVP, ReflVP,
|
||||
AdvVPSlash, AdVVPSlash, VPSlashPrep,
|
||||
-- Sentence
|
||||
PredSCVP,
|
||||
@@ -21,12 +21,12 @@ concrete AppFre of App =
|
||||
ExistNPAdv, ExistIPAdv,
|
||||
ImpP3,
|
||||
SelfAdvVP, SelfAdVVP, SelfNP,
|
||||
|
||||
-- Construction
|
||||
hungry_VP, thirsty_VP, has_age_VP, have_name_Cl, married_Cl, what_name_QCl, how_old_QCl, how_far_QCl,
|
||||
weather_adjCl, is_right_VP, is_wrong_VP, n_units_AP, bottle_of_CN, cup_of_CN, glass_of_CN,
|
||||
where_go_QCl, where_come_from_QCl, go_here_VP, come_here_VP, come_from_here_VP, go_there_VP, come_there_VP, come_from_there_VP,
|
||||
where_go_QCl, where_come_from_QCl, go_here_VP, come_here_VP, come_from_here_VP, go_there_VP, come_there_VP, come_from_there_VP
|
||||
-- Extensions
|
||||
PassVPSlash, PassAgentVPSlash
|
||||
]
|
||||
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ concrete AppGer of App =
|
||||
ComplVS, ComplVQ, ComplVA,
|
||||
Slash2V3, Slash3V3, SlashV2V, SlashV2S, SlashV2Q, SlashV2A,
|
||||
SlashVV, SlashV2VNP,
|
||||
ReflVP,
|
||||
PassVP, ReflVP,
|
||||
AdvVPSlash, AdVVPSlash, VPSlashPrep,
|
||||
-- Sentence
|
||||
PredSCVP,
|
||||
@@ -21,12 +21,12 @@ concrete AppGer of App =
|
||||
ExistNPAdv, ExistIPAdv,
|
||||
ImpP3,
|
||||
SelfAdvVP, SelfAdVVP, SelfNP,
|
||||
|
||||
-- Construction
|
||||
hungry_VP, thirsty_VP, has_age_VP, have_name_Cl, married_Cl, what_name_QCl, how_old_QCl, how_far_QCl,
|
||||
weather_adjCl, is_right_VP, is_wrong_VP, n_units_AP, bottle_of_CN, cup_of_CN, glass_of_CN,
|
||||
where_go_QCl, where_come_from_QCl, go_here_VP, come_here_VP, come_from_here_VP, go_there_VP, come_there_VP, come_from_there_VP,
|
||||
where_go_QCl, where_come_from_QCl, go_here_VP, come_here_VP, come_from_here_VP, go_there_VP, come_there_VP, come_from_there_VP
|
||||
-- Extensions
|
||||
PassVPSlash, PassAgentVPSlash
|
||||
]
|
||||
|
||||
,PhrasebookGer - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A]
|
||||
|
||||
@@ -7,7 +7,7 @@ concrete AppHin of App =
|
||||
ComplVS, ComplVQ, ComplVA,
|
||||
Slash2V3, Slash3V3, SlashV2V, SlashV2S, SlashV2Q, SlashV2A,
|
||||
SlashVV, SlashV2VNP,
|
||||
ReflVP,
|
||||
PassVP, ReflVP,
|
||||
AdvVPSlash, AdVVPSlash, VPSlashPrep,
|
||||
-- Sentence
|
||||
PredSCVP,
|
||||
@@ -21,12 +21,12 @@ concrete AppHin of App =
|
||||
ExistNPAdv, ExistIPAdv,
|
||||
ImpP3,
|
||||
SelfAdvVP, SelfAdVVP, SelfNP,
|
||||
|
||||
-- Construction
|
||||
hungry_VP, thirsty_VP, has_age_VP, have_name_Cl, married_Cl, what_name_QCl, how_old_QCl, how_far_QCl,
|
||||
weather_adjCl, is_right_VP, is_wrong_VP, n_units_AP, bottle_of_CN, cup_of_CN, glass_of_CN,
|
||||
where_go_QCl, where_come_from_QCl, go_here_VP, come_here_VP, come_from_here_VP, go_there_VP, come_there_VP, come_from_there_VP,
|
||||
where_go_QCl, where_come_from_QCl, go_here_VP, come_here_VP, come_from_here_VP, go_there_VP, come_there_VP, come_from_there_VP
|
||||
-- Extensions
|
||||
PassVPSlash, PassAgentVPSlash
|
||||
]
|
||||
,PhrasebookHin - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A]
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ concrete AppIta of App =
|
||||
ComplVS, ComplVQ, ComplVA,
|
||||
Slash2V3, Slash3V3, SlashV2V, SlashV2S, SlashV2Q, SlashV2A,
|
||||
SlashVV, SlashV2VNP,
|
||||
ReflVP,
|
||||
PassVP, ReflVP,
|
||||
AdvVPSlash, AdVVPSlash, VPSlashPrep,
|
||||
-- Sentence
|
||||
PredSCVP,
|
||||
@@ -21,12 +21,12 @@ concrete AppIta of App =
|
||||
ExistNPAdv, ExistIPAdv,
|
||||
ImpP3,
|
||||
SelfAdvVP, SelfAdVVP, SelfNP,
|
||||
|
||||
-- Construction
|
||||
hungry_VP, thirsty_VP, has_age_VP, have_name_Cl, married_Cl, what_name_QCl, how_old_QCl, how_far_QCl,
|
||||
weather_adjCl, is_right_VP, is_wrong_VP, n_units_AP, bottle_of_CN, cup_of_CN, glass_of_CN,
|
||||
where_go_QCl, where_come_from_QCl, go_here_VP, come_here_VP, come_from_here_VP, go_there_VP, come_there_VP, come_from_there_VP,
|
||||
where_go_QCl, where_come_from_QCl, go_here_VP, come_here_VP, come_from_here_VP, go_there_VP, come_there_VP, come_from_there_VP
|
||||
-- Extensions
|
||||
PassVPSlash, PassAgentVPSlash
|
||||
]
|
||||
|
||||
,PhrasebookIta - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_A, closed_A]
|
||||
|
||||
@@ -7,7 +7,7 @@ concrete AppSpa of App =
|
||||
ComplVS, ComplVQ, ComplVA,
|
||||
Slash2V3, Slash3V3, SlashV2V, SlashV2S, SlashV2Q, SlashV2A,
|
||||
SlashVV, SlashV2VNP,
|
||||
ReflVP,
|
||||
PassVP, ReflVP,
|
||||
AdvVPSlash, AdVVPSlash, VPSlashPrep,
|
||||
-- Sentence
|
||||
PredSCVP,
|
||||
@@ -21,12 +21,12 @@ concrete AppSpa of App =
|
||||
ExistNPAdv, ExistIPAdv,
|
||||
ImpP3,
|
||||
SelfAdvVP, SelfAdVVP, SelfNP,
|
||||
|
||||
-- Construction
|
||||
hungry_VP, thirsty_VP, has_age_VP, have_name_Cl, married_Cl, what_name_QCl, how_old_QCl, how_far_QCl,
|
||||
weather_adjCl, is_right_VP, is_wrong_VP, n_units_AP, bottle_of_CN, cup_of_CN, glass_of_CN,
|
||||
where_go_QCl, where_come_from_QCl, go_here_VP, come_here_VP, come_from_here_VP, go_there_VP, come_there_VP, come_from_there_VP,
|
||||
where_go_QCl, where_come_from_QCl, go_here_VP, come_here_VP, come_from_here_VP, go_there_VP, come_there_VP, come_from_there_VP
|
||||
-- Extensions
|
||||
PassVPSlash, PassAgentVPSlash
|
||||
]
|
||||
|
||||
,PhrasebookSpa - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, cheap_A,expensive_A, open_A, closed_A]
|
||||
|
||||
@@ -6,7 +6,7 @@ concrete AppSwe of App =
|
||||
ComplVS, ComplVQ, ComplVA,
|
||||
Slash2V3, Slash3V3, SlashV2V, SlashV2S, SlashV2Q, SlashV2A,
|
||||
SlashVV, SlashV2VNP,
|
||||
ReflVP,
|
||||
PassVP, ReflVP,
|
||||
AdvVPSlash, AdVVPSlash, VPSlashPrep,
|
||||
-- Sentence
|
||||
PredSCVP,
|
||||
@@ -20,12 +20,12 @@ concrete AppSwe of App =
|
||||
ExistNPAdv, ExistIPAdv,
|
||||
ImpP3,
|
||||
SelfAdvVP, SelfAdVVP, SelfNP,
|
||||
|
||||
-- Construction
|
||||
hungry_VP, thirsty_VP, has_age_VP, have_name_Cl, married_Cl, what_name_QCl, how_old_QCl, how_far_QCl,
|
||||
weather_adjCl, is_right_VP, is_wrong_VP, n_units_AP, bottle_of_CN, cup_of_CN, glass_of_CN,
|
||||
where_go_QCl, where_come_from_QCl, go_here_VP, come_here_VP, come_from_here_VP, go_there_VP, come_there_VP, come_from_there_VP,
|
||||
where_go_QCl, where_come_from_QCl, go_here_VP, come_here_VP, come_from_here_VP, go_there_VP, come_there_VP, come_from_there_VP
|
||||
-- Extensions
|
||||
PassVPSlash, PassAgentVPSlash
|
||||
]
|
||||
|
||||
,PhrasebookSwe - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A]
|
||||
|
||||
19
examples/app/MkApp.hs
Normal file
19
examples/app/MkApp.hs
Normal file
@@ -0,0 +1,19 @@
|
||||
-- update the import list of every language
|
||||
|
||||
langs = words "Bul Chi Eng Fin Fre Ger Hin Ita Spa Swe"
|
||||
appCnc lang = "App" ++ lang ++ ".gf"
|
||||
|
||||
appAbs = "App.gf"
|
||||
|
||||
main = do
|
||||
imports <- readFile appAbs >>= return . getImports
|
||||
mapM_ (\f -> readFile f >>= writeFile ("tmp/" ++ f) . (putImports imports)) (map appCnc langs)
|
||||
|
||||
getImports = takeWhile (/= ']') . tail . dropWhile (/='[')
|
||||
|
||||
putImports i s =
|
||||
let
|
||||
(s1,_:s2) = span (/='[') s
|
||||
(_, s3) = span (/=']') s2
|
||||
in s1 ++ "[" ++ i ++ s3
|
||||
|
||||
Reference in New Issue
Block a user