diff --git a/Make.hs b/Make.hs index cf8aeaa95..dd1d06f7c 100644 --- a/Make.hs +++ b/Make.hs @@ -191,7 +191,7 @@ rglCommands = summary f langs = unwords (map (drop (length sourceDir + 1) . f) langs) -- summary f _ = f (LangInfo "*" "*" Nothing Nothing False False False False) - l mode args = (lang,optml mode (const True) args) + l mode args = (lang,optml mode langAll args) s mode args = (symbol,optml mode langAPI args) c mode args = (compat,optml AllTenses langCompatibility args) t mode args = (try,optml mode langAPI args) @@ -310,6 +310,7 @@ data LangInfo = LangInfo , langFunctor :: Maybe String -- ^ functor (not used) , langUnlexer :: Maybe String -- ^ decoding for postprocessing linearizations , langPresent :: Bool + , langAll :: Bool , langAPI :: Bool , langSymbolic :: Bool , langCompatibility :: Bool @@ -323,7 +324,7 @@ loadLangs = do where conffile = "languages.csv" maybeBit bits n = if length bits >= (n+1) && length (bits !! n) > 0 then Just (bits !! n) else Nothing - boolBit bits n def = if length bits >= (n+1) && length (bits !! n) > 0 then (bits !! n == if def then "n" else "y") else def + boolBit bits n def = if length bits >= (n+1) && length (bits !! n) > 0 then (if def then bits !! n /= "n" else bits !! n == "y") else def mkLangInfo s = let bits = separateBy ',' s in if length bits < 2 @@ -334,9 +335,10 @@ loadLangs = do , langFunctor = maybeBit bits 2 , langUnlexer = maybeBit bits 3 , langPresent = boolBit bits 4 False - , langAPI = boolBit bits 5 True - , langSymbolic = boolBit bits 6 True - , langCompatibility = boolBit bits 7 False + , langAll = boolBit bits 5 True + , langAPI = boolBit bits 6 True + , langSymbolic = boolBit bits 7 True + , langCompatibility = boolBit bits 8 False } -- | Separate a string on a character diff --git a/README.md b/README.md index 22728a3d7..a16590d14 100644 --- a/README.md +++ b/README.md @@ -35,6 +35,7 @@ Description of columns: - Functor: (not used) - Unlexer - Present: languages that have notpresent marked +- All: languages for which to compile All - API: languages for which to compile Try - Symbolic: languages for which to compile Symbolic - Compatibility: languages for which Compatibility exists diff --git a/languages.csv b/languages.csv index 84d9c2c68..7ee44f866 100644 --- a/languages.csv +++ b/languages.csv @@ -1,46 +1,45 @@ -Code,Directory,Functor,Unlexer,Present,API,Symbolic,Compatibility -Afr,afrikaans,,,y,,n, -Amh,amharic,,,,n,n, -Ara,arabic,,,,n,n, -Eus,basque,,,,,, -Bul,bulgarian,,,y,,,y -Cat,catalan,Romance,,y,,,y -Chi,chinese,,,y,,, -Dan,danish,Scand,,y,,, -Dut,dutch,,,y,,, -Eng,english,,,y,,,y -Est,estonian,,,y,,, -Fin,finnish,,,y,,,y -Fre,french,Romance,,y,,,y -Grc,ancient_greek,,,y,n,n, -Gre,greek,,,y,,, -Heb,hebrew,,,,n,n, -Hin,hindi,Hindustani,to_devanagari,y,,, -Hun,hungarian,,,y,,, -Ger,german,,,,,, -Ice,icelandic,,,y,,n, -Ina,interlingua,,,y,n,n, -Ita,italian,Romance,,y,,,y -Jpn,japanese,,,y,,, -Lat,latin,,,y,n,n, -Lav,latvian,,,,,,y -Mlt,maltese,,,,,, -Mon,mongolian,,,y,,n, -Nep,nepali,,,y,,n, -Nor,norwegian,Scand,,y,,, -Nno,nynorsk,,,y,,, -Pes,persian,,,y,,, -Pol,polish,,,,,, -Por,portuguese,Romance,,y,,,y -Pnb,punjabi,,,y,,, -Ron,romanian,,,y,,, -Rus,russian,,,y,,, -Snd,sindhi,,,y,,, -Spa,spanish,Romance,,y,,,y -Swa,swahili,,,,,,y -Swe,swedish,Scand,,y,,,y -Tel,telugu,,,y,,, -Tha,thai,,to_thai,y,,, -Tur,turkish,,,,n,n, -Urd,urdu,Hindustani,,y,,, -Vot,votic,,,,,, +Code,Directory,Functor,Unlexer,Present,All,API,Symbolic,Compatibility +Afr,afrikaans,,,,,,n, +Amh,amharic,,,,,n,n, +Ara,arabic,,,,,n,n, +Eus,basque,,,,,,, +Bul,bulgarian,,,y,,,, +Cat,catalan,Romance,,y,,,,y +Chi,chinese,,,,,,, +Dan,danish,Scand,,y,,,, +Dut,dutch,,,y,,,, +Eng,english,,,y,,,,y +Est,estonian,,,,,,, +Fin,finnish,,,y,,,,y +Fre,french,Romance,,y,,,,y +Grc,ancient_greek,,,y,,n,n, +Gre,greek,,,,,,, +Heb,hebrew,,,,,n,n, +Hin,hindi,Hindustani,to_devanagari,y,,,, +Hun,hungarian,,,y,n,n,n, +Ger,german,,,,,,, +Ice,icelandic,,,,,,n, +Ina,interlingua,,,y,,n,n, +Ita,italian,Romance,,y,,,,y +Jpn,japanese,,,,,,, +Lat,latin,,,y,,n,n, +Lav,latvian,,,,,,,y +Mlt,maltese,,,,,,, +Mon,mongolian,,,,,,n, +Nep,nepali,,,,,,n, +Nor,norwegian,Scand,,y,,,, +Nno,nynorsk,,,y,,,, +Pes,persian,,,,,,, +Pol,polish,,,,,,, +Por,portuguese,Romance,,y,,,,y +Pnb,punjabi,,,y,,,, +Ron,romanian,,,y,,,, +Rus,russian,,,y,,,, +Snd,sindhi,,,,,,, +Spa,spanish,Romance,,y,,,,y +Swa,swahili,,,,n,n,n,y +Swe,swedish,Scand,,y,,,,y +Tel,telugu,,,y,n,n,n, +Tha,thai,,to_thai,,,,, +Tur,turkish,,,,,n,n, +Urd,urdu,Hindustani,,,,,, \ No newline at end of file