msyds/gf-core
1
0
Fork 0
forked from GitHub/gf-core
Code Pull Requests Activity

added PassV2 to App; PassVPSlash did not work as VPSlash was disabled for speed reasons

Browse Source
This commit is contained in:
aarne
2015-07-21 13:01:29 +00:00
parent e4525d1565
commit 3d22d05bdc
16 changed files with 63 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
examples/app/App.gf
View File

@@ -17,9 +17,10 @@ abstract App =
ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP, ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP,
-- Idiom -- Idiom
CleftNP, CleftAdv, CleftNP, CleftAdv,
ImpP3 ImpP3,
-- Construction -- Construction
-- Extensions -- Extensions
PassVPSlash, PassAgentVPSlash -- not reachable anyway
] ]
,Phrasebook ,Phrasebook
@@ -33,6 +34,8 @@ fun
Phrase_Chunk : Phrase -> Chunk ; Phrase_Chunk : Phrase -> Chunk ;
ComplV2 : V2 -> NP -> VP ; ComplV2 : V2 -> NP -> VP ;
PassV2 : V2 -> VP ;
{- {-
ComplV2V : V2V -> NP -> VP -> VP ; ComplV2V : V2V -> NP -> VP -> VP ;

5
examples/app/AppBul.gf
View File

@@ -18,9 +18,10 @@ concrete AppBul of App =
ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP, ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP,
-- Idiom -- Idiom
CleftNP, CleftAdv, CleftNP, CleftAdv,
ImpP3 ImpP3,
-- Construction -- Construction
-- Extensions -- Extensions
PassVPSlash, PassAgentVPSlash -- not reachable anyway
] ]
,PhrasebookBul - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A] ,PhrasebookBul - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A]
@@ -49,4 +50,6 @@ ComplV3 v np vp = mkVP v np vp ;
ComplV2 v np = mkVP v np ; ComplV2 v np = mkVP v np ;
PassV2 v2 = passiveVP v2 ;
PassV2 v2 = passiveVP v2 ;
} }

5
examples/app/AppCat.gf
View File

@@ -19,9 +19,10 @@ concrete AppCat of App =
ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP, ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP,
-- Idiom -- Idiom
CleftNP, CleftAdv, CleftNP, CleftAdv,
ImpP3 ImpP3,
-- Construction -- Construction
-- Extensions -- Extensions
PassVPSlash, PassAgentVPSlash -- not reachable anyway
] ]
,PhrasebookCat - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, cheap_A,expensive_A, open_A, closed_A] ,PhrasebookCat - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, cheap_A,expensive_A, open_A, closed_A]
@@ -49,4 +50,6 @@ ComplV3 v np vp = mkVP v np vp ;
ComplV2 v np = mkVP v np ; ComplV2 v np = mkVP v np ;
PassV2 v2 = passiveVP v2 ;
PassV2 v2 = passiveVP v2 ;
} }

5
examples/app/AppChi.gf
View File

@@ -18,9 +18,10 @@ concrete AppChi of App =
ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP, ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP,
-- Idiom -- Idiom
CleftNP, CleftAdv, CleftNP, CleftAdv,
ImpP3 ImpP3,
-- Construction -- Construction
-- Extensions -- Extensions
PassVPSlash, PassAgentVPSlash -- not reachable anyway
] ]
,PhrasebookChi - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A, at_Prep, by_Prep] ,PhrasebookChi - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A, at_Prep, by_Prep]
@@ -50,4 +51,6 @@ ComplV3 v np vp = mkVP v np vp ;
ComplV2 v np = mkVP v np ; ComplV2 v np = mkVP v np ;
PassV2 v2 = passiveVP v2 ;
PassV2 v2 = passiveVP v2 ;
} }

5
examples/app/AppDut.gf
View File

@@ -18,9 +18,10 @@ concrete AppDut of App =
ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP, ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP,
-- Idiom -- Idiom
CleftNP, CleftAdv, CleftNP, CleftAdv,
ImpP3 ImpP3,
-- Construction -- Construction
-- Extensions -- Extensions
PassVPSlash, PassAgentVPSlash -- not reachable anyway
] ]
,PhrasebookDut - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A] ,PhrasebookDut - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A]
@@ -48,4 +49,6 @@ ComplV3 v np vp = mkVP v np vp ;
ComplV2 v np = mkVP v np ; ComplV2 v np = mkVP v np ;
PassV2 v2 = passiveVP v2 ;
PassV2 v2 = passiveVP v2 ;
} }

5
examples/app/AppEng.gf
View File

@@ -18,9 +18,10 @@ concrete AppEng of App =
ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP, ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP,
-- Idiom -- Idiom
CleftNP, CleftAdv, CleftNP, CleftAdv,
ImpP3 ImpP3,
-- Construction -- Construction
-- Extensions -- Extensions
PassVPSlash, PassAgentVPSlash -- not reachable anyway
] ]
,PhrasebookEng - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv] ,PhrasebookEng - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv]
@@ -47,4 +48,6 @@ lin
ComplV2 v np = mkVP v np ; ComplV2 v np = mkVP v np ;
PassV2 v2 = passiveVP v2 ;
PassV2 v2 = passiveVP v2 ;
} }

5
examples/app/AppFin.gf
View File

@@ -18,9 +18,10 @@ concrete AppFin of App =
ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP, ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP,
-- Idiom -- Idiom
CleftNP, CleftAdv, CleftNP, CleftAdv,
ImpP3 ImpP3,
-- Construction -- Construction
-- Extensions -- Extensions
PassVPSlash, PassAgentVPSlash -- not reachable anyway
] ]
,PhrasebookFin - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_A, open_Adv] ,PhrasebookFin - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_A, open_Adv]
@@ -48,4 +49,6 @@ ComplV3 v np vp = mkVP v np vp ;
ComplV2 v np = mkVP v np ; ComplV2 v np = mkVP v np ;
PassV2 v2 = passiveVP v2 ;
PassV2 v2 = passiveVP v2 ;
} }

5
examples/app/AppFre.gf
View File

@@ -17,9 +17,10 @@ concrete AppFre of App =
ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP, ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP,
-- Idiom -- Idiom
CleftNP, CleftAdv, CleftNP, CleftAdv,
ImpP3 ImpP3,
-- Construction -- Construction
-- Extensions -- Extensions
PassVPSlash, PassAgentVPSlash -- not reachable anyway
] ]
,PhrasebookFre - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_A, closed_A] ,PhrasebookFre - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_A, closed_A]
@@ -48,4 +49,6 @@ ComplV3 v np vp = mkVP v np vp ;
ComplV2 v np = mkVP v np ; ComplV2 v np = mkVP v np ;
PassV2 v2 = passiveVP v2 ;
PassV2 v2 = passiveVP v2 ;
} }

5
examples/app/AppGer.gf
View File

@@ -18,9 +18,10 @@ concrete AppGer of App =
ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP, ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP,
-- Idiom -- Idiom
CleftNP, CleftAdv, CleftNP, CleftAdv,
ImpP3 ImpP3,
-- Construction -- Construction
-- Extensions -- Extensions
PassVPSlash, PassAgentVPSlash -- not reachable anyway
] ]
,PhrasebookGer - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A] ,PhrasebookGer - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A]
@@ -48,4 +49,6 @@ ComplV3 v np vp = mkVP v np vp ;
ComplV2 v np = mkVP v np ; ComplV2 v np = mkVP v np ;
PassV2 v2 = passiveVP v2 ;
PassV2 v2 = passiveVP v2 ;
} }

5
examples/app/AppHin.gf
View File

@@ -18,9 +18,10 @@ concrete AppHin of App =
ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP, ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP,
-- Idiom -- Idiom
CleftNP, CleftAdv, CleftNP, CleftAdv,
ImpP3 ImpP3,
-- Construction -- Construction
-- Extensions -- Extensions
PassVPSlash, PassAgentVPSlash -- not reachable anyway
] ]
,PhrasebookHin - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A] ,PhrasebookHin - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A]
@@ -48,4 +49,6 @@ ComplV3 v np vp = mkVP v np vp ;
ComplV2 v np = mkVP v np ; ComplV2 v np = mkVP v np ;
PassV2 v2 = passiveVP v2 ;
PassV2 v2 = passiveVP v2 ;
} }

5
examples/app/AppIta.gf
View File

@@ -18,9 +18,10 @@ concrete AppIta of App =
ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP, ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP,
-- Idiom -- Idiom
CleftNP, CleftAdv, CleftNP, CleftAdv,
ImpP3 ImpP3,
-- Construction -- Construction
-- Extensions -- Extensions
PassVPSlash, PassAgentVPSlash -- not reachable anyway
] ]
,PhrasebookIta - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_A, closed_A] ,PhrasebookIta - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_A, closed_A]
@@ -47,4 +48,6 @@ ComplV3 v np vp = mkVP v np vp ;
ComplV2 v np = mkVP v np ; ComplV2 v np = mkVP v np ;
PassV2 v2 = passiveVP v2 ;
PassV2 v2 = passiveVP v2 ;
} }

5
examples/app/AppJpn.gf
View File

@@ -18,9 +18,10 @@ concrete AppJpn of App =
ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP, ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP,
-- Idiom -- Idiom
CleftNP, CleftAdv, CleftNP, CleftAdv,
ImpP3 ImpP3,
-- Construction -- Construction
-- Extensions -- Extensions
PassVPSlash, PassAgentVPSlash -- not reachable anyway
] ]
,PhrasebookJpn ---- - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A, at_Prep, by_Prep] ,PhrasebookJpn ---- - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A, at_Prep, by_Prep]
@@ -50,4 +51,6 @@ ComplV3 v np vp = mkVP v np vp ;
ComplV2 v np = mkVP v np ; ComplV2 v np = mkVP v np ;
PassV2 v2 = passiveVP v2 ;
PassV2 v2 = passiveVP v2 ;
} }

5
examples/app/AppSpa.gf
View File

@@ -19,9 +19,10 @@ concrete AppSpa of App =
ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP, ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP,
-- Idiom -- Idiom
CleftNP, CleftAdv, CleftNP, CleftAdv,
ImpP3 ImpP3,
-- Construction -- Construction
-- Extensions -- Extensions
PassVPSlash, PassAgentVPSlash -- not reachable anyway
] ]
,PhrasebookSpa - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, cheap_A,expensive_A, open_A, closed_A] ,PhrasebookSpa - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, cheap_A,expensive_A, open_A, closed_A]
@@ -49,4 +50,6 @@ ComplV3 v np vp = mkVP v np vp ;
ComplV2 v np = mkVP v np ; ComplV2 v np = mkVP v np ;
PassV2 v2 = passiveVP v2 ;
PassV2 v2 = passiveVP v2 ;
} }

5
examples/app/AppSwe.gf
View File

@@ -17,9 +17,10 @@ concrete AppSwe of App =
ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP, ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP,
-- Idiom -- Idiom
CleftNP, CleftAdv, CleftNP, CleftAdv,
ImpP3 ImpP3,
-- Construction -- Construction
-- Extensions -- Extensions
PassVPSlash, PassAgentVPSlash -- not reachable anyway
] ]
,PhrasebookSwe - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A] ,PhrasebookSwe - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A]
@@ -47,4 +48,6 @@ ComplV3 v np vp = mkVP v np vp ;
ComplV2 v np = mkVP v np ; ComplV2 v np = mkVP v np ;
PassV2 v2 = SyntaxSwe.passiveVP v2 ;
} }

5
examples/app/AppTha.gf
View File

@@ -18,9 +18,10 @@ concrete AppTha of App =
ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP, ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP,
-- Idiom -- Idiom
CleftNP, CleftAdv, CleftNP, CleftAdv,
ImpP3 ImpP3,
-- Construction -- Construction
-- Extensions -- Extensions
PassVPSlash, PassAgentVPSlash -- not reachable anyway
] ]
,PhrasebookTha - [at_Prep, closed_A, open_A] --- - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A, at_Prep, by_Prep] ,PhrasebookTha - [at_Prep, closed_A, open_A] --- - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A, at_Prep, by_Prep]
@@ -50,4 +51,6 @@ ComplV3 v np vp = mkVP v np vp ;
ComplV2 v np = mkVP v np ; ComplV2 v np = mkVP v np ;
PassV2 v2 = passiveVP v2 ;
PassV2 v2 = passiveVP v2 ;
} }

10
examples/app/MkApp.hs
View File

@@ -22,10 +22,6 @@ putImports i s =
extra s = unlines (init (lines s) ++ extraLines ++ ["}"]) extra s = unlines (init (lines s) ++ extraLines ++ ["}"])
extraLines = -- [] -- default: no extra extraLines = [
" PassV2 v2 = passiveVP v2 ;"
[ ] -- default: no extra
"",
"ComplV2 v np = mkVP v np ;",
""
]