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

di_Prep and a_Prep in ParadigmsIta ; newcomp in lib/src/Make.hs

Browse Source
This commit is contained in:
aarne
2012-11-18 22:11:35 +00:00
parent e0fc932a92
commit b5df913041
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/src/Make.hs
View File

@@ -117,10 +117,12 @@ make xx = do
let pres let pres
| elem "present" xx = 1 | elem "present" xx = 1
| elem "alltenses" xx = 2 | elem "alltenses" xx = 2
| elem "newcomp" xx = 3
| otherwise = 0 | otherwise = 0
let dir = case pres of let dir = case pres of
1 -> "../present" 1 -> "../present"
2 -> "../alltenses" 2 -> "../alltenses"
3 -> "../newcomp"
_ -> "../full" _ -> "../full"
let optl ls = maybe ls id $ getOptLangs xx let optl ls = maybe ls id $ getOptLangs xx
@@ -173,9 +175,10 @@ gfc pres ppath file = do
let preproc = if (pres==1) then "-preproc=mkPresent" else "" let preproc = if (pres==1) then "-preproc=mkPresent" else ""
let path = if (pres==1) then ppath else "" let path = if (pres==1) then ppath else ""
putStrLn $ "Compiling " ++ file putStrLn $ "Compiling " ++ file
if pres == 0 case pres of
then run_gfc ["-s","-src",preproc, path, file] 0 -> run_gfc ["-s","-src",preproc, path, file]
else run_gfc ["-s","-src","-no-pmcfg",preproc, path, file] 3 -> run_gfc ["-s","-src","-no-pmcfg", "-new-comp", preproc, path, file]
_ -> run_gfc ["-s","-src","-no-pmcfg",preproc, path, file]
gfcmin path file = do gfcmin path file = do

7
lib/src/italian/ParadigmsIta.gf
View File

@@ -62,6 +62,9 @@ oper
genitive : Prep ; -- preposition "di" and its contractions genitive : Prep ; -- preposition "di" and its contractions
dative : Prep ; -- preposition "a" and its contractions dative : Prep ; -- preposition "a" and its contractions
di_Prep : Prep ; -- = genitive
a_Prep : Prep ; -- = dative
-- The following prepositions also have special contracted forms. -- The following prepositions also have special contracted forms.
con_Prep : Prep ; -- preposition "con" and its contractions con_Prep : Prep ; -- preposition "con" and its contractions
@@ -298,8 +301,8 @@ oper
--Prep = Compl ; --Prep = Compl ;
accusative = lin Prep complAcc ; accusative = lin Prep complAcc ;
genitive = lin Prep complGen ; genitive, di_Prep = lin Prep complGen ;
dative = lin Prep complDat ; dative, a_Prep = lin Prep complDat ;
mkPrep p = lin Prep {s = p ; c = Acc ; isDir = False ; lock_Prep = <>} ; mkPrep p = lin Prep {s = p ; c = Acc ; isDir = False ; lock_Prep = <>} ;
con_Prep = {s = [] ; c = CPrep P_con ; isDir = False ; lock_Prep = <>} ; con_Prep = {s = [] ; c = CPrep P_con ; isDir = False ; lock_Prep = <>} ;