bbs/deb-goldedplus
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert commit a61ee2e

Browse Source
This commit is contained in:
Alexander Skovpen
2018-07-14 16:22:48 +03:00
committed by dukelsky
parent 459303ea19
commit e6e77b0634
37 changed files with 1035 additions and 1035 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
goldlib/hunspell/affixmgr.cxx
View File

@@ -269,7 +269,7 @@ int AffixMgr::parse_file(const char * affpath)
/* parse in the flag used by the controlled compound words */
if (strncmp(line,"COMPOUNDFLAG",12) == 0) {
if (parse_flag(line, &compoundflag, (char *)"COMPOUNDFLAG")) {
if (parse_flag(line, &compoundflag, "COMPOUNDFLAG")) {
return 1;
}
}
@@ -277,11 +277,11 @@ int AffixMgr::parse_file(const char * affpath)
/* parse in the flag used by compound words */
if (strncmp(line,"COMPOUNDBEGIN",13) == 0) {
if (complexprefixes) {
if (parse_flag(line, &compoundend, (char *)"COMPOUNDBEGIN")) {
if (parse_flag(line, &compoundend, "COMPOUNDBEGIN")) {
return 1;
}
} else {
if (parse_flag(line, &compoundbegin, (char *)"COMPOUNDBEGIN")) {
if (parse_flag(line, &compoundbegin, "COMPOUNDBEGIN")) {
return 1;
}
}
@@ -289,18 +289,18 @@ int AffixMgr::parse_file(const char * affpath)
/* parse in the flag used by compound words */
if (strncmp(line,"COMPOUNDMIDDLE",14) == 0) {
if (parse_flag(line, &compoundmiddle, (char *)"COMPOUNDMIDDLE")) {
if (parse_flag(line, &compoundmiddle, "COMPOUNDMIDDLE")) {
return 1;
}
}
/* parse in the flag used by compound words */
if (strncmp(line,"COMPOUNDEND",11) == 0) {
if (complexprefixes) {
if (parse_flag(line, &compoundbegin, (char *)"COMPOUNDEND")) {
if (parse_flag(line, &compoundbegin, "COMPOUNDEND")) {
return 1;
}
} else {
if (parse_flag(line, &compoundend, (char *)"COMPOUNDEND")) {
if (parse_flag(line, &compoundend, "COMPOUNDEND")) {
return 1;
}
}
@@ -308,28 +308,28 @@ int AffixMgr::parse_file(const char * affpath)
/* parse in the flag used by compound_check() method */
if (strncmp(line,"COMPOUNDWORDMAX",15) == 0) {
if (parse_num(line, &cpdwordmax, (char *)"COMPOUNDWORDMAX")) {
if (parse_num(line, &cpdwordmax, "COMPOUNDWORDMAX")) {
return 1;
}
}
/* parse in the flag sign compounds in dictionary */
if (strncmp(line,"COMPOUNDROOT",12) == 0) {
if (parse_flag(line, &compoundroot, (char *)"COMPOUNDROOT")) {
if (parse_flag(line, &compoundroot, "COMPOUNDROOT")) {
return 1;
}
}
/* parse in the flag used by compound_check() method */
if (strncmp(line,"COMPOUNDPERMITFLAG",18) == 0) {
if (parse_flag(line, &compoundpermitflag, (char *)"COMPOUNDPERMITFLAG")) {
if (parse_flag(line, &compoundpermitflag, "COMPOUNDPERMITFLAG")) {
return 1;
}
}
/* parse in the flag used by compound_check() method */
if (strncmp(line,"COMPOUNDFORBIDFLAG",18) == 0) {
if (parse_flag(line, &compoundforbidflag, (char *)"COMPOUNDFORBIDFLAG")) {
if (parse_flag(line, &compoundforbidflag, "COMPOUNDFORBIDFLAG")) {
return 1;
}
}
@@ -347,56 +347,56 @@ int AffixMgr::parse_file(const char * affpath)
checkcompoundcase = 1;
if (strncmp(line,"NOSUGGEST",9) == 0) {
if (parse_flag(line, &nosuggest, (char *)"NOSUGGEST")) {
if (parse_flag(line, &nosuggest, "NOSUGGEST")) {
return 1;
}
}
/* parse in the flag used by forbidden words */
if (strncmp(line,"FORBIDDENWORD",13) == 0) {
if (parse_flag(line, &forbiddenword, (char *)"FORBIDDENWORD")) {
if (parse_flag(line, &forbiddenword, "FORBIDDENWORD")) {
return 1;
}
}
/* parse in the flag used by forbidden words */
if (strncmp(line,"LEMMA_PRESENT",13) == 0) {
if (parse_flag(line, &lemma_present, (char *)"LEMMA_PRESENT")) {
if (parse_flag(line, &lemma_present, "LEMMA_PRESENT")) {
return 1;
}
}
/* parse in the flag used by circumfixes */
if (strncmp(line,"CIRCUMFIX",9) == 0) {
if (parse_flag(line, &circumfix, (char *)"CIRCUMFIX")) {
if (parse_flag(line, &circumfix, "CIRCUMFIX")) {
return 1;
}
}
/* parse in the flag used by fogemorphemes */
if (strncmp(line,"ONLYINCOMPOUND",14) == 0) {
if (parse_flag(line, &onlyincompound, (char *)"ONLYINCOMPOUND")) {
if (parse_flag(line, &onlyincompound, "ONLYINCOMPOUND")) {
return 1;
}
}
/* parse in the flag used by `pseudoroots' */
if (strncmp(line,"PSEUDOROOT",10) == 0) {
if (parse_flag(line, &pseudoroot, (char *)"PSEUDOROOT")) {
if (parse_flag(line, &pseudoroot, "PSEUDOROOT")) {
return 1;
}
}
/* parse in the flag used by `pseudoroots' */
if (strncmp(line,"NEEDAFFIX",9) == 0) {
if (parse_flag(line, &pseudoroot, (char *)"NEEDAFFIX")) {
if (parse_flag(line, &pseudoroot, "NEEDAFFIX")) {
return 1;
}
}
/* parse in the minimal length for words in compounds */
if (strncmp(line,"COMPOUNDMIN",11) == 0) {
if (parse_num(line, &cpdmin, (char *)"COMPOUNDMIN")) {
if (parse_num(line, &cpdmin, "COMPOUNDMIN")) {
return 1;
}
if (cpdmin < 1) cpdmin = 1;
@@ -477,7 +477,7 @@ int AffixMgr::parse_file(const char * affpath)
}
if (strncmp(line,"MAXNGRAMSUGS",12) == 0) {
if (parse_num(line, &maxngramsugs, (char *)"MAXNGRAMSUGS")) {
if (parse_num(line, &maxngramsugs, "MAXNGRAMSUGS")) {
return 1;
}
}
@@ -490,7 +490,7 @@ int AffixMgr::parse_file(const char * affpath)
/* parse in the flag used by forbidden words */
if (strncmp(line,"KEEPCASE",8) == 0) {
if (parse_flag(line, &keepcase, (char *)"KEEPCASE")) {
if (parse_flag(line, &keepcase, "KEEPCASE")) {
return 1;
}
}

2
goldlib/hunspell/suggmgr.cxx
View File

@@ -1418,7 +1418,7 @@ char * SuggestMgr::suggest_morph_for_spelling_error(const char * word)
char * p = NULL;
char ** wlst = (char **) calloc(maxSug, sizeof(char *));
// we will use only the first suggestion
for (int i = 0; i < maxSug - 1; i++) wlst[i] = (char *)"";
for (int i = 0; i < maxSug - 1; i++) wlst[i] = "";
int ns = suggest(&wlst, word, maxSug - 1);
if (ns == maxSug) {
p = suggest_morph(wlst[maxSug - 1]);