Attachment 12491 Details for Bug 24102 – file.diff

[patch] file.diff

file.diff (text/plain), 2.38 KB, created by tmoestl on 2001-01-06 12:10:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tmoestl

Created: 2001-01-06 12:10:01 UTC

Size: 2.38 KB

patch

obsolete

>diff -c make.orig/suff.c make/suff.c
>*** make.orig/suff.c	Sat Sep 11 15:08:01 1999
>--- make/suff.c	Sat Jan  6 12:49:40 2001
>***************
>*** 462,469 ****
>  {
>      Lst_Concat (suffClean, sufflist, LST_CONCLINK);
>      sufflist = Lst_Init(FALSE);
>!     sNum = 0;
>      suffNull = emptySuff;
>  }
>  
>  /*-
>--- 462,477 ----
>  {
>      Lst_Concat (suffClean, sufflist, LST_CONCLINK);
>      sufflist = Lst_Init(FALSE);
>!     sNum = 1;
>      suffNull = emptySuff;
>+     /*
>+      * Clear suffNull's children list (the other suffixes are built new, but
>+      * suffNull is used as is).
>+      * NOFREE is used because all suffixes are are on the suffClean list.
>+      * suffNull should not have parents.
>+      */
>+     Lst_Destroy(suffNull->children, NOFREE);
>+     suffNull->children = Lst_Init(FALSE);
>  }
>  
>  /*-
>***************
>*** 716,735 ****
>      Suff    	*s = (Suff *) sp;
>      char 	*cp;
>      LstNode	ln;
>!     Suff  	*s2;
>  
>      /*
>       * First see if it is a transformation from this suffix.
>       */
>      cp = SuffStrIsPrefix(s->name, transform->name);
>      if (cp != (char *)NULL) {
>! 	ln = Lst_Find(sufflist, (ClientData)cp, SuffSuffHasNameP);
>! 	if (ln != NILLNODE) {
>  	    /*
>  	     * Found target. Link in and return, since it can't be anything
>  	     * else.
>  	     */
>- 	    s2 = (Suff *)Lst_Datum(ln);
>  	    SuffInsert(s2->children, s);
>  	    SuffInsert(s->parents, s2);
>  	    return(0);
>--- 724,748 ----
>      Suff    	*s = (Suff *) sp;
>      char 	*cp;
>      LstNode	ln;
>!     Suff  	*s2 = NULL;
>  
>      /*
>       * First see if it is a transformation from this suffix.
>       */
>      cp = SuffStrIsPrefix(s->name, transform->name);
>      if (cp != (char *)NULL) {
>! 	if (cp[0] == '\0')  /* null rule */
>! 	    s2 = suffNull;
>! 	else {
>! 	    ln = Lst_Find(sufflist, (ClientData)cp, SuffSuffHasNameP);
>! 	    if (ln != NILLNODE)
>! 	        s2 = (Suff *)Lst_Datum(ln);
>! 	}
>! 	if (s2 != NULL) {
>  	    /*
>  	     * Found target. Link in and return, since it can't be anything
>  	     * else.
>  	     */
>  	    SuffInsert(s2->children, s);
>  	    SuffInsert(s->parents, s2);
>  	    return(0);
>***************
>*** 2361,2367 ****
>      ClientData s;
>      ClientData dummy;
>  {
>!     printf ("%s ", ((Suff *) s)->name);
>      return (dummy ? 0 : 0);
>  }
>  
>--- 2374,2380 ----
>      ClientData s;
>      ClientData dummy;
>  {
>!     printf ("`%s' ", ((Suff *) s)->name);
>      return (dummy ? 0 : 0);
>  }

Actions: View | Diff

Attachments on bug 24102: 12490 | 12491