Attachment #181035 for bug #257781




hunspell_example_LDADD = ../hunspell/libhunspell-1.2.la

hunspell_SOURCES=hunspell.cxx
hunspell_LDADD = @LIBINTL@ ../parsers/libparsers.a \
	../hunspell/libhunspell-1.2.la @CURSESLIB@ @READLINELIB@

hunspell_analyze_SOURCES=analyze.cxx
hunspell_analyze_LDADD = ../hunspell/libhunspell-1.2.la

hunspell_chmorph_SOURCES=chmorph.cxx
hunspell_chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.2.la

noinst_PROGRAMS=hunspell-example





PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
am_hunspell_OBJECTS = hunspell.$(OBJEXT)
hunspell_OBJECTS = $(am_hunspell_OBJECTS)
hunspell_DEPENDENCIES = ../parsers/libparsers.a \
	../hunspell/libhunspell-1.2.la
am_hunspell_analyze_OBJECTS = analyze.$(OBJEXT)
hunspell_analyze_OBJECTS = $(am_hunspell_analyze_OBJECTS)
hunspell_analyze_DEPENDENCIES = ../hunspell/libhunspell-1.2.la
am_hunspell_chmorph_OBJECTS = chmorph.$(OBJEXT)
hunspell_chmorph_OBJECTS = $(am_hunspell_chmorph_OBJECTS)
hunspell_chmorph_DEPENDENCIES = ../parsers/libparsers.a \
	../hunspell/libhunspell-1.2.la
am_hunspell_example_OBJECTS = example.$(OBJEXT)
hunspell_example_OBJECTS = $(am_hunspell_example_OBJECTS)
hunspell_example_DEPENDENCIES = ../hunspell/libhunspell-1.2.la

hunspell_example_SOURCES = example.cxx
hunspell_example_LDADD = ../hunspell/libhunspell-1.2.la
hunspell_SOURCES = hunspell.cxx
hunspell_LDADD = @LIBINTL@ ../parsers/libparsers.a \
	../hunspell/libhunspell-1.2.la @CURSESLIB@ @READLINELIB@

hunspell_analyze_SOURCES = analyze.cxx
hunspell_analyze_LDADD = ../hunspell/libhunspell-1.2.la
hunspell_chmorph_SOURCES = chmorph.cxx
hunspell_chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.2.la
EXTRA_DIST = makealias affixcompress wordforms
all: all-am





PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
am_hunspell_OBJECTS = hunspell.$(OBJEXT)
hunspell_OBJECTS = $(am_hunspell_OBJECTS)
hunspell_DEPENDENCIES = ../parsers/libparsers.a \
	../hunspell/libhunspell-1.2.la
am_hunspell_analyze_OBJECTS = analyze.$(OBJEXT)
hunspell_analyze_OBJECTS = $(am_hunspell_analyze_OBJECTS)
hunspell_analyze_DEPENDENCIES = ../hunspell/libhunspell-1.2.la
am_hunspell_chmorph_OBJECTS = chmorph.$(OBJEXT)
hunspell_chmorph_OBJECTS = $(am_hunspell_chmorph_OBJECTS)
hunspell_chmorph_DEPENDENCIES = ../parsers/libparsers.a \
	../hunspell/libhunspell-1.2.la
am_hunspell_example_OBJECTS = example.$(OBJEXT)
hunspell_example_OBJECTS = $(am_hunspell_example_OBJECTS)
hunspell_example_DEPENDENCIES = ../hunspell/libhunspell-1.2.la

hunspell_example_SOURCES = example.cxx
hunspell_example_LDADD = ../hunspell/libhunspell-1.2.la
hunspell_SOURCES = hunspell.cxx
hunspell_LDADD = -lintl ../parsers/libparsers.a \
	../hunspell/libhunspell-1.2.la -lncursesw -lreadline -lncurses

hunspell_analyze_SOURCES = analyze.cxx
hunspell_analyze_LDADD = ../hunspell/libhunspell-1.2.la
hunspell_chmorph_SOURCES = chmorph.cxx
hunspell_chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.2.la
EXTRA_DIST = makealias affixcompress wordforms
all: all-am


Lines 192-198 public: Link Here

(-)hunspell-1.2.8/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 );




}

// 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;




#include <cstring>
#include <cstdio>
#include <cctype>
#endif
#include <stdlib.h> 
#include <string.h>
#include <stdio.h> 
#include <ctype.h>
#endif

#include "csutil.hxx"
#include "phonet.hxx"

Lines 5-15 Link Here

(-)hunspell-1.2.8/src/hunspell/filemgr.cxx.dist (-2 / +1 lines)
5	#include <cstdlib>	5	#include <cstdlib>
6	#include <cstring>	6	#include <cstring>
7	#include <cstdio>	7	#include <cstdio>
8	#else	8	#endif
9	#include <stdlib.h>	9	#include <stdlib.h>
10	#include <string.h>	10	#include <string.h>
11	#include <stdio.h>	11	#include <stdio.h>
12	#endif
13		12
14	#include "filemgr.hxx"	13	#include "filemgr.hxx"
15		14

Lines 2-12 Link Here

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

Lines 5-15 Link Here

(-)hunspell-1.2.8/src/hunspell/replist.cxx.dist (-2 / +1 lines)
5	#include <cstdlib>	5	#include <cstdlib>
6	#include <cstring>	6	#include <cstring>
7	#include <cstdio>	7	#include <cstdio>
8	#else	8	#endif
9	#include <stdlib.h>	9	#include <stdlib.h>
10	#include <string.h>	10	#include <string.h>
11	#include <stdio.h>	11	#include <stdio.h>
12	#endif
13		12
14	#include "replist.hxx"	13	#include "replist.hxx"
15	#include "csutil.hxx"	14	#include "csutil.hxx"

Lines 11-16 Link Here

(-)hunspell-1.2.8/src/tools/hunspell.cxx.dist (+3 lines)
11	#include "hunspell.hxx"	11	#include "hunspell.hxx"
12	#include "csutil.hxx"	12	#include "csutil.hxx"
13		13
		14	#include <stdlib.h>
		15	#include <stdio.h>
		16
14	#ifndef HUNSPELL_EXTRA	17	#ifndef HUNSPELL_EXTRA
15	#define suggest_auto suggest	18	#define suggest_auto suggest
16	#endif	19	#endif

Lines 1-4 Link Here

(-)hunspell-1.2.8/tests/test.sh.dist (-1 / +1 lines)
1	#!/bin/bash	1	#!/opt/gentoo/bin/bash
2	export LC_ALL="C"	2	export LC_ALL="C"
3		3
4	function check_valgrind_log () {	4	function check_valgrind_log () {

Return to bug 257781

Lines 14-27 hunspell_example_SOURCES=example.cxx Link Here

(-)hunspell-1.2.8/src/tools/Makefile.am.dist (-3 / +3 lines)
14	hunspell_example_LDADD = ../hunspell/libhunspell-1.2.la	14	hunspell_example_LDADD = ../hunspell/libhunspell-1.2.la
15		15
16	hunspell_SOURCES=hunspell.cxx	16	hunspell_SOURCES=hunspell.cxx
17	hunspell_LDADD = @LIBINTL@ ../hunspell/libhunspell-1.2.la \	17	hunspell_LDADD = @LIBINTL@ ../parsers/libparsers.a \
18	../parsers/libparsers.a @CURSESLIB@ @READLINELIB@	18	../hunspell/libhunspell-1.2.la @CURSESLIB@ @READLINELIB@
19		19
20	hunspell_analyze_SOURCES=analyze.cxx	20	hunspell_analyze_SOURCES=analyze.cxx
21	hunspell_analyze_LDADD = ../hunspell/libhunspell-1.2.la	21	hunspell_analyze_LDADD = ../hunspell/libhunspell-1.2.la
22		22
23	hunspell_chmorph_SOURCES=chmorph.cxx	23	hunspell_chmorph_SOURCES=chmorph.cxx
24	hunspell_chmorph_LDADD = ../hunspell/libhunspell-1.2.la ../parsers/libparsers.a	24	hunspell_chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.2.la
25		25
26	noinst_PROGRAMS=hunspell-example	26	noinst_PROGRAMS=hunspell-example
27		27

Lines 59-73 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) Link Here

(-)hunspell-1.2.8/src/tools/Makefile.in.dist (-7 / +7 lines)
59	PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)	59	PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
60	am_hunspell_OBJECTS = hunspell.$(OBJEXT)	60	am_hunspell_OBJECTS = hunspell.$(OBJEXT)
61	hunspell_OBJECTS = $(am_hunspell_OBJECTS)	61	hunspell_OBJECTS = $(am_hunspell_OBJECTS)
62	hunspell_DEPENDENCIES = ../hunspell/libhunspell-1.2.la \	62	hunspell_DEPENDENCIES = ../parsers/libparsers.a \
63	../parsers/libparsers.a	63	../hunspell/libhunspell-1.2.la
64	am_hunspell_analyze_OBJECTS = analyze.$(OBJEXT)	64	am_hunspell_analyze_OBJECTS = analyze.$(OBJEXT)
65	hunspell_analyze_OBJECTS = $(am_hunspell_analyze_OBJECTS)	65	hunspell_analyze_OBJECTS = $(am_hunspell_analyze_OBJECTS)
66	hunspell_analyze_DEPENDENCIES = ../hunspell/libhunspell-1.2.la	66	hunspell_analyze_DEPENDENCIES = ../hunspell/libhunspell-1.2.la
67	am_hunspell_chmorph_OBJECTS = chmorph.$(OBJEXT)	67	am_hunspell_chmorph_OBJECTS = chmorph.$(OBJEXT)
68	hunspell_chmorph_OBJECTS = $(am_hunspell_chmorph_OBJECTS)	68	hunspell_chmorph_OBJECTS = $(am_hunspell_chmorph_OBJECTS)
69	hunspell_chmorph_DEPENDENCIES = ../hunspell/libhunspell-1.2.la \	69	hunspell_chmorph_DEPENDENCIES = ../parsers/libparsers.a \
70	../parsers/libparsers.a	70	../hunspell/libhunspell-1.2.la
71	am_hunspell_example_OBJECTS = example.$(OBJEXT)	71	am_hunspell_example_OBJECTS = example.$(OBJEXT)
72	hunspell_example_OBJECTS = $(am_hunspell_example_OBJECTS)	72	hunspell_example_OBJECTS = $(am_hunspell_example_OBJECTS)
73	hunspell_example_DEPENDENCIES = ../hunspell/libhunspell-1.2.la	73	hunspell_example_DEPENDENCIES = ../hunspell/libhunspell-1.2.la
Lines 274-286 include_HEADERS = munch.h unmunch.h Link Here
274	hunspell_example_SOURCES = example.cxx	274	hunspell_example_SOURCES = example.cxx
275	hunspell_example_LDADD = ../hunspell/libhunspell-1.2.la	275	hunspell_example_LDADD = ../hunspell/libhunspell-1.2.la
276	hunspell_SOURCES = hunspell.cxx	276	hunspell_SOURCES = hunspell.cxx
277	hunspell_LDADD = @LIBINTL@ ../hunspell/libhunspell-1.2.la \	277	hunspell_LDADD = @LIBINTL@ ../parsers/libparsers.a \
278	../parsers/libparsers.a @CURSESLIB@ @READLINELIB@	278	../hunspell/libhunspell-1.2.la @CURSESLIB@ @READLINELIB@
279		279
280	hunspell_analyze_SOURCES = analyze.cxx	280	hunspell_analyze_SOURCES = analyze.cxx
281	hunspell_analyze_LDADD = ../hunspell/libhunspell-1.2.la	281	hunspell_analyze_LDADD = ../hunspell/libhunspell-1.2.la
282	hunspell_chmorph_SOURCES = chmorph.cxx	282	hunspell_chmorph_SOURCES = chmorph.cxx
283	hunspell_chmorph_LDADD = ../hunspell/libhunspell-1.2.la ../parsers/libparsers.a	283	hunspell_chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.2.la
284	EXTRA_DIST = makealias affixcompress wordforms	284	EXTRA_DIST = makealias affixcompress wordforms
285	all: all-am	285	all: all-am
286		286

Lines 59-73 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) Link Here

(-)hunspell-1.2.8/src/tools/Makefile.dist (-7 / +7 lines)
59	PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)	59	PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
60	am_hunspell_OBJECTS = hunspell.$(OBJEXT)	60	am_hunspell_OBJECTS = hunspell.$(OBJEXT)
61	hunspell_OBJECTS = $(am_hunspell_OBJECTS)	61	hunspell_OBJECTS = $(am_hunspell_OBJECTS)
62	hunspell_DEPENDENCIES = ../hunspell/libhunspell-1.2.la \	62	hunspell_DEPENDENCIES = ../parsers/libparsers.a \
63	../parsers/libparsers.a	63	../hunspell/libhunspell-1.2.la
64	am_hunspell_analyze_OBJECTS = analyze.$(OBJEXT)	64	am_hunspell_analyze_OBJECTS = analyze.$(OBJEXT)
65	hunspell_analyze_OBJECTS = $(am_hunspell_analyze_OBJECTS)	65	hunspell_analyze_OBJECTS = $(am_hunspell_analyze_OBJECTS)
66	hunspell_analyze_DEPENDENCIES = ../hunspell/libhunspell-1.2.la	66	hunspell_analyze_DEPENDENCIES = ../hunspell/libhunspell-1.2.la
67	am_hunspell_chmorph_OBJECTS = chmorph.$(OBJEXT)	67	am_hunspell_chmorph_OBJECTS = chmorph.$(OBJEXT)
68	hunspell_chmorph_OBJECTS = $(am_hunspell_chmorph_OBJECTS)	68	hunspell_chmorph_OBJECTS = $(am_hunspell_chmorph_OBJECTS)
69	hunspell_chmorph_DEPENDENCIES = ../hunspell/libhunspell-1.2.la \	69	hunspell_chmorph_DEPENDENCIES = ../parsers/libparsers.a \
70	../parsers/libparsers.a	70	../hunspell/libhunspell-1.2.la
71	am_hunspell_example_OBJECTS = example.$(OBJEXT)	71	am_hunspell_example_OBJECTS = example.$(OBJEXT)
72	hunspell_example_OBJECTS = $(am_hunspell_example_OBJECTS)	72	hunspell_example_OBJECTS = $(am_hunspell_example_OBJECTS)
73	hunspell_example_DEPENDENCIES = ../hunspell/libhunspell-1.2.la	73	hunspell_example_DEPENDENCIES = ../hunspell/libhunspell-1.2.la
Lines 274-286 include_HEADERS = munch.h unmunch.h Link Here
274	hunspell_example_SOURCES = example.cxx	274	hunspell_example_SOURCES = example.cxx
275	hunspell_example_LDADD = ../hunspell/libhunspell-1.2.la	275	hunspell_example_LDADD = ../hunspell/libhunspell-1.2.la
276	hunspell_SOURCES = hunspell.cxx	276	hunspell_SOURCES = hunspell.cxx
277	hunspell_LDADD = -lintl ../hunspell/libhunspell-1.2.la \	277	hunspell_LDADD = -lintl ../parsers/libparsers.a \
278	../parsers/libparsers.a -lncursesw -lreadline -lncurses	278	../hunspell/libhunspell-1.2.la -lncursesw -lreadline -lncurses
279		279
280	hunspell_analyze_SOURCES = analyze.cxx	280	hunspell_analyze_SOURCES = analyze.cxx
281	hunspell_analyze_LDADD = ../hunspell/libhunspell-1.2.la	281	hunspell_analyze_LDADD = ../hunspell/libhunspell-1.2.la
282	hunspell_chmorph_SOURCES = chmorph.cxx	282	hunspell_chmorph_SOURCES = chmorph.cxx
283	hunspell_chmorph_LDADD = ../hunspell/libhunspell-1.2.la ../parsers/libparsers.a	283	hunspell_chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.2.la
284	EXTRA_DIST = makealias affixcompress wordforms	284	EXTRA_DIST = makealias affixcompress wordforms
285	all: all-am	285	all: all-am
286		286

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 32-43 Link Here

(-)hunspell-1.2.8/src/hunspell/phonet.cxx.dist (-2 / +1 lines)
32	#include <cstring>	32	#include <cstring>
33	#include <cstdio>	33	#include <cstdio>
34	#include <cctype>	34	#include <cctype>
35	#else	35	#endif
36	#include <stdlib.h>	36	#include <stdlib.h>
37	#include <string.h>	37	#include <string.h>
38	#include <stdio.h>	38	#include <stdio.h>
39	#include <ctype.h>	39	#include <ctype.h>
40	#endif
41		40
42	#include "csutil.hxx"	41	#include "csutil.hxx"
43	#include "phonet.hxx"	42	#include "phonet.hxx"