Attachment #196142 for bug #257781




}

// return the value of suffix
int AffixMgr::have_contclass()
{
  return havecontclass;
}

            if (strip[i] == cond[j]) in = 1;
          } while ((j < (condl - 1)) && (cond[j] != ']'));
          if (j == (condl - 1) && (cond[j] != ']')) {
            HUNSPELL_WARNING(stderr, "error: line %d: missing ] in condition:\n%s\n", linenum, cond);
            return 0;
          }
          if ((!neg && !in) || (neg && in)) {

            if (strip[i] == cond[j]) in = 1;
          } while ((j > 0) && (cond[j] != '['));
          if ((j == 0) && (cond[j] != '[')) {
            HUNSPELL_WARNING(stderr, "error: error: %d: missing ] in condition:\n%s\n", linenum, cond);
            return 0;
          }
          neg = (cond[j+1] == '^') ? 1 : 0;

Lines 192-198 public: Link Here

(-)./src/hunspell/affixmgr.hxx.dist (-1 / +1 lines)
192	const char * get_suffix();	192	const char * get_suffix();
193	const char * get_derived();	193	const char * get_derived();
194	const char * get_version();	194	const char * get_version();
195	const int have_contclass();	195	int have_contclass();
196	int get_utf8();	196	int get_utf8();
197	int get_complexprefixes();	197	int get_complexprefixes();
198	char * get_suffixed(char );	198	char * get_suffixed(char );




#include "license.hunspell"
#include "license.myspell"

#if defined(MOZILLA_CLIENT) || defined(__sgi)
#include <cstdlib>
#include <cstring>
#include <cstdio>
#else
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#else
#include <cstdlib>
#include <cstring>
#include <cstdio>
#endif

#include "filemgr.hxx"




                Porting from Aspell to Hunspell using C-like structs
*/

#ifdef MOZILLA_CLIENT
#include <cstdlib>
#include <cstring>
#include <cstdio>
#include <cctype>
#else
#include <stdlib.h> 
#include <string.h>
#include <stdio.h> 
#include <ctype.h>
#elif defined(__sgi)
#include <cstdlib>
#include <cstdio>
#include <string.h>
#include <ctype.h>
#else
#include <cstdlib>
#include <cstring>
#include <cstdio>
#include <cctype>
#endif

#include "csutil.hxx"




#if defined(MOZILLA_CLIENT) || defined(__sgi)
#include <cstdlib>
#include <cstring>
#include <cstdio>
#else
#include <stdlib.h> 
#include <string.h>
#include <stdio.h> 
#else
#include <cstdlib>
#include <cstring>
#include <cstdio>
#endif

#include "hunzip.hxx"




#include "license.hunspell"
#include "license.myspell"

#if defined(MOZILLA_CLIENT) || defined(__sgi)
#include <cstdlib>
#include <cstring>
#include <cstdio>
#else
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#else
#include <cstdlib>
#include <cstring>
#include <cstdio>
#endif

#include "replist.hxx"

Lines 1-12 Link Here

(-)src/tools/hunspell.cxx.dist (+9 lines)
		1	#ifdef __sgi
		2	#include <string.h>
		3	#else
1	#include <cstring>	4	#include <cstring>
		5	#endif
2		6
3	// glibc < 3.0 (for mkstemp)	7	// glibc < 3.0 (for mkstemp)
4	#ifndef __USE_MISC	8	#ifndef __USE_MISC
5	#define __USE_MISC	9	#define __USE_MISC
6	#endif	10	#endif
7		11
		12	#ifdef __sgi
		13	#include <stdlib.h>
		14	#include <stdio.h>
		15	#else
8	#include <cstdlib>	16	#include <cstdlib>
9	#include <cstdio>	17	#include <cstdio>
		18	#endif
10	#include "config.h"	19	#include "config.h"
11	#include "hunspell.hxx"	20	#include "hunspell.hxx"
12	#include "csutil.hxx"	21	#include "csutil.hxx"

Return to bug 257781

Lines 27-42 Link Here

(-)./src/hunspell/phonet.cxx.dist (-6 / +11 lines)
27	Porting from Aspell to Hunspell using C-like structs	27	Porting from Aspell to Hunspell using C-like structs
28	*/	28	*/
29		29
30	#ifndef MOZILLA_CLIENT	30	#ifdef MOZILLA_CLIENT
31	#include <cstdlib>
32	#include <cstring>
33	#include <cstdio>
34	#include <cctype>
35	#else
36	#include <stdlib.h>	31	#include <stdlib.h>
37	#include <string.h>	32	#include <string.h>
38	#include <stdio.h>	33	#include <stdio.h>
39	#include <ctype.h>	34	#include <ctype.h>
		35	#elif defined(__sgi)
		36	#include <cstdlib>
		37	#include <cstdio>
		38	#include <string.h>
		39	#include <ctype.h>
		40	#else
		41	#include <cstdlib>
		42	#include <cstring>
		43	#include <cstdio>
		44	#include <cctype>
40	#endif	45	#endif
41		46
42	#include "csutil.hxx"	47	#include "csutil.hxx"

Lines 3234-3240 struct hentry * AffixMgr::lookup(const c Link Here

(-)./src/hunspell/affixmgr.cxx.dist (-3 / +3 lines)
3234	}	3234	}
3235		3235
3236	// return the value of suffix	3236	// return the value of suffix
3237	const int AffixMgr::have_contclass()	3237	int AffixMgr::have_contclass()
3238	{	3238	{
3239	return havecontclass;	3239	return havecontclass;
3240	}	3240	}
Lines 4276-4282 int AffixMgr::redundant_condition(char f Link Here
4276	if (strip[i] == cond[j]) in = 1;	4276	if (strip[i] == cond[j]) in = 1;
4277	} while ((j < (condl - 1)) && (cond[j] != ']'));	4277	} while ((j < (condl - 1)) && (cond[j] != ']'));
4278	if (j == (condl - 1) && (cond[j] != ']')) {	4278	if (j == (condl - 1) && (cond[j] != ']')) {
4279	HUNSPELL_WARNING(stderr, "error: line %d: missing ] in condition:\n%s\n", linenum);	4279	HUNSPELL_WARNING(stderr, "error: line %d: missing ] in condition:\n%s\n", linenum, cond);
4280	return 0;	4280	return 0;
4281	}	4281	}
4282	if ((!neg && !in) \|\| (neg && in)) {	4282	if ((!neg && !in) \|\| (neg && in)) {
Lines 4304-4310 int AffixMgr::redundant_condition(char f Link Here
4304	if (strip[i] == cond[j]) in = 1;	4304	if (strip[i] == cond[j]) in = 1;
4305	} while ((j > 0) && (cond[j] != '['));	4305	} while ((j > 0) && (cond[j] != '['));
4306	if ((j == 0) && (cond[j] != '[')) {	4306	if ((j == 0) && (cond[j] != '[')) {
4307	HUNSPELL_WARNING(stderr, "error: error: %d: missing ] in condition:\n%s\n", linenum);	4307	HUNSPELL_WARNING(stderr, "error: error: %d: missing ] in condition:\n%s\n", linenum, cond);
4308	return 0;	4308	return 0;
4309	}	4309	}
4310	neg = (cond[j+1] == '^') ? 1 : 0;	4310	neg = (cond[j+1] == '^') ? 1 : 0;

Lines 1-14 Link Here

(-)./src/hunspell/filemgr.cxx.dist (-5 / +5 lines)
1	#include "license.hunspell"	1	#include "license.hunspell"
2	#include "license.myspell"	2	#include "license.myspell"
3		3
4	#ifndef MOZILLA_CLIENT	4	#if defined(MOZILLA_CLIENT) \|\| defined(__sgi)
5	#include <cstdlib>
6	#include <cstring>
7	#include <cstdio>
8	#else
9	#include <stdlib.h>	5	#include <stdlib.h>
10	#include <string.h>	6	#include <string.h>
11	#include <stdio.h>	7	#include <stdio.h>
		8	#else
		9	#include <cstdlib>
		10	#include <cstring>
		11	#include <cstdio>
12	#endif	12	#endif
13		13
14	#include "filemgr.hxx"	14	#include "filemgr.hxx"

Lines 1-11 Link Here

(-)./src/hunspell/hunzip.cxx.dist (-5 / +5 lines)
1	#ifndef MOZILLA_CLIENT	1	#if defined(MOZILLA_CLIENT) \|\| defined(__sgi)
2	#include <cstdlib>
3	#include <cstring>
4	#include <cstdio>
5	#else
6	#include <stdlib.h>	2	#include <stdlib.h>
7	#include <string.h>	3	#include <string.h>
8	#include <stdio.h>	4	#include <stdio.h>
		5	#else
		6	#include <cstdlib>
		7	#include <cstring>
		8	#include <cstdio>
9	#endif	9	#endif
10		10
11	#include "hunzip.hxx"	11	#include "hunzip.hxx"

Lines 1-14 Link Here

(-)./src/hunspell/replist.cxx.dist (-5 / +5 lines)
1	#include "license.hunspell"	1	#include "license.hunspell"
2	#include "license.myspell"	2	#include "license.myspell"
3		3
4	#ifndef MOZILLA_CLIENT	4	#if defined(MOZILLA_CLIENT) \|\| defined(__sgi)
5	#include <cstdlib>
6	#include <cstring>
7	#include <cstdio>
8	#else
9	#include <stdlib.h>	5	#include <stdlib.h>
10	#include <string.h>	6	#include <string.h>
11	#include <stdio.h>	7	#include <stdio.h>
		8	#else
		9	#include <cstdlib>
		10	#include <cstring>
		11	#include <cstdio>
12	#endif	12	#endif
13		13
14	#include "replist.hxx"	14	#include "replist.hxx"