cvs commit: src/usr.bin/make

[Joerg Sonnenberger <joerg@xxxxxxxxxxxxxxxxxxxxxxx>]

joerg       2004/12/01 07:17:28 PST

DragonFly src repository

  Modified files:
    usr.bin/make         cond.c make.h parse.c 
  Log:
  cond.c:1.27->1.28
  make.h:1.23->1.24
  parse.c:1.55->1.56
  Author: harti
  Log:
  Improve make's diagnostic of mistmatched .if-.endif. This patch is
  slightly different from the patch in the PR. The problem is, that
  make handles .if clauses inside false .if clauses simply by
  counting them - it doesn't put them onto the conditional stack, nor even
  parses them so we need an extra line number stack for these ifs.
  
  PR:             bin/61257
  Submitted by:   Mikhail Teterin <mi@xxxxxxxxxxxxxxxxx>
  
  parse.c:1.56->1.57
  uthor: harti
  Log:
  Fix handling of comments on .elif lines. The patch given in a followup
  to the PR failed, because the line skipping function is actually called
  from two places in the code to do quite different things (this should
  be two functions probably): in a false .if to skip to the next line
  beginning with a dot and to collect .for loops. In the seconds case we
  should not skip comments, because they are actually harder to handle than
  we need for the .if case and should defer this to the main code.
  
  PR:             bin/25627
  Submitted by:   Seth Kingsley (original patch)
  
  Obtained-from: FreeBSD
  Submitted-by: Max Okumoto <okumoto@xxxxxxxx>
  
  Revision  Changes    Path
  1.12      +21 -2     src/usr.bin/make/cond.c
  1.12      +16 -0     src/usr.bin/make/make.h
  1.18      +8 -15     src/usr.bin/make/parse.c


http://www.dragonflybsd.org/cvsweb/src/usr.bin/make/cond.c.diff?r1=1.11&r2=1.12&f=u
http://www.dragonflybsd.org/cvsweb/src/usr.bin/make/make.h.diff?r1=1.11&r2=1.12&f=u
http://www.dragonflybsd.org/cvsweb/src/usr.bin/make/parse.c.diff?r1=1.17&r2=1.18&f=u