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

utf8 workaround; some restricted inheritances

Browse Source
This commit is contained in:
aarne
2006-06-22 09:41:26 +00:00
parent 625d14ada1
commit 47a3d736a6
10 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/resource-1.0/Makefile
View File

@@ -29,7 +29,7 @@ alltenses:
$(GFC) german/German.gf $(GFC) german/German.gf
$(GFC) italian/Italian.gf $(GFC) italian/Italian.gf
$(GFC) norwegian/Norwegian.gf $(GFC) norwegian/Norwegian.gf
$(GFC) russian/LangRus.gf $(GFC) russian/Russian.gf
$(GFC) spanish/Spanish.gf $(GFC) spanish/Spanish.gf
$(GFC) swedish/Swedish.gf $(GFC) swedish/Swedish.gf
cp -p */*.gfc */*.gfr ../alltenses cp -p */*.gfc */*.gfr ../alltenses

2
lib/resource-1.0/mathematical/MathematicalFre.gf
View File

@@ -11,7 +11,7 @@ concrete MathematicalFre of Mathematical =
RelativeFre, RelativeFre,
ConjunctionFre, ConjunctionFre,
PhraseFre, PhraseFre,
TextX, TextX - [Tense,TPres,TPast,TFut,TCond],
IdiomFre, IdiomFre,
StructuralFre, StructuralFre,

2
lib/resource-1.0/mathematical/MathematicalIta.gf
View File

@@ -11,7 +11,7 @@ concrete MathematicalIta of Mathematical =
RelativeIta, RelativeIta,
ConjunctionIta, ConjunctionIta,
PhraseIta, PhraseIta,
TextX, TextX - [Tense,TPres,TPast,TFut,TCond],
IdiomIta, IdiomIta,
StructuralIta, StructuralIta,

2
lib/resource-1.0/mathematical/MathematicalSpa.gf
View File

@@ -11,7 +11,7 @@ concrete MathematicalSpa of Mathematical =
RelativeSpa, RelativeSpa,
ConjunctionSpa, ConjunctionSpa,
PhraseSpa, PhraseSpa,
TextSpa, TextSpa - [Tense,TPres,TPast,TFut,TCond],
IdiomSpa, IdiomSpa,
StructuralSpa, StructuralSpa,

2
lib/resource-1.0/multimodal/MultiEng.gf
View File

@@ -20,7 +20,7 @@ concrete MultiEng of Multi =
everywhere_Adv, here_Adv, here7to_Adv, here7from_Adv, everywhere_Adv, here_Adv, here7to_Adv, here7from_Adv,
somewhere_Adv, there_Adv, there7to_Adv, there7from_Adv, somewhere_Adv, there_Adv, there7to_Adv, there7from_Adv,
every_Det, few_Det, many_Det, much_Det, someSg_Det, somePl_Det, every_Det, few_Det, many_Det, much_Det, someSg_Det, somePl_Det,
ImpersCl, GenericCl, ExistNP, ExistIP, ProgrVP, ImpersCl, GenericCl, ExistNP, ExistIP, ProgrVP, ImpPl1,
already_Adv, far_Adv, now_Adv already_Adv, far_Adv, now_Adv
] ]
** MultiI with ** MultiI with

2
lib/resource-1.0/multimodal/MultiFin.gf
View File

@@ -20,7 +20,7 @@ concrete MultiFin of Multi =
everywhere_Adv, here_Adv, here7to_Adv, here7from_Adv, everywhere_Adv, here_Adv, here7to_Adv, here7from_Adv,
somewhere_Adv, there_Adv, there7to_Adv, there7from_Adv, somewhere_Adv, there_Adv, there7to_Adv, there7from_Adv,
every_Det, few_Det, many_Det, much_Det, someSg_Det, somePl_Det, every_Det, few_Det, many_Det, much_Det, someSg_Det, somePl_Det,
ImpersCl, GenericCl, ExistNP, ExistIP, ProgrVP, ImpersCl, GenericCl, ExistNP, ExistIP, ProgrVP, ImpPl1,
already_Adv, far_Adv, now_Adv already_Adv, far_Adv, now_Adv
] ]
** MultiI with ** MultiI with

2
lib/resource-1.0/multimodal/MultiFre.gf
View File

@@ -20,7 +20,7 @@ concrete MultiFre of Multi =
everywhere_Adv, here_Adv, here7to_Adv, here7from_Adv, everywhere_Adv, here_Adv, here7to_Adv, here7from_Adv,
somewhere_Adv, there_Adv, there7to_Adv, there7from_Adv, somewhere_Adv, there_Adv, there7to_Adv, there7from_Adv,
every_Det, few_Det, many_Det, much_Det, someSg_Det, somePl_Det, every_Det, few_Det, many_Det, much_Det, someSg_Det, somePl_Det,
ImpersCl, GenericCl, ExistNP, ExistIP, ProgrVP, ImpersCl, GenericCl, ExistNP, ExistIP, ProgrVP, ImpPl1,
already_Adv, far_Adv, now_Adv already_Adv, far_Adv, now_Adv
] ]
** MultiI with ** MultiI with

1
lib/resource-1.0/multimodal/MultiI.gf
View File

@@ -113,6 +113,7 @@ incomplete concrete MultiI of Multi =
ExistNP np = Lang.ExistNP np ** {point = np.point} ; ExistNP np = Lang.ExistNP np ** {point = np.point} ;
ExistIP ip = Lang.ExistIP ip ** noPoint ; ExistIP ip = Lang.ExistIP ip ** noPoint ;
ProgrVP vp = Lang.ProgrVP vp ** {point = vp.point} ; ProgrVP vp = Lang.ProgrVP vp ** {point = vp.point} ;
ImpPl1 vp = Lang.ImpPl1 vp ** {point = vp.point} ;
everybody_NP = Lang.everybody_NP ** noPoint ; everybody_NP = Lang.everybody_NP ** noPoint ;
everything_NP = Lang.everything_NP ** noPoint ; everything_NP = Lang.everything_NP ** noPoint ;

2
lib/resource-1.0/multimodal/MultiSwe.gf
View File

@@ -20,7 +20,7 @@ concrete MultiSwe of Multi =
everywhere_Adv, here_Adv, here7to_Adv, here7from_Adv, everywhere_Adv, here_Adv, here7to_Adv, here7from_Adv,
somewhere_Adv, there_Adv, there7to_Adv, there7from_Adv, somewhere_Adv, there_Adv, there7to_Adv, there7from_Adv,
every_Det, few_Det, many_Det, much_Det, someSg_Det, somePl_Det, every_Det, few_Det, many_Det, much_Det, someSg_Det, somePl_Det,
ImpersCl, GenericCl, ExistNP, ExistIP, ProgrVP, ImpersCl, GenericCl, ExistNP, ExistIP, ProgrVP, ImpPl1,
already_Adv, far_Adv, now_Adv already_Adv, far_Adv, now_Adv
] ]
** MultiI with ** MultiI with

3
src/GF/Text/UTF8.hs
View File

@@ -27,7 +27,8 @@ decodeUTF8 (c:c':c'':cs) | '\xe0' <= c && c <= '\xef' &&
'\x80' <= c' && c' <= '\xbf' && '\x80' <= c' && c' <= '\xbf' &&
'\x80' <= c'' && c'' <= '\xbf' = '\x80' <= c'' && c'' <= '\xbf' =
toEnum ((fromEnum c `mod` 0x10 * 0x1000) + (fromEnum c' `mod` 0x40) * 0x40 + fromEnum c'' `mod` 0x40) : decodeUTF8 cs toEnum ((fromEnum c `mod` 0x10 * 0x1000) + (fromEnum c' `mod` 0x40) * 0x40 + fromEnum c'' `mod` 0x40) : decodeUTF8 cs
decodeUTF8 _ = error "UniChar.decodeUTF8: bad data" decodeUTF8 s = s ---- AR workaround 22/6/2006
----decodeUTF8 _ = error "UniChar.decodeUTF8: bad data"
encodeUTF8 :: String -> String encodeUTF8 :: String -> String
encodeUTF8 "" = "" encodeUTF8 "" = ""