Update of /cvsroot/monetdb/pathfinder/modules/pftijah
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv26559
Modified Files:
Tag: XQuery_0-16
porter_dutch.c porter_eng.c
Log Message:
Fix compilation issues on icc.
The next time somebody has the bright idea to make fairly major
changes just before a release they will be shot. Especially if they
don't follow up on their changes and check the test web the next
morning.
Index: porter_dutch.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/porter_dutch.c,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- porter_dutch.c 21 Feb 2007 12:22:09 -0000 1.1.2.2
+++ porter_dutch.c 24 Feb 2007 10:54:30 -0000 1.1.2.3
@@ -77,11 +77,11 @@
/* some shortcuts for sets of letters */
-#define A_DIA a\344\341\340\342
+#define A_DIA "a\344\341\340\342"
#define E_DIA "e\353\351\350\352"
-#define I_DIA i\357\355\354\356
-#define O_DIA o\366\363\362\364
-#define U_DIA u\374\372\371\373
+#define I_DIA "i\357\355\354\356"
+#define O_DIA "o\366\363\362\364"
+#define U_DIA "u\374\372\371\373"
#define AEIOU
"a\344\341\340\342e\353\351\350\352i\357\355\354\356o\366\363\362\364u\374\372\371\373"
#define AEIOUY
"a\344\341\340\342e\353\351\350\352i\357\355\354\356o\366\363\362\364u\374\372\371\373y"
#define AEIOUWXY
"a\344\341\340\342e\353\351\350\352i\357\355\354\356o\366\363\362\364u\374\372\371\373wxy"
@@ -342,8 +342,7 @@
**/
static int
-WordSize( word )
- char *word; /* in: word having its WordSize taken */
+WordSize( char *word ) /* in: word having its WordSize taken */
{
register int result; /* WordSize of the word */
register int state; /* current state in machine */
@@ -402,8 +401,7 @@
**/
static int
-ContainsVowel( word )
- char *word; /* in: buffer with word checked */
+ContainsVowel( char *word ) /* in: buffer with word checked */
{
if ( EOS == *word )
@@ -430,8 +428,7 @@
**/
static int
-DupVCond( word )
- char *word; /* in: buffer with the word checked */
+DupVCond( char *word ) /* in: buffer with the word checked */
{
int length;
char *butt; /* do not affect the global end pointer !! */
@@ -505,8 +502,7 @@
**/
static int
-EndsWithV( word )
- char *word; /* in: buffer with the word checked */
+EndsWithV( char *word ) /* in: buffer with the word checked */
{
char *butt;
int len;
@@ -525,8 +521,7 @@
static int
-EndsWithVX( word )
- char *word; /* in: buffer with the word checked */
+EndsWithVX( char *word ) /* in: buffer with the word checked */
{
char *butt;
int len;
@@ -560,8 +555,7 @@
**/
static int
-EndsWithC( word )
- char *word; /* in: buffer with the word checked */
+EndsWithC( char *word ) /* in: buffer with the word checked */
{
char *butt;
int len;
@@ -593,8 +587,7 @@
static int
-gt2( word )
- char *word; /* in: buffer with the word checked */
+gt2( char *word ) /* in: buffer with the word checked */
{
int len;
@@ -619,8 +612,7 @@
**/
static int
-DuplicateV( word )
- char *word; /* in: buffer with the word checked */
+DuplicateV( char *word ) /* in: buffer with the word checked */
{
int length; /* for finding the last three characters */
@@ -665,9 +657,8 @@
**/
static int
-ReplaceSuffix( word, rule )
- char *word; /* in/out: buffer with the stemmed word */
- RuleList *rule; /* in: data structure with replacement rules */
+ReplaceSuffix( char *word, /* in/out: buffer with the stemmed word */
+ RuleList *rule ) /* in: data structure with replacement rules
*/
{
register char *ending; /* set to start of possible stemmed suffix */
char tmp_ch; /* save replaced character when testing */
@@ -718,9 +709,8 @@
**/
static int
-ReplacePrefix( word, rule )
- char *word; /* in/out: buffer with the stemmed word */
- RuleList *rule; /* in: data structure with replacement rules */
+ReplacePrefix( char *word, /* in/out: buffer with the stemmed word */
+ RuleList *rule ) /* in: data structure with replacement rules
*/
{
register char *root; /* set to end of possible stemmed prefix */
@@ -790,9 +780,8 @@
/* ReplaceInfix is derived from ReplacePrefix */
static int
-ReplaceInfix( word, rule )
- char *word; /* in/out: buffer with the stemmed word */
- RuleList *rule; /* in: data structure with replacement rules */
+ReplaceInfix( char *word, /* in/out: buffer with the stemmed word */
+ RuleList *rule ) /* in: data structure with replacement rules
*/
{
register char *root; /* set to end of possible stemmed prefix */
register char *infix;
@@ -849,8 +838,7 @@
/* StripDashes is derived from ReplaceInfix */
static int
-StripDashes( word)
- char *word; /* in/out: buffer with the stemmed word */
+StripDashes( char *word) /* in/out: buffer with the stemmed word */
{
register char *infix;
@@ -919,8 +907,7 @@
/* RemoveDia removes tremas */
static int
-RemoveDia( c)
- char *c;
+RemoveDia( char *c)
{
if (*c == '\353') *c = 'e';
if (*c == '\357') *c = 'i';
@@ -964,8 +951,7 @@
**/
int
-dStem( word )
- char *word; /* in/out: the word stemmed */
+dStem( char *word ) /* in/out: the word stemmed */
{
int rule; /* which rule is fired in replacing an end */
int cleanup;
Index: porter_eng.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/porter_eng.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- porter_eng.c 21 Feb 2007 09:47:14 -0000 1.1.2.1
+++ porter_eng.c 24 Feb 2007 10:54:30 -0000 1.1.2.2
@@ -231,8 +231,7 @@
**/
static int
-WordSize( word )
- char *word; /* in: word having its WordSize taken */
+WordSize( char *word ) /* in: word having its WordSize taken */
{
register int result; /* WordSize of the word */
register int state; /* current state in machine */
@@ -280,8 +279,7 @@
**/
static int
-ContainsVowel( word )
- char *word; /* in: buffer with word checked */
+ContainsVowel( char *word ) /* in: buffer with word checked */
{
if ( EOS == *word )
@@ -309,8 +307,7 @@
**/
static int
-EndsWithCVC( word )
- char *word; /* in: buffer with the word checked */
+EndsWithCVC( char *word ) /* in: buffer with the word checked */
{
int length; /* for finding the last three characters */
@@ -341,8 +338,7 @@
**/
static int
-AddAnE( word )
- char *word;
+AddAnE( char *word )
{
return( (1 == WordSize(word)) && EndsWithCVC(word) );
@@ -364,8 +360,7 @@
**/
static int
-RemoveAnE( word )
- char *word;
+RemoveAnE( char *word )
{
return( (1 == WordSize(word)) && !EndsWithCVC(word) );
@@ -393,9 +388,8 @@
**/
static int
-ReplaceEnd( word, rule )
- char *word; /* in/out: buffer with the stemmed word */
- RuleList *rule; /* in: data structure with replacement rules */
+ReplaceEnd( char *word, /* in/out: buffer with the stemmed word */
+ RuleList *rule ) /* in: data structure with replacement rules */
{
register char *ending; /* set to start of possible stemmed suffix */
char tmp_ch; /* save replaced character when testing */
@@ -458,8 +452,7 @@
**/
int
-Stem( word )
- char *word; /* in/out: the word stemmed */
+Stem( char *word ) /* in/out: the word stemmed */
{
int rule; /* which rule is fired in replacing an end */
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
