cscope-cvs — CVS activity mailing list

[Cscope-cvs] CVS: cscope/contrib Makefile.am,1.1,1.2

[Hans-Bernhard B. <br...@us...>]

Update of /cvsroot/cscope/cscope/contrib
In directory usw-pr-cvs1:/tmp/cvs-serv422/contrib

Modified Files:
	Makefile.am 
Log Message:
Further steps to "make dist" and "make distcheck" work

Index: Makefile.am
===================================================================
RCS file: /cvsroot/cscope/cscope/contrib/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Makefile.am	2000/05/19 01:13:54	1.1
--- Makefile.am	2001/06/27 15:51:26	1.2
***************
*** 2,3 ****
--- 2,6 ----
  
  bin_SCRIPTS = ocs
+ 
+ EXTRA_DIST = ocs README xcscope
+ 

[Cscope-cvs] CVS: cscope Makefile.am,1.2,1.3 configure.in,1.15,1.16

[Hans-Bernhard B. <br...@us...>]

Update of /cvsroot/cscope/cscope
In directory usw-pr-cvs1:/tmp/cvs-serv422

Modified Files:
	Makefile.am configure.in 
Log Message:
Further steps to "make dist" and "make distcheck" work

Index: Makefile.am
===================================================================
RCS file: /cvsroot/cscope/cscope/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Makefile.am	2000/05/19 01:50:53	1.2
--- Makefile.am	2001/06/27 15:51:26	1.3
***************
*** 3,5 ****
  SUBDIRS = doc src contrib
  
! EXTRA_DIST = contrib/README contrib/ocs
--- 3,6 ----
  SUBDIRS = doc src contrib
  
! EXTRA_DIST = packages
! 

Index: configure.in
===================================================================
RCS file: /cvsroot/cscope/cscope/configure.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** configure.in	2001/06/26 14:05:52	1.15
--- configure.in	2001/06/27 15:51:26	1.16
***************
*** 132,136 ****
      fi
  ])
- AM_CONDITIONAL(USING_LEX, text "x$LEX" = "xflex")
  dnl === END aclocal REPLACEMENT MACROS
  
--- 132,135 ----
***************
*** 145,148 ****
--- 144,148 ----
  AC_PROG_CC
  AMNU_PROG_LEX
+ AM_CONDITIONAL(USING_LEX, test "x$LEX" = "xlex")
  dnl below is hack to shut automake up about things it shouldn't be checking
  if false; then

[Cscope-cvs] CVS: cscope/src Makefile.am,1.5,1.6

[Hans-Bernhard B. <br...@us...>]

Update of /cvsroot/cscope/cscope/src
In directory usw-pr-cvs1:/tmp/cvs-serv422/src

Modified Files:
	Makefile.am 
Log Message:
Further steps to "make dist" and "make distcheck" work

Index: Makefile.am
===================================================================
RCS file: /cvsroot/cscope/cscope/src/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** Makefile.am	2001/06/26 14:05:52	1.5
--- Makefile.am	2001/06/27 15:51:26	1.6
***************
*** 25,32 ****
  
  ## Hack to clean the generated files and not include them in a "make dist".
! BUILT_SOURCES = $(LEXER_SOURCE).c egrep.c
! CLEANFILES = $(LEXER_SOURCE).c egrep.c
  dist-hook:
! 	rm -f $(distdir)/$(LEXER_SOURCE).c $(distdir)/egrep.c
  
  EXTRA_DIST = emacs.e gmacs.ml
--- 25,31 ----
  
  ## Hack to clean the generated files and not include them in a "make dist".
! CLEANFILES = scanner.c fscanner.c egrep.c
  dist-hook:
! 	rm -f $(distdir)/scanner.c $(distdir)/fscanner.c $(distdir)/egrep.c
  
  EXTRA_DIST = emacs.e gmacs.ml

[Cscope-cvs] CVS: cscope ChangeLog,1.77,1.78 configure.in,1.14,1.15

[Hans-Bernhard B. <br...@us...>]

Update of /cvsroot/cscope/cscope
In directory usw-pr-cvs1:/tmp/cvs-serv13645

Modified Files:
	ChangeLog configure.in 
Log Message:
Fixed some gotchas related to the "make dist" automake target

Index: ChangeLog
===================================================================
RCS file: /cvsroot/cscope/cscope/ChangeLog,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -r1.77 -r1.78
*** ChangeLog	2001/06/25 12:13:18	1.77
--- ChangeLog	2001/06/26 14:05:52	1.78
***************
*** 1,2 ****
--- 1,11 ----
+ (2001/06/26 - broeker) Changed lex/flex handling in automake/autoconf setup
+ 	               to make 'make distcheck' work cleanly: added new
+ 		       files scanner.h and lookup.h to list of sources. 
+ 		       Made sure both scanner.l and fscanner.l end up in the
+ 		       distribution tarball, as they should.  Removed some
+ 		       quotes from definition of ACNU_DECL_YYTEXT in 
+ 		       configure.in which confused autoheader.
+ (2001/06/25 - broeker) Change handling of tag-less enums to same method as
+ 	               used in fscanner.l since 2001/06/19.
  (2001/06/25 - broeker) Fix SF bug #435535: two uses of yytext[] had been left 
  	               over in fscanner.l, causing incorrect compression of

Index: configure.in
===================================================================
RCS file: /cvsroot/cscope/cscope/configure.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** configure.in	2001/06/01 12:44:36	1.14
--- configure.in	2001/06/26 14:05:52	1.15
***************
*** 112,117 ****
      if test $ac_cv_prog_lex_yytext_pointer = yes; then
        AC_DEFINE(YYTEXT_POINTER, 1,
!             [Define if `lex' declares `yytext' as a `char *' by default,
!              not a `char[]'.])
      fi
  ])# AC_DECL_YYTEXT1
--- 112,117 ----
      if test $ac_cv_prog_lex_yytext_pointer = yes; then
        AC_DEFINE(YYTEXT_POINTER, 1,
!             [Define if lex declares yytext as a char * by default,
!              not a char[].])
      fi
  ])# AC_DECL_YYTEXT1
***************
*** 128,139 ****
      ACNU_DECL_YYTEXT
  dnl set up variable used to choose between the two lexer sources...
!     if test "x$LEX" = "xflex"; then
! 	LEXER_SOURCE="fscanner"
!     else
! 	LEXER_SOURCE="scanner"
  	AC_DEFINE(USING_LEX)
      fi
-     AC_SUBST(LEXER_SOURCE)
  ])
  dnl === END aclocal REPLACEMENT MACROS
  
--- 128,136 ----
      ACNU_DECL_YYTEXT
  dnl set up variable used to choose between the two lexer sources...
!     if test "x$LEX" = "xlex" ; then
  	AC_DEFINE(USING_LEX)
      fi
  ])
+ AM_CONDITIONAL(USING_LEX, text "x$LEX" = "xflex")
  dnl === END aclocal REPLACEMENT MACROS
  

[Cscope-cvs] CVS: cscope/src Makefile.am,1.4,1.5

[Hans-Bernhard B. <br...@us...>]

Update of /cvsroot/cscope/cscope/src
In directory usw-pr-cvs1:/tmp/cvs-serv13645/src

Modified Files:
	Makefile.am 
Log Message:
Fixed some gotchas related to the "make dist" automake target

Index: Makefile.am
===================================================================
RCS file: /cvsroot/cscope/cscope/src/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** Makefile.am	2001/03/29 15:01:57	1.4
--- Makefile.am	2001/06/26 14:05:52	1.5
***************
*** 3,16 ****
  bin_PROGRAMS = cscope
  
  cscope_SOURCES = $(LEXER_SOURCE).l egrep.y \
! 		alloc.c basename.c command.c compath.c constants.h \
! 		crossref.c dir.c display.c edit.c exec.c find.c \
! 		global.h help.c history.c input.c invlib.c invlib.h \
! 		library.h logdir.c lookup.c main.c mouse.c mygetenv.c \
! 		mypopen.c version.h vp.h vpaccess.c vpfopen.c \
! 		vpinit.c vpopen.c
  
  LEXLIB = @LEXLIB@
- LEXER_SOURCE = @LEXER_SOURCE@
  
  cscope_LDADD =  $(CURSES_LIBS) $(LEXLIB)
--- 3,22 ----
  bin_PROGRAMS = cscope
  
+ if USING_LEX
+ LEXER_SOURCE=scanner
+ else
+ LEXER_SOURCE=fscanner
+ endif
+ 
  cscope_SOURCES = $(LEXER_SOURCE).l egrep.y \
! 	alloc.c basename.c command.c compath.c constants.h crossref.c dir.c \
! 	display.c edit.c exec.c find.c global.h help.c history.c input.c \
! 	invlib.c invlib.h library.h logdir.c lookup.c lookup.h main.c mouse.c \
! 	mygetenv.c mypopen.c scanner.h version.h vp.h vpaccess.c vpfopen.c \
! 	vpinit.c vpopen.c
! 
! EXTRA_cscope_SOURCES = scanner.l fscanner.l
  
  LEXLIB = @LEXLIB@
  
  cscope_LDADD =  $(CURSES_LIBS) $(LEXLIB)

[Cscope-cvs] CVS: cscope/src scanner.l,1.5,1.6

[Hans-Bernhard B. <br...@us...>]

Update of /cvsroot/cscope/cscope/src
In directory usw-pr-cvs1:/tmp/cvs-serv11081/src

Modified Files:
	scanner.l 
Log Message:
Treat tag-less enum/struct/union as in fscanner.l

Index: scanner.l
===================================================================
RCS file: /cvsroot/cscope/cscope/src/scanner.l,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** scanner.l	2001/06/01 12:43:24	1.5
--- scanner.l	2001/06/26 13:55:07	1.6
***************
*** 358,366 ****
  			/* NOTREACHED */
  		}
! (enum|struct|union)/([ \t\n]+{identifier})?[ \t\n]*\{	{ /* enum/struct/union definition */
  			tagdef = *(yytext + first);
  			goto ident;
  			/* NOTREACHED */
  		}
  {identifier}/[ \t]*\([ \t\na-zA-Z0-9_*&[\]=,.]*\)[ \t\n()]*[:a-zA-Z_#{]	{
  			
--- 358,375 ----
  			/* NOTREACHED */
  		}
! (enum|struct|union)/([ \t\n]+{identifier})[ \t\n]*\{	{ /* enum/struct/union definition */
  			tagdef = *(yytext + first);
  			goto ident;
  			/* NOTREACHED */
  		}
+ (enum|struct|union)/[ \t\n]*\{		{ /* tag-less e/s/u definition */
+ 			tagdef = yytext[first];
+ 			if (braces == 0) {
+ 				esudef = YES;
+ 			}
+ 			last = first;
+ 			tagdef = '\0';
+ 			goto more;
+ 		}  			
  {identifier}/[ \t]*\([ \t\na-zA-Z0-9_*&[\]=,.]*\)[ \t\n()]*[:a-zA-Z_#{]	{
  			

[Cscope-cvs] CVS: cscope/src fscanner.l,1.4,1.5

[Hans-Bernhard B. <br...@us...>]

Update of /cvsroot/cscope/cscope/src
In directory usw-pr-cvs1:/tmp/cvs-serv4158/src

Modified Files:
	fscanner.l 
Log Message:
Fix SF bug #435535

Index: fscanner.l
===================================================================
RCS file: /cvsroot/cscope/cscope/src/fscanner.l,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** fscanner.l	2001/06/19 20:04:02	1.4
--- fscanner.l	2001/06/25 12:13:18	1.5
***************
*** 350,354 ****
  			last = my_yyleng - 1;
  			if (compress == YES) {
! 				yytext[0] = '\2';	/* compress the keyword */
  			}
  			BEGIN(INITIAL);
--- 350,354 ----
  			last = my_yyleng - 1;
  			if (compress == YES) {
! 				my_yytext[0] = '\2';	/* compress the keyword */
  			}
  			BEGIN(INITIAL);
***************
*** 451,455 ****
  			token = DEFINE;
  			if (compress == YES) {
! 				yytext[0] = '\1';	/* compress the keyword */
  			}
  		findident:
--- 451,455 ----
  			token = DEFINE;
  			if (compress == YES) {
! 				my_yytext[0] = '\1';	/* compress the keyword */
  			}
  		findident:

[Cscope-cvs] CVS: cscope ChangeLog,1.76,1.77

[Hans-Bernhard B. <br...@us...>]

Update of /cvsroot/cscope/cscope
In directory usw-pr-cvs1:/tmp/cvs-serv4158

Modified Files:
	ChangeLog 
Log Message:
Fix SF bug #435535

Index: ChangeLog
===================================================================
RCS file: /cvsroot/cscope/cscope/ChangeLog,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -r1.76 -r1.77
*** ChangeLog	2001/06/19 20:04:01	1.76
--- ChangeLog	2001/06/25 12:13:18	1.77
***************
*** 1,2 ****
--- 1,5 ----
+ (2001/06/25 - broeker) Fix SF bug #435535: two uses of yytext[] had been left 
+ 	               over in fscanner.l, causing incorrect compression of
+ 		       keywords #define and #include.
  (2001/06/19 - broeker) More bugfixes and changes to flex scanner. Handling
  	               of preprocessing directives treats whitespace and

[Cscope-cvs] CVS: cscope/src fscanner.l,1.3,1.4

[Hans-Bernhard B. <br...@us...>]

Update of /cvsroot/cscope/cscope/src
In directory usw-pr-cvs1:/tmp/cvs-serv26568/src

Modified Files:
	fscanner.l 
Log Message:
fscanner.l: bugfixes and improvements

Index: fscanner.l
===================================================================
RCS file: /cvsroot/cscope/cscope/src/fscanner.l,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** fscanner.l	2001/06/15 11:00:35	1.3
--- fscanner.l	2001/06/19 20:04:02	1.4
***************
*** 139,143 ****
  
  /* exclusive start conditions. not available in AT&T lex -> use flex! */
! %x WAS_ENDIF WAS_IDENTIFIER WAS_ESU IN_DQUOTE IN_SQUOTE COMMENT
  
  %%
--- 139,143 ----
  
  /* exclusive start conditions. not available in AT&T lex -> use flex! */
! %x IN_PREPROC WAS_ENDIF WAS_IDENTIFIER WAS_ESU IN_DQUOTE IN_SQUOTE COMMENT
  
  %%
***************
*** 223,229 ****
  		}
  
! \#[ \t]*endif(([ \t]|{comment}).*)?		{	/* #endif */
  			/* delay treatment of #endif depending on whether an
  			 * #if comes right after it, or not */
  			BEGIN(WAS_ENDIF);
  			goto more;
--- 223,245 ----
  		}
  
! \#[ \t]*	{ /* start a preprocessor line */
! 			if (rules == NO)		/* don't consider CPP for lex/yacc rules */
! 				BEGIN(IN_PREPROC);
! 			yyleng = 1;	/* get rid of the blanks, if any */
! 			goto more;
! 			/* NOTREACHED */
! 		}
! <IN_PREPROC>.|\n			|
! <IN_PREPROC>{identifier}	{   /* unknown preprocessor line */
! 			BEGIN(INITIAL);
! 			goto more;
! 			/* NOTREACHED */
! 		}
! 
! <IN_PREPROC>endif([^a-zA-Z0-9_$\n].*)?	{	/* #endif */
  			/* delay treatment of #endif depending on whether an
  			 * #if comes right after it, or not */
+ 			/* HBB 20010619: new pattern allows trailing garbage
+ 			 * after the #endif */
  			BEGIN(WAS_ENDIF);
  			goto more;
***************
*** 267,273 ****
  		}
  
! \#[ \t]*ifndef[ \t]+	|
! \#[ \t]*ifdef[ \t]+		|
! \#[ \t]*if[ \t]+		{ /* #if directive */
  			elseelif = NO;
  			if (pseudoelif == YES) {
--- 283,289 ----
  		}
  
! <IN_PREPROC>ifndef[ \t]+	|
! <IN_PREPROC>ifdef[ \t]+		|
! <IN_PREPROC>if[ \t]+		{ /* #if directive */
  			elseelif = NO;
  			if (pseudoelif == YES) {
***************
*** 285,292 ****
  			preifbraces[iflevel] = braces;
  			maxifbraces[iflevel++] = 0;
  			goto more;
  			/* NOTREACHED */
  		}
! \#[ \t]*else([ \t].*)?	{ /* #else --- eat up whole line */
  			elseelif = YES;
  			if (iflevel > 0) {
--- 301,309 ----
  			preifbraces[iflevel] = braces;
  			maxifbraces[iflevel++] = 0;
+ 			BEGIN(INITIAL);
  			goto more;
  			/* NOTREACHED */
  		}
! <IN_PREPROC>else([ \t].*)?	{ /* #else --- eat up whole line */
  			elseelif = YES;
  			if (iflevel > 0) {
***************
*** 299,306 ****
  				braces = preifbraces[iflevel - 1];
  			}
  			goto more;
  			/* NOTREACHED */
  		}
! \#[ \t]*elif[ \t]+	{ /* #elif */
  			/* elseelif = YES; --- HBB I doubt this is correct */
  		elif:
--- 316,324 ----
  				braces = preifbraces[iflevel - 1];
  			}
+ 			BEGIN(INITIAL);
  			goto more;
  			/* NOTREACHED */
  		}
! <IN_PREPROC>elif[ \t]+	{ /* #elif */
  			/* elseelif = YES; --- HBB I doubt this is correct */
  		elif:
***************
*** 314,321 ****
--- 332,360 ----
  				braces = preifbraces[iflevel - 1];
  			}
+ 			BEGIN(INITIAL);
  			goto more;
  			/* NOTREACHED */
  		}
  
+ <IN_PREPROC>include[ \t]*\"[^"\n]+\" |
+ <IN_PREPROC>include[ \t]*<[^>\n]+> 	{ /* #include file */
+ 			char	*s;
+ 			char remember = yytext[yyleng-1];
+ 			
+ 			my_yymore();
+ 			s = strpbrk(my_yytext, "\"<");
+ 			my_yytext[my_yyleng-1] = '\0';
+ 			incfile(s + 1, s);
+ 			my_yytext[my_yyleng-1] = remember;
+ 			first = s - my_yytext;
+ 			last = my_yyleng - 1;
+ 			if (compress == YES) {
+ 				yytext[0] = '\2';	/* compress the keyword */
+ 			}
+ 			BEGIN(INITIAL);
+ 			return(INCLUDE);
+ 			/* NOTREACHED */
+ 		}
+ 
  \}		{
  			/* could be the last enum member initializer */
***************
*** 406,410 ****
  			/* NOTREACHED */
  		}
! \#[ \t]*define[ \t]+{identifier}	{
  				
  			/* preprocessor macro or constant definition */
--- 445,449 ----
  			/* NOTREACHED */
  		}
! <IN_PREPROC>define[ \t]+{identifier}	{
  				
  			/* preprocessor macro or constant definition */
***************
*** 425,428 ****
--- 464,468 ----
  			++first;
  			last = my_yyleng;
+ 			BEGIN(INITIAL);
  			goto definition;
  			/* NOTREACHED */
***************
*** 443,451 ****
  		}
  <WAS_ESU>{
! ({whitespace}+{identifier})?{whitespace}*\{		{ /* e/s/u definition */
  			tagdef = my_yytext[ident_start];
  			BEGIN(WAS_IDENTIFIER);
  			goto ident;
  		}
  ({whitespace}+{identifier})?{whitespace}* 	|   
  .|\n										{   /* e/s/u usage */
--- 483,502 ----
  		}
  <WAS_ESU>{
! ({whitespace}+{identifier}){whitespace}*\{		{ /* e/s/u definition */
  			tagdef = my_yytext[ident_start];
  			BEGIN(WAS_IDENTIFIER);
  			goto ident;
  		}
+ {whitespace}*\{		{ /* e/s/u definition without a tag */
+ 			tagdef = my_yytext[ident_start];
+ 			BEGIN(INITIAL);
+ 			if (braces == 0) {
+ 				esudef = YES;
+ 			}
+ 			last = first;
+ 			yyless(0);  /* re-scan all this as normal text */
+ 			tagdef = '\0';
+ 			goto more;
+ 		}
  ({whitespace}+{identifier})?{whitespace}* 	|   
  .|\n										{   /* e/s/u usage */
***************
*** 467,470 ****
--- 518,522 ----
  			/* NOTREACHED */
  		}
+ 
  <WAS_IDENTIFIER>{       
  [ \t]*\(({whitespace}|{identifier}|[*&[\]=,.])*\)([()]|{whitespace})*[:a-zA-Z_#{]	{
***************
*** 726,747 ****
  		}
  
! \#[ \t]*include[ \t]*\"[^"\n]+\" |
! \#[ \t]*include[ \t]*<[^>\n]+> 	{ /* #include file */
! 			char	*s;
! 			char remember = yytext[yyleng-1];
! 			
! 			my_yymore();
! 			s = strpbrk(my_yytext, "\"<");
! 			my_yytext[my_yyleng-1] = '\0';
! 			incfile(s + 1, s);
! 			my_yytext[my_yyleng-1] = remember;
! 			first = s - my_yytext;
! 			last = my_yyleng - 1;
! 			if (compress == YES) {
! 				yytext[0] = '\2';	/* compress the keyword */
! 			}
! 			return(INCLUDE);
! 			/* NOTREACHED */
! 		}
  
  "/*"					yy_push_state(COMMENT);
--- 778,784 ----
  		}
  
! [ \t]{2,}	{   /* compress sequential whitespace here, not in putcrossref() */
! 			unput(' ');
!  		}
  
  "/*"					yy_push_state(COMMENT);
***************
*** 766,769 ****
--- 803,807 ----
  
  "//".*\n?		{
+ 			/* C++-style one-line comment */
  			goto eol;
  			/* NOTREACHED */
***************
*** 772,776 ****
  {number}				|	/* number */
  <SDL>STATE[ \t]+		|   /* ... and other syntax error catchers... */
- \#[ \t]*{identifier}	|   /* unknown preprocessor line */
  .						{	/* punctuation and operators */
  						more:	
--- 810,813 ----
***************
*** 825,829 ****
  	my_yyleng = 0;
  	
! 	BEGIN 0;
  
  	/* if this is not a C file */
--- 862,866 ----
  	my_yyleng = 0;
  	
! 	BEGIN(INITIAL);
  
  	/* if this is not a C file */
***************
*** 844,848 ****
  			if (strcmp(s, "sd") == 0) {	/* sdl */
  				sdl = YES;
! 				BEGIN SDL;
  			}
  			break;
--- 881,885 ----
  			if (strcmp(s, "sd") == 0) {	/* sdl */
  				sdl = YES;
! 				BEGIN(SDL);
  			}
  			break;

[Cscope-cvs] CVS: cscope ChangeLog,1.75,1.76

[Hans-Bernhard B. <br...@us...>]

Update of /cvsroot/cscope/cscope
In directory usw-pr-cvs1:/tmp/cvs-serv26568

Modified Files:
	ChangeLog 
Log Message:
fscanner.l: bugfixes and improvements

Index: ChangeLog
===================================================================
RCS file: /cvsroot/cscope/cscope/ChangeLog,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -r1.75 -r1.76
*** ChangeLog	2001/06/15 11:01:27	1.75
--- ChangeLog	2001/06/19 20:04:01	1.76
***************
*** 1,2 ****
--- 1,12 ----
+ (2001/06/19 - broeker) More bugfixes and changes to flex scanner. Handling
+ 	               of preprocessing directives treats whitespace and
+ 		       garbage after the keyword more gently. It also avoids
+ 		       treating lex patterns as preprocessing directives. And 
+ 		       enum/struct/union definitions without a tag are no
+ 		       longer written out to the database, which should help
+ 		       to get rid of 'cannot get sourceline' error messages.
+ 		       Also a new rule to compress whitespace sequences by
+ 		       means of a flex rule (should to be faster than 
+ 		       hand-coding).
  (2001/06/15 - broeker) Bugfix to flex scanner: comments after an #endif, 
  	               without any whitespace in between, would be dumped

[Cscope-cvs] CVS: cscope ChangeLog,1.74,1.75

[Hans-Bernhard B. <br...@us...>]

Update of /cvsroot/cscope/cscope
In directory usw-pr-cvs1:/tmp/cvs-serv9454

Modified Files:
	ChangeLog 
Log Message:
Updated

Index: ChangeLog
===================================================================
RCS file: /cvsroot/cscope/cscope/ChangeLog,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -r1.74 -r1.75
*** ChangeLog	2001/06/01 12:47:07	1.74
--- ChangeLog	2001/06/15 11:01:27	1.75
***************
*** 1,2 ****
--- 1,8 ----
+ (2001/06/15 - broeker) Bugfix to flex scanner: comments after an #endif, 
+ 	               without any whitespace in between, would be dumped
+ 		       to stdout.
+ (2001/06/15 - broeker) Minor documentation glitch in manpage and online help
+ 	               screen: set of keys to choose from matches found 
+ 		       contains 0-9, not 1-9. 
  (2001/06/01 - broeker) New version of fscanner.l, and lots of
  	               small changes to other source files, too. Avoids

[Cscope-cvs] CVS: cscope/doc cscope.1,1.14,1.15

[Hans-Bernhard B. <br...@us...>]

Update of /cvsroot/cscope/cscope/doc
In directory usw-pr-cvs1:/tmp/cvs-serv9370/doc

Modified Files:
	cscope.1 
Log Message:
Documentation glitch: set of keys to select a match is 0-9, not 1-9

Index: cscope.1
===================================================================
RCS file: /cvsroot/cscope/cscope/doc/cscope.1,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** cscope.1	2001/05/30 19:31:23	1.14
--- cscope.1	2001/06/15 11:01:14	1.15
***************
*** 186,190 ****
  can be used:
  .TP
! .B 1-9a-zA-Z
  Edit the file referenced by the given line number.
  .TP
--- 186,190 ----
  can be used:
  .TP
! .B 0-9a-zA-Z
  Edit the file referenced by the given line number.
  .TP
***************
*** 284,288 ****
  .PP
  .TP
! .B 1-9a-zA-Z
  Mark or unmark the line to be changed.
  .TP
--- 284,288 ----
  .PP
  .TP
! .B 0-9a-zA-Z
  Mark or unmark the line to be changed.
  .TP

[Cscope-cvs] CVS: cscope/src help.c,1.3,1.4

[Hans-Bernhard B. <br...@us...>]

Update of /cvsroot/cscope/cscope/src
In directory usw-pr-cvs1:/tmp/cvs-serv9370/src

Modified Files:
	help.c 
Log Message:
Documentation glitch: set of keys to select a match is 0-9, not 1-9

Index: help.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/help.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** help.c	2000/05/31 16:54:10	1.3
--- help.c	2001/06/15 11:01:14	1.4
***************
*** 72,76 ****
  			*tp++ = "last 2 input fields, the pattern can be a regcmp(3X) regular expression.\n";
  			*tp++ = "If the search is successful, you can use these single-character commands:\n\n";
! 			*tp++ = "1-9a-zA-Z\tEdit the file containing the displayed line.\n";
  		}
  		*tp++ = "space bar\tDisplay next set of matching lines.\n";
--- 72,76 ----
  			*tp++ = "last 2 input fields, the pattern can be a regcmp(3X) regular expression.\n";
  			*tp++ = "If the search is successful, you can use these single-character commands:\n\n";
! 			*tp++ = "0-9a-zA-Z\tEdit the file containing the displayed line.\n";
  		}
  		*tp++ = "space bar\tDisplay next set of matching lines.\n";
***************
*** 114,118 ****
  		else {
  			*tp++ = "When changing text, you can use these single-character commands:\n\n";
! 			*tp++ = "1-9a-zA-Z\tMark or unmark the line to be changed.\n";
  		}
  		*tp++ = "*\t\tMark or unmark all displayed lines to be changed.\n";
--- 114,118 ----
  		else {
  			*tp++ = "When changing text, you can use these single-character commands:\n\n";
! 			*tp++ = "0-9a-zA-Z\tMark or unmark the line to be changed.\n";
  		}
  		*tp++ = "*\t\tMark or unmark all displayed lines to be changed.\n";

[Cscope-cvs] CVS: cscope/src fscanner.l,1.2,1.3

[Hans-Bernhard B. <br...@us...>]

Update of /cvsroot/cscope/cscope/src
In directory usw-pr-cvs1:/tmp/cvs-serv9197/src

Modified Files:
	fscanner.l 
Log Message:
Bugfix in flex scanner: comments directly after #endif

Index: fscanner.l
===================================================================
RCS file: /cvsroot/cscope/cscope/src/fscanner.l,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** fscanner.l	2001/06/01 12:43:24	1.2
--- fscanner.l	2001/06/15 11:00:35	1.3
***************
*** 223,227 ****
  		}
  
! \#[ \t]*endif([ \t].*)?		{	/* #endif */
  			/* delay treatment of #endif depending on whether an
  			 * #if comes right after it, or not */
--- 223,227 ----
  		}
  
! \#[ \t]*endif(([ \t]|{comment}).*)?		{	/* #endif */
  			/* delay treatment of #endif depending on whether an
  			 * #if comes right after it, or not */

[Cscope-cvs] CVS: cscope ChangeLog,1.73,1.74

[Hans-Bernhard B. <br...@us...>]

Update of /cvsroot/cscope/cscope
In directory usw-pr-cvs1:/tmp/cvs-serv22024

Modified Files:
	ChangeLog 
Log Message:
Updated after checkins

Index: ChangeLog
===================================================================
RCS file: /cvsroot/cscope/cscope/ChangeLog,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -r1.73 -r1.74
*** ChangeLog	2001/05/30 21:10:55	1.73
--- ChangeLog	2001/06/01 12:47:07	1.74
***************
*** 1,2 ****
--- 1,11 ----
+ (2001/06/01 - broeker) New version of fscanner.l, and lots of
+ 	               small changes to other source files, too. Avoids
+ 		       (ab)use of yytext[] as a temporary buffer by unrelated
+ 		       pieces of code, and changes exported variables of the
+ 		       scanned line from lex-internal yyleng and my_yyleng 
+ 		       to my_yytext and my_yyleng. New header files scanner.h
+ 		       and lookup.h. 
+ (2001/06/01 - broeker) Fix 64bit-related bug in invlib.c that caused the symbol
+                        'sun' to not be found on DigitalUnix/Alpha platform.
  (2001/05/30 - dixon) arrow and editing keys can be now used at the input line
  (2001/05/30 - duell) invname database issue fix.

[Cscope-cvs] CVS: cscope acconfig.h,1.5,1.6 config.h.in,1.5,1.6 configure.in,1.13,1.14

[Hans-Bernhard B. <br...@us...>]

Update of /cvsroot/cscope/cscope
In directory usw-pr-cvs1:/tmp/cvs-serv21676

Modified Files:
	acconfig.h config.h.in configure.in 
Log Message:
New version of flex scanner, plus supporting changes

Index: acconfig.h
===================================================================
RCS file: /cvsroot/cscope/cscope/acconfig.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** acconfig.h	2001/02/09 19:59:59	1.5
--- acconfig.h	2001/06/01 12:44:36	1.6
***************
*** 37,39 ****
--- 37,43 ----
  #undef NCURSES_970530
  
+ /* Define this if the lex used is the 'real' AT&T variety. Don't define if
+  * it's flex or some other */
+ #undef USING_LEX
+ 
  

Index: config.h.in
===================================================================
RCS file: /cvsroot/cscope/cscope/config.h.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** config.h.in	2000/11/23 13:53:40	1.5
--- config.h.in	2001/06/01 12:44:36	1.6
***************
*** 54,57 ****
--- 54,61 ----
  #undef NCURSES_970530
  
+ /* Define this if the lex used is the 'real' AT&T variety. Don't define if
+  * it's flex or some other */
+ #undef USING_LEX
+ 
  /* Define if you have the getcwd function.  */
  #undef HAVE_GETCWD

Index: configure.in
===================================================================
RCS file: /cvsroot/cscope/cscope/configure.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** configure.in	2001/03/29 15:01:56	1.13
--- configure.in	2001/06/01 12:44:36	1.14
***************
*** 132,135 ****
--- 132,136 ----
      else
  	LEXER_SOURCE="scanner"
+ 	AC_DEFINE(USING_LEX)
      fi
      AC_SUBST(LEXER_SOURCE)

[Cscope-cvs] CVS: cscope/src lookup.h,NONE,1.1 scanner.h,NONE,1.1 command.c,1.11,1.12 constants.h,1.6,1.7 crossref.c,1.7,1.8 display.c,1.14,1.15 find.c,1.11,1.12 fscanner.l,1.1,1.2 global.h,1.14,1.15 invlib.h,1.2,1.3 library.h,1.4,1.5 lookup.c,1.2,1.3 main.c,1.19,1.20 scanner.l,1.4,1.5

[Hans-Bernhard B. <br...@us...>]

Update of /cvsroot/cscope/cscope/src
In directory usw-pr-cvs1:/tmp/cvs-serv21501

Modified Files:
	command.c constants.h crossref.c display.c find.c fscanner.l 
	global.h invlib.h library.h lookup.c main.c scanner.l 
Added Files:
	lookup.h scanner.h 
Log Message:
New version of flex scanner, plus supporting changes

--- NEW FILE ---
/*===========================================================================
 Copyright (c) 2001, The Santa Cruz Operation 
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:

 *Redistributions of source code must retain the above copyright notice,
 this list of conditions and the following disclaimer.

 *Redistributions in binary form must reproduce the above copyright notice,
 this list of conditions and the following disclaimer in the documentation
 and/or other materials provided with the distribution.

 *Neither name of The Santa Cruz Operation nor the names of its contributors
 may be used to endorse or promote products derived from this software
 without specific prior written permission. 

 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS
 IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
 THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE
 LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 INTERRUPTION)
 HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGE. 
 =========================================================================*/

/* $Id: lookup.h,v 1.1 2001/06/01 12:43:24 broeker Exp $ */


#ifndef CSCOPE_LOOKUP_H
#define CSCOPE_LOOKUP_H

/* declarations for objects defined in lookup.c */

/* keyword text for fast testing of keywords in the scanner */
extern	char	enumtext[];
extern	char	externtext[];
extern	char	structtext[];
extern	char	typedeftext[];
extern	char	uniontext[];

#endif /* CSCOPE_LOOKUP_H */

--- NEW FILE ---
/*===========================================================================
 Copyright (c) 2001, The Santa Cruz Operation 
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:

 *Redistributions of source code must retain the above copyright notice,
 this list of conditions and the following disclaimer.

 *Redistributions in binary form must reproduce the above copyright notice,
 this list of conditions and the following disclaimer in the documentation
 and/or other materials provided with the distribution.

 *Neither name of The Santa Cruz Operation nor the names of its contributors
 may be used to endorse or promote products derived from this software
 without specific prior written permission. 

 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS
 IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
 THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE
 LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 INTERRUPTION)
 HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGE. 
 =========================================================================*/

/* $Id: scanner.h,v 1.1 2001/06/01 12:43:24 broeker Exp $ */


#ifndef CSCOPE_SCANNER_H
#define CSCOPE_SCANNER_H

#include <stdio.h>

#undef	YYLMAX		
#define YYLMAX	STMTMAX + PATLEN + 1	/* scanner line buffer size */

/* cross-reference database mark characters (when new ones are added, 
 * update the cscope.out format description in cscope.1)
 */
#define CLASSDEF	'c'
#define	DEFINE		'#'
#define	DEFINEEND	')'
#define ENUMDEF		'e'
#define FCNCALL		'`'
#define FCNDEF		'$'
#define FCNEND		'}'
#define GLOBALDEF	'g'
#define	INCLUDE		'~'
#define MEMBERDEF	'm'
#define NEWFILE		'@'
#define STRUCTDEF	's'
#define TYPEDEF		't'
#define UNIONDEF	'u'

/* other scanner token types */
#define LEXEOF	0
#define	IDENT	1
#define	NEWLINE	2

/* scanner.l global data */
extern	int	first;		/* buffer index for first char of symbol */
extern	int	last;		/* buffer index for last char of symbol */
extern	int	lineno;		/* symbol line number */
extern	FILE	*yyin;		/* input file descriptor */
extern	FILE	*yyout;		/* output file */
extern	int	myylineno;	/* input line number */

#ifdef USING_LEX
/* HBB 20010430: if lex is used instead of flex, have to simulate the
 * private copies of yytext and yytext for the world outside scanner.l: */
#ifdef __OSF1__ /* FIXME: there should be a feature test for this! */
extern	char	yytext[];
#else
extern	unsigned char	yytext[];
#endif
extern	int	yyleng;
# define my_yytext yytext
# define my_yyleng yyleng
#else
extern	char	*my_yytext;	/* private copy of input line */
extern	size_t	my_yyleng;	/* ... and current length of it */
#endif

/* The master function exported by scanner.l */
int 	yylex(void);
void	initscanner(char *srcfile);

#endif /* CSCOPE_SCANNER_H ends */

Index: command.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/command.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** command.c	2001/03/27 14:09:19	1.11
--- command.c	2001/06/01 12:43:24	1.12
***************
*** 856,860 ****
  	numlen = 0;
  	while ((i = fscanf(refsfound, "%250s%250s%6s %5000[^\n]", file,
! 	    function, linenum, yytext)) != EOF) {
  		if (i != 4 ||
  		    !isgraph((unsigned char)*file) ||
--- 856,860 ----
  	numlen = 0;
  	while ((i = fscanf(refsfound, "%250s%250s%6s %5000[^\n]", file,
! 	    function, linenum, tempstring)) != EOF) {
  		if (i != 4 ||
  		    !isgraph((unsigned char)*file) ||

Index: constants.h
===================================================================
RCS file: /cvsroot/cscope/cscope/src/constants.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** constants.h	2001/04/24 17:42:23	1.6
--- constants.h	2001/06/01 12:43:24	1.7
***************
*** 38,42 ****
   */
  
! #include <config.h>		/* Get OS defines */
  
  #define ctrl(x)	(x & 037)	/* control character macro */
--- 38,42 ----
   */
  
! #include "config.h"		/* Get OS defines */
  
  #define ctrl(x)	(x & 037)	/* control character macro */
***************
*** 81,110 ****
  #define	READ	4		/* access(2) parameter */
  #define	WRITE	2		/* access(2) parameter */
- #undef	YYLMAX		
- #define YYLMAX	STMTMAX + PATLEN + 1	/* scanner line buffer size */
- 
- /* cross-reference database mark characters (when new ones are added, 
-  * update the cscope.out format description in cscope.1)
-  */
- #define CLASSDEF	'c'
- #define	DEFINE		'#'
- #define	DEFINEEND	')'
- #define ENUMDEF		'e'
- #define FCNCALL		'`'
- #define FCNDEF		'$'
- #define FCNEND		'}'
- #define GLOBALDEF	'g'
- #define	INCLUDE		'~'
- #define MEMBERDEF	'm'
- #define NEWFILE		'@'
- #define STRUCTDEF	's'
- #define TYPEDEF		't'
- #define UNIONDEF	'u'
- 
- /* other scanner token types */
- #define LEXEOF	0
- #define	IDENT	1
- #define	NEWLINE	2
- 
  /* screen lines */
  #define	FLDLINE	(LINES - FIELDS - 1)	/* first input field line */
--- 81,84 ----

Index: crossref.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/crossref.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** crossref.c	2001/04/30 15:45:40	1.7
--- crossref.c	2001/06/01 12:43:24	1.8
***************
*** 38,41 ****
--- 38,43 ----
  
  #include "global.h"
+ #include "scanner.h"
+ 
  #include <stdlib.h>
  
***************
*** 63,68 ****
  long	lineoffset;		/* source line database offset */
  long	npostings;		/* number of postings */
! int	nsrcoffset;		/* number of file name database offsets */
! long	*srcoffset;		/* source file name database offsets */
  int	symbols;		/* number of symbols */
  
--- 65,70 ----
  long	lineoffset;		/* source line database offset */
  long	npostings;		/* number of postings */
! int	nsrcoffset;             /* number of file name database offsets */
! long	*srcoffset;             /* source file name database offsets */
  int	symbols;		/* number of symbols */
  
***************
*** 133,141 ****
  			/* see if the symbol is already in the list */
  			for (i = 0; i < symbols; ++i) {
! 				if (length == symbol[i].length &&
! 				    strncmp(yytext + first, yytext +
! 					symbol[i].first, length) == 0 &&
! 					entry_no == symbol[i].fcn_level &&
! 				    token == symbol[i].type) {	/* could be a::a() */
  					break;
  				}
--- 135,145 ----
  			/* see if the symbol is already in the list */
  			for (i = 0; i < symbols; ++i) {
! 				if (length == symbol[i].length
! 				    && strncmp(my_yytext + first,
! 					       my_yytext + symbol[i].first,
! 					       length) == 0 
! 				    && entry_no == symbol[i].fcn_level
! 				    && token == symbol[i].type
! 				    ) {	/* could be a::a() */
  					break;
  				}
***************
*** 148,154 ****
  		case NEWLINE:	/* end of line containing symbols */
  			entry_no = 0;	/* reset entry_no for each line */
! 			--yyleng;	/* remove the newline */
  			putcrossref();	/* output the symbols and source line */
  			lineno = myylineno;	/* save the symbol line number */
  			break;
  			
--- 152,166 ----
  		case NEWLINE:	/* end of line containing symbols */
  			entry_no = 0;	/* reset entry_no for each line */
! #ifdef USING_LEX
! 			--yyleng; 	/* remove the newline */
! #endif
  			putcrossref();	/* output the symbols and source line */
  			lineno = myylineno;	/* save the symbol line number */
+ #ifndef USING_LEX
+ 			/* HBB 20010425: replaced yyleng-- by this chunk: */
+ 			if (my_yytext)
+ 				*my_yytext = '\0';
+ 			my_yyleng = 0;
+ #endif
  			break;
  			
***************
*** 224,232 ****
  	dboffset = ftell(newrefs); /* fprintf doesn't return chars written */
  #endif
  	blank = NO;
! 	for (i = 0; i < yyleng; ++i) {
  		
  		/* change a tab to a blank and compress blanks */
! 		if ((c = yytext[i]) == ' ' || c == '\t') {
  			blank = YES;
  		}
--- 236,248 ----
  	dboffset = ftell(newrefs); /* fprintf doesn't return chars written */
  #endif
+ 
+ 	/* HBB 20010425: added this line: */
+ 	my_yytext[my_yyleng] = '\0';
+ 
  	blank = NO;
! 	for (i = 0; i < my_yyleng; ++i) {
  		
  		/* change a tab to a blank and compress blanks */
! 		if ((c = my_yytext[i]) == ' ' || c == '\t') {
  			blank = YES;
  		}
***************
*** 251,267 ****
  			/* output the symbol */
  			j = symbol[symput].last;
! 			c = yytext[j];
! 			yytext[j] = '\0';
  			if (invertedindex == YES) {
! 				putposting(yytext + i, type);
  			}
! 			writestring(yytext + i);
  			dbputc('\n');
! 			yytext[j] = c;
  			i = j - 1;
  			++symput;
  		}
  		else {
!                        /* check for compressed blanks */
  			if (blank == YES) {
  				if (dicode2[c]) {
--- 267,303 ----
  			/* output the symbol */
  			j = symbol[symput].last;
! 			c = my_yytext[j];
! 			my_yytext[j] = '\0';
  			if (invertedindex == YES) {
! 				putposting(my_yytext + i, type);
  			}
! 			writestring(my_yytext + i);
  			dbputc('\n');
! 			my_yytext[j] = c;
  			i = j - 1;
  			++symput;
  		}
  		else {
!                        /* HBB: try to save some time by early-out handling of 
!                         * non-compressed mode */
! 			if (compress == NO) {
! 				if (blank == YES) {
! 					dbputc(' ');
! 					blank = NO;
! 				}
! 				j = i + strcspn(my_yytext+i, "\t ");
! 				if (symput < symbols
! 				    && j >= symbol[symput].first)
! 					j = symbol[symput].first;
! 				c = my_yytext[j];
! 				my_yytext[j] = '\0';
! 				writestring(my_yytext + i);
! 				my_yytext[j] = c;
! 				i = j - 1;
! 				/* finished this 'i', continue with the blank */
! 				continue;
! 			}
! 
! 			/* check for compressed blanks */
  			if (blank == YES) {
  				if (dicode2[c]) {
***************
*** 273,281 ****
  			}
  			/* compress digraphs */
! 			else if (IS_A_DICODE(c, yytext[i + 1])
  				 && symput < symbols
  				 && i + 1 != symbol[symput].first
  				 ) {
! 				c = DICODE_COMPRESS(c, yytext[i + 1]);
  				++i;
  			}
--- 309,317 ----
  			}
  			/* compress digraphs */
! 			else if (IS_A_DICODE(c, my_yytext[i + 1])
  				 && symput < symbols
  				 && i + 1 != symbol[symput].first
  				 ) {
! 				c = DICODE_COMPRESS(c, my_yytext[i + 1]);
  				++i;
  			}
***************
*** 290,314 ****
  				/* note: don't use isspace() because \f and \v
  				   are used for keywords */
! 				while ((j = yytext[i]) == ' ' || j == '\t') {
  					++i;
  				}
  				/* skip the rest of the keyword */
! 				while (isalpha((unsigned char)yytext[i])) {
  					++i;
  				}
  				/* skip space after certain keywords */
  				if (keyword[c].delim != '\0') {
! 					while ((j = yytext[i]) == ' ' || j == '\t') {
  						++i;
  					}
  				}
  				/* skip a '(' after certain keywords */
! 				if (keyword[c].delim == '(' && yytext[i] == '(') {
  					++i;
  				}
  				--i;	/* compensate for ++i in for() */
! 			}
! 		}
! 	}
  	/* ignore trailing blanks */
  	dbputc('\n');
--- 326,352 ----
  				/* note: don't use isspace() because \f and \v
  				   are used for keywords */
! 				while ((j = my_yytext[i]) == ' ' || j == '\t') {
  					++i;
  				}
  				/* skip the rest of the keyword */
! 				while (isalpha((unsigned char)my_yytext[i])) {
  					++i;
  				}
  				/* skip space after certain keywords */
  				if (keyword[c].delim != '\0') {
! 					while ((j = my_yytext[i]) == ' ' || j == '\t') {
  						++i;
  					}
  				}
  				/* skip a '(' after certain keywords */
! 				if (keyword[c].delim == '('
! 				    && my_yytext[i] == '(') {
  					++i;
  				}
  				--i;	/* compensate for ++i in for() */
! 			} /* if compressed char */
! 		} /* else: not a symbol */
! 	} /* for(i) */
! 
  	/* ignore trailing blanks */
  	dbputc('\n');
***************
*** 420,423 ****
--- 458,466 ----
  	int	i;
  	
+ 	if (compress == NO) {
+ 		/* Save some I/O overhead by using puts() instead of putc(): */
+ 		dbfputs(s);
+ 		return;
+ 	} 
  	/* compress digraphs */
  	for (i = 0; (c = s[i]) != '\0'; ++i) {

Index: display.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/display.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** display.c	2001/04/26 18:26:26	1.14
--- display.c	2001/06/01 12:43:24	1.15
***************
*** 215,219 ****
  			/* read the reference line */
  			if (fscanf(refsfound, "%s%s%s %[^\n]", file, function, 
! 			    linenum, yytext) < 4) {
  				break;
  			}
--- 215,219 ----
  			/* read the reference line */
  			if (fscanf(refsfound, "%s%s%s %[^\n]", file, function, 
! 			    linenum, tempstring) < 4) {
  				break;
  			}
***************
*** 265,273 ****
  
  			/* there may be tabs in egrep output */
! 			while ((s = strchr(yytext, '\t')) != NULL) {
  				*s = ' ';
  			}
  			/* display the source line */
! 			s = yytext;
  
  			for (;;) {
--- 265,273 ----
  
  			/* there may be tabs in egrep output */
! 			while ((s = strchr(tempstring, '\t')) != NULL) {
  				*s = ' ';
  			}
  			/* display the source line */
! 			s = tempstring;
  
  			for (;;) {

Index: find.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/find.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** find.c	2001/04/30 15:45:40	1.11
--- find.c	2001/06/01 12:43:24	1.12
***************
*** 37,40 ****
--- 37,41 ----
  
  #include "global.h"
+ #include "scanner.h"		/* for token definitions */
  #if defined(USE_NCURSES) && !defined(RENAMED_NCURSES)
  #include <ncurses.h>

Index: fscanner.l
===================================================================
RCS file: /cvsroot/cscope/cscope/src/fscanner.l,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** fscanner.l	2001/03/29 15:01:57	1.1
--- fscanner.l	2001/06/01 12:43:24	1.2
***************
*** 37,56 ****
   */
  #include "global.h"
  
  
  /* the line counting has been moved from character reading for speed */
  /* comments are discarded */
  
  #define	IFLEVELINC	5	/* #if nesting level size increment */
  
  static char const rcsid[] = "$Id$";
[...1251 lines suppressed...]
! }
! 
! #endif /* !COMMENTS_BY_FLEX */
! 
! #define MY_YY_ALLOCSTEP 1000
! static void
! my_yymore(void)
! {
! 	static size_t yytext_size = 0;
! 	
! 	/* my_yytext is an ever-growing buffer. It will not ever
! 	 * shrink, nor will it be freed at end of program, for now */
! 	while (my_yyleng + yyleng + 1 >= yytext_size) {
! 		my_yytext = myrealloc(my_yytext, 
! 				      		  yytext_size += MY_YY_ALLOCSTEP);
! 	}
! 	
! 	strncpy (my_yytext + my_yyleng, yytext, yyleng+1);
! 	my_yyleng += yyleng;
  }

Index: global.h
===================================================================
RCS file: /cvsroot/cscope/cscope/src/global.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** global.h	2001/04/30 15:45:40	1.14
--- global.h	2001/06/01 12:43:24	1.15
***************
*** 135,140 ****
  extern	long	totalterms;	/* total inverted index terms */
  extern	BOOL	trun_syms;	/* truncate symbols to 8 characters */
  
- 
  /* command.c global data */
  extern	BOOL	caseless;	/* ignore letter case when searching */
--- 135,140 ----
  extern	long	totalterms;	/* total inverted index terms */
  extern	BOOL	trun_syms;	/* truncate symbols to 8 characters */
+ extern	char	tempstring[8192]; /* global dummy string buffer */
  
  /* command.c global data */
  extern	BOOL	caseless;	/* ignore letter case when searching */
***************
*** 204,217 ****
  #endif
  
- /* scanner.l global data */
- extern	int	first;		/* buffer index for first char of symbol */
- extern	int	last;		/* buffer index for last char of symbol */
- extern	int	lineno;		/* symbol line number */
- extern	FILE	*yyin;		/* input file descriptor */
- extern	FILE	*yyout;		/* output file */
- extern	int	yyleng;		/* input line length */
- extern	int	myylineno;	/* input line number */
- extern	char	yytext[];	/* input line text */
- 
  /* cscope functions called from more than one function or between files */ 
  
--- 204,207 ----
***************
*** 259,263 ****
  void	incfile(char *file, char *type);
  void    includedir(char *dirname);
- void	initscanner(char *srcfile);
  void    initsymtab(void);
  void	makefilelist(void);
--- 249,252 ----
***************
*** 305,314 ****
  int	hash(char *ss);
  int	execute(char *a, ...);
- int 	yylex(void);
  long	dbseek(long offset);
  
- /*
- extern int atoi(const char *nptr);
- extern int access(const char *pathname, int mode);
- */
  
--- 294,298 ----

Index: invlib.h
===================================================================
RCS file: /cvsroot/cscope/cscope/src/invlib.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** invlib.h	2000/05/09 13:34:35	1.2
--- invlib.h	2001/06/01 12:43:24	1.3
***************
*** 42,50 ****
  /* FIXME HBB: where would these definitions come from ? */
  #if u3b || u3b2 || u3b5 || u3b15 || uts
! #define	BASE		223	/* 255 - ' ' */
! #define	PRECISION	4	/* maximum digits after converting a long */
  #else	/* assume sign-extension of a char when converted to an int */
! #define	BASE		95	/* 127 - ' ' */
! #define	PRECISION	5	/* maximum digits after converting a long */
  #endif
  
--- 42,50 ----
  /* FIXME HBB: where would these definitions come from ? */
  #if u3b || u3b2 || u3b5 || u3b15 || uts
! # define	BASE		223	/* 255 - ' ' */
! # define	PRECISION	4	/* maximum digits after converting a long */
  #else	/* assume sign-extension of a char when converted to an int */
! #  define	BASE		95	/* 127 - ' ' */
! #  define	PRECISION	5	/* maximum digits after converting a long */
  #endif
  
***************
*** 81,89 ****
  } INVCONTROL;
  
! typedef	struct	{
! 	short	offset;		/* offset in this logical block */
! 	unsigned char size;	/* size of term */
! 	unsigned char space;	/* number of longs of growth space */
! 	long	post;		/* number of postings for this entry */
  } ENTRY;
  
--- 81,89 ----
  } INVCONTROL;
  
! typedef        struct  {
!        short   offset;         /* offset in this logical block */
!        unsigned char size;     /* size of term */
!        unsigned char space;    /* number of longs of growth space */
!        long    post;           /* number of postings for this entry */
  } ENTRY;
  
***************
*** 97,107 ****
  extern	long	*srcoffset;	/* source file name database offsets */
  extern	int	nsrcoffset;	/* number of file name database offsets */
  
! /*
! POSTING	*boolinfo();
! POSTING	*boolmem();
! POSTING	*boolsave();
! */
! extern	void	boolclear(void);
  POSTING	*boolfile(INVCONTROL *invcntl, long *num, int boolarg);
  void	invclose(INVCONTROL *invcntl);
--- 97,104 ----
  extern	long	*srcoffset;	/* source file name database offsets */
  extern	int	nsrcoffset;	/* number of file name database offsets */
+ extern	INVCONTROL invcontrol;	/* inverted file control structure */
+ 
  
! void	boolclear(void);
  POSTING	*boolfile(INVCONTROL *invcntl, long *num, int boolarg);
  void	invclose(INVCONTROL *invcntl);
***************
*** 112,116 ****
  long	invmake(char *invname, char *invpost, FILE *infile);
  long	invterm(INVCONTROL *invcntl, char *term);
- INVCONTROL invcontrol;	/* inverted file control structured */
  
  #endif /* CSCOPE_INVLIB_H */
--- 109,112 ----

Index: library.h
===================================================================
RCS file: /cvsroot/cscope/cscope/src/library.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** library.h	2001/03/27 14:09:19	1.4
--- library.h	2001/06/01 12:43:24	1.5
***************
*** 35,38 ****
--- 35,41 ----
  /* library function return value declarations */
  
+ #ifndef CSCOPE_LIBRARY_H
+ #define CSCOPE_LIBRARY_H
+ 
  #if BSD
  #define	strchr	index
***************
*** 59,60 ****
--- 62,65 ----
  /* Programmer's Workbench library (-lPW) */
  char	*regcmp(), *regex();
+ 
+ #endif /* CSCOPE_LIBRARY_H */

Index: lookup.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/lookup.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** lookup.c	2000/05/03 19:07:09	1.2
--- lookup.c	2001/06/01 12:43:24	1.3
***************
*** 37,40 ****
--- 37,41 ----
  
  #include "global.h"
+ #include "lookup.h"
  
  static char const rcsid[] = "$Id$";

Index: main.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/main.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** main.c	2001/04/30 15:45:40	1.19
--- main.c	2001/06/01 12:43:24	1.20
***************
*** 40,43 ****
--- 40,44 ----
  #include "vp.h"
  #include "version.h"	/* FILEVERSION and FIXVERSION */
+ #include "scanner.h" 
  #include <stdlib.h>	/* atoi */
  #if defined(USE_NCURSES) && !defined(RENAMED_NCURSES)
***************
*** 104,107 ****
--- 105,110 ----
  long	totalterms;		/* total inverted index terms */
  BOOL	trun_syms;		/* truncate symbols to 8 characters */
+ char	tempstring[8192];	/* use this as a buffer, instead of 'yytext', 
+ 				 * which had better be left alone */
  
  static	BOOL	buildonly = NO;		/* only build the database */

Index: scanner.l
===================================================================
RCS file: /cvsroot/cscope/cscope/src/scanner.l,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** scanner.l	2000/05/05 17:35:00	1.4
--- scanner.l	2001/06/01 12:43:24	1.5
***************
*** 37,40 ****
--- 37,42 ----
   */
  #include "global.h"
+ #include "scanner.h"
+ #include "lookup.h"
  
  /* the line counting has been moved from character reading for speed */
***************
*** 45,55 ****
  static char const rcsid[] = "$Id$";
  
- /* keyword text for fast testing of keywords in the scanner */
- extern	char	enumtext[];
- extern	char	externtext[];
- extern	char	structtext[];
- extern	char	typedeftext[];
- extern	char	uniontext[];
- 
  int	first;	/* buffer index for first char of symbol */
  int	last;	/* buffer index for last char of symbol */
--- 47,50 ----
***************
*** 568,572 ****
  			s = strpbrk(yytext, "\"<");
  			incfile(s + 1, s);
! 			first = s - yytext;
  			last = yyleng;
  			if (compress == YES) {
--- 563,569 ----
  			s = strpbrk(yytext, "\"<");
  			incfile(s + 1, s);
! 			/* HBB: avoid pointer mismatch if yytext is
! 			 * unsigned, or a pointer */
! 			first = s - (char *)&(yytext[0]);
  			last = yyleng;
  			if (compress == YES) {

[Cscope-cvs] CVS: cscope/src invlib.c,1.10,1.11

[Hans-Bernhard B. <br...@us...>]

Update of /cvsroot/cscope/cscope/src
In directory usw-pr-cvs1:/tmp/cvs-serv19297/src

Modified Files:
	invlib.c 
Log Message:
64bit -q mode bugfix

Index: invlib.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/invlib.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** invlib.c	2001/05/30 19:31:23	1.10
--- invlib.c	2001/06/01 12:31:00	1.11
***************
*** 483,487 ****
  		}
  	}
! 	lastinblk -= (numwilluse - 8);
  	iteminfo.e.offset = lastinblk;
  	iteminfo.e.size = len;
--- 483,489 ----
  		}
  	}
! 	/* HBB 20010501: Fixed bug by replacing magic number '8' by
! 	 * what it actually represents. */
! 	lastinblk -= (numwilluse - 2 * sizeof(long));
  	iteminfo.e.offset = lastinblk;
  	iteminfo.e.size = len;

[Cscope-cvs] CVS: cscope AUTHORS,1.25,1.26 ChangeLog,1.72,1.73

[Petr S. <pe...@us...>]

Update of /cvsroot/cscope/cscope
In directory usw-pr-cvs1:/tmp/cvs-serv13424

Modified Files:
	AUTHORS ChangeLog 
Log Message:
(Nick Dixon) Improvement in handling cursor and editing keys on the input lines.


Index: AUTHORS
===================================================================
RCS file: /cvsroot/cscope/cscope/AUTHORS,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** AUTHORS	2001/05/30 19:31:23	1.25
--- AUTHORS	2001/05/30 21:10:55	1.26
***************
*** 24,25 ****
--- 24,26 ----
  OGAWA Hirofumi - line mode fixes
  Garret Hade - Various ocs fixes
+ Nick Dixon - Improvement in key handling

Index: ChangeLog
===================================================================
RCS file: /cvsroot/cscope/cscope/ChangeLog,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -r1.72 -r1.73
*** ChangeLog	2001/05/30 19:31:23	1.72
--- ChangeLog	2001/05/30 21:10:55	1.73
***************
*** 1,2 ****
--- 1,3 ----
+ (2001/05/30 - dixon) arrow and editing keys can be now used at the input line
  (2001/05/30 - duell) invname database issue fix.
  (2001/05/20 - garret)  Fixed some mishaps in ocs.

[Cscope-cvs] CVS: cscope/src input.c,1.6,1.7

[Petr S. <pe...@us...>]

Update of /cvsroot/cscope/cscope/src
In directory usw-pr-cvs1:/tmp/cvs-serv13424/src

Modified Files:
	input.c 
Log Message:
(Nick Dixon) Improvement in handling cursor and editing keys on the input lines.


Index: input.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/input.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** input.c	2001/02/09 19:59:59	1.6
--- input.c	2001/05/30 21:10:56	1.7
***************
*** 104,108 ****
--- 104,121 ----
  	int	c, i = 0;
  	int	j;
+ 	char *sright;	/* substring to the right of the cursor */
+ 	int ri = 0;		/* position in right-string */
  
+ 	/* Inserts and deletes are always performed on the left-string,
+ 	 * but we'll also have a right-string 'sright' to hold characters
+ 	 * which are on the right of the cursor [insertion point].
+ 	 *
+ 	 * Think of 'sright' as a stack -- we push chars into it when the cursor
+ 	 * moves left, and we pop chars off it when the cursor moves right again.
+ 	 * At the end of the function, we'll pop off any remaining characters
+ 	 * onto the end of 's'
+ 	 */
+ 	sright = calloc(sizeof(char), size);
+ 
  	/* if a character already has been typed */
  	if (firstchar != '\0') {
***************
*** 115,122 ****
  	/* until the end of the line is reached */
  	while ((c = mygetch()) != '\r' && c != '\n' && c != KEY_ENTER) {
! 		if (c == erasechar() || c == KEY_BACKSPACE || c == DEL || c == ctrl('H') ) {
  			/* erase */
  			if (i > 0) {
! 				addstr("\b \b");
  				--i;
  			}
--- 128,178 ----
  	/* until the end of the line is reached */
  	while ((c = mygetch()) != '\r' && c != '\n' && c != KEY_ENTER) {
! 
! 		if (c == KEY_LEFT || c == ctrl('B')) {	/* left */
! 			if (i > 0) {
! 				addch('\b');
! 				/* move this char into the second (rhs) string */
! 				sright[ri++] = s[--i];
! 			}
! 		}
! 		else if (c == KEY_RIGHT || c == ctrl('F')) {	/* right */
! 			if (i < size && ri > 0) {
! 				/* move this char to the left of the cursor */
! 				s[i++] = sright[--ri];
! 				addch(s[i-1]);
! 			}
! 		}
! 		else if (
! 		#ifdef KEY_HOME
! 			c == KEY_HOME ||
! 		#endif
! 			c == ctrl('A') ) {
! 			while ( i > 0 ) {
! 				sright[ri++] = s[--i];
! 				addch('\b');
! 				addch(s[i]);
! 				addch('\b');
! 			}
! 		}
! 		else if (
! 		#ifdef KEY_END
! 			c == KEY_END ||
! 		#endif
! 			c == ctrl('E') ) {
! 			while ( ri > 0 ) {
! 				s[i++] = sright[--ri];
! 				addch(s[i-1]);
! 			}
! 		}
! 		else if (c == erasechar() || c == KEY_BACKSPACE || c == DEL || c == ctrl('H') ) {
  			/* erase */
  			if (i > 0) {
! 				if (ri == 0)  {
! 					addstr("\b \b");
! 				} else {
! 					addch('\b');
! 					delch();
! 				}
! 				s[i] = '\0';
  				--i;
  			}
***************
*** 140,145 ****
  			/* if it will fit on the line */
  			if (i < size) {
- 				addch(c);	/* display it */
  				s[i++] = c;	/* save it */
  			}
  		}
--- 196,206 ----
  			/* if it will fit on the line */
  			if (i < size) {
  				s[i++] = c;	/* save it */
+ 				if (ri == 0) {
+ 					addch(c);	/* display it */
+ 				} else {
+ 					insch(c);	/* display it */
+ 					addch(c);	/* advance cursor */
+ 				}
  			}
  		}
***************
*** 156,163 ****
  		}
  		/* return on an empty line to allow a command to be entered */
! 		if (firstchar != '\0' && i == 0) {
  			break;
  		}
  	}
  	s[i] = '\0';
  	return(i);
--- 217,233 ----
  		}
  		/* return on an empty line to allow a command to be entered */
! 		if (firstchar != '\0' && (i+ri) == 0) {
  			break;
  		}
  	}
+ 
+ 	/* move any remaining chars on the rhs of the cursor
+ 	 * onto the end of our string
+ 	 */
+ 	for (; ri > 0; ) {
+ 		s[i++] = sright[--ri];
+ 	}
+ 	free(sright);
+ 
  	s[i] = '\0';
  	return(i);

[Cscope-cvs] CVS: cscope/src invlib.c,1.9,1.10

[Petr S. <pe...@us...>]

Update of /cvsroot/cscope/cscope/src
In directory usw-pr-cvs1:/tmp/cvs-serv22514/src

Modified Files:
	invlib.c 
Log Message:
Jason Duell fix:

The default names for the inverse database files 
created with the -q option violate the regular cscope 
naming convention (they get called cscope.in.out and 
cscope.po.out, whereas if you call "cscope -f cscope", 
they get called cscope.out.in and cscope.out.po). This 
causes cscope to fail if you create the database 
without "-f cscope" but then try to load it with "-f 
cscope". Since the vim editor plugin for cscope always 
uses the -f flag, this makes it impossible to use the 
vim plugin unless you use the -f flag to create the 
database (and the editor freezes when you try to load 
the database). This is a needless hassle for new users. 

While the easiest fix for this problem would be to 
change to default names for the -q files to match the 
regular naming convention, this could break user setups 
that rely on the existing names. So this patch takes a 
different tack. Whenever "cscope.out" is loaded as the 
main database, both "cscope.po.out" and "cscope.out.po" 
are checked (ditto for cscope.in.out & cscope.out.in) 
before. The two combinations are checked in the 
appropriate order (i.e., "cscope.po.out" is checked 
first if the -f flag was not used, and "cscope.out.po" 
if it was). Only if neither file is present does the 
database load fail. 

The patch also contains a rewrite of the documentation 
for the -q option. I remember being confused by it 
when I first read the docs, and it now also contains 
information about the -f flag that is superfluous. 


Index: invlib.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/invlib.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** invlib.c	2001/03/27 14:09:19	1.9
--- invlib.c	2001/05/30 19:31:23	1.10
***************
*** 509,515 ****
--- 509,529 ----
  
  	if ((invcntl->invfile = vpfopen(invname, ((stat == 0) ? "rb" : "r+b"))) == NULL) {
+ 		/* If db created without '-f', but now invoked with '-f cscope.out',
+ 		 * we need to check for 'cscope.in.out', rather than 'cscope.out.in': 
+ 		 * I.e, hack around our own violation of the inverse db naming convention */
+ 		if (!strcmp(invname, "cscope.out.in")) {
+ 			if ((invcntl->invfile = vpfopen(INVNAME, ((stat == 0) ? "r" : "r+")))) 
+ 				goto openedinvname;
+ 		/* more silliness: if you create the db with '-f cscope', then try to open 
+ 		 * it without '-f cscope', you'll fail unless we check for 'cscope.out.in'
+ 		 * here. */
+ 		} else if (!strcmp(invname, INVNAME)) {
+ 			if ((invcntl->invfile = vpfopen("cscope.out.in", ((stat == 0) ? "r" : "r+")))) 
+ 				goto openedinvname;
+ 		}	
  		invcannotopen(invname);
  		return(-1);
  	}
+ openedinvname:
  	if (fread(&invcntl->param, sizeof(invcntl->param), 1, invcntl->invfile) == 0) {
  		(void) fprintf(stderr, "%s: empty inverted file\n", argv0);
***************
*** 527,533 ****
--- 541,556 ----
  	}
  	if ((invcntl->postfile = vpfopen(invpost, ((stat == 0) ? "rb" : "r+b"))) == NULL) {
+ 		/* exact same naming convention hacks as above for invname */
+ 		if (!strcmp(invpost, "cscope.out.po")) {
+ 			if ((invcntl->postfile = vpfopen(INVPOST, ((stat == 0) ? "r" : "r+")))) 
+ 				goto openedinvpost;
+ 		} else if (!strcmp(invpost, INVPOST)) {
+ 			if ((invcntl->postfile = vpfopen("cscope.out.po",((stat == 0)?"r":"r+")))) 
+ 				goto openedinvpost;
+ 		}
  		invcannotopen(invpost);
  		goto closeinv;
  	}
+ openedinvpost:
  	/* allocate core for a logical block  */
  	if ((invcntl->logblk = malloc((unsigned) invcntl->param.sizeblk)) == NULL) {

[Cscope-cvs] CVS: cscope AUTHORS,1.24,1.25 ChangeLog,1.71,1.72

[Petr S. <pe...@us...>]

Update of /cvsroot/cscope/cscope
In directory usw-pr-cvs1:/tmp/cvs-serv22514

Modified Files:
	AUTHORS ChangeLog 
Log Message:
Jason Duell fix:

The default names for the inverse database files 
created with the -q option violate the regular cscope 
naming convention (they get called cscope.in.out and 
cscope.po.out, whereas if you call "cscope -f cscope", 
they get called cscope.out.in and cscope.out.po). This 
causes cscope to fail if you create the database 
without "-f cscope" but then try to load it with "-f 
cscope". Since the vim editor plugin for cscope always 
uses the -f flag, this makes it impossible to use the 
vim plugin unless you use the -f flag to create the 
database (and the editor freezes when you try to load 
the database). This is a needless hassle for new users. 

While the easiest fix for this problem would be to 
change to default names for the -q files to match the 
regular naming convention, this could break user setups 
that rely on the existing names. So this patch takes a 
different tack. Whenever "cscope.out" is loaded as the 
main database, both "cscope.po.out" and "cscope.out.po" 
are checked (ditto for cscope.in.out & cscope.out.in) 
before. The two combinations are checked in the 
appropriate order (i.e., "cscope.po.out" is checked 
first if the -f flag was not used, and "cscope.out.po" 
if it was). Only if neither file is present does the 
database load fail. 

The patch also contains a rewrite of the documentation 
for the -q option. I remember being confused by it 
when I first read the docs, and it now also contains 
information about the -f flag that is superfluous. 


Index: AUTHORS
===================================================================
RCS file: /cvsroot/cscope/cscope/AUTHORS,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** AUTHORS	2001/05/22 15:40:31	1.24
--- AUTHORS	2001/05/30 19:31:23	1.25
***************
*** 19,23 ****
  Bruce Frost - Stability
  Chuck Marco and Wilfredo Sanchez - Darwin support
! Jason Duell - CSCOPE_EDITOR and CSCOPE_LINEFLAG*
  Tom Hull - Similar work to CSCOPE_EDITOR and friends
  Donald Slutz - Various fixes
--- 19,23 ----
  Bruce Frost - Stability
  Chuck Marco and Wilfredo Sanchez - Darwin support
! Jason Duell - CSCOPE_EDITOR and CSCOPE_LINEFLAG*, invname database
  Tom Hull - Similar work to CSCOPE_EDITOR and friends
  Donald Slutz - Various fixes

Index: ChangeLog
===================================================================
RCS file: /cvsroot/cscope/cscope/ChangeLog,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -r1.71 -r1.72
*** ChangeLog	2001/05/22 15:40:30	1.71
--- ChangeLog	2001/05/30 19:31:23	1.72
***************
*** 1,2 ****
--- 1,3 ----
+ (2001/05/30 - duell) invname database issue fix.
  (2001/05/20 - garret)  Fixed some mishaps in ocs.
  (2001/04/30 - broeker) Fixed signed char casting bug in dicode compression. 

[Cscope-cvs] CVS: cscope/doc cscope.1,1.13,1.14

[Petr S. <pe...@us...>]

Update of /cvsroot/cscope/cscope/doc
In directory usw-pr-cvs1:/tmp/cvs-serv22514/doc

Modified Files:
	cscope.1 
Log Message:
Jason Duell fix:

The default names for the inverse database files 
created with the -q option violate the regular cscope 
naming convention (they get called cscope.in.out and 
cscope.po.out, whereas if you call "cscope -f cscope", 
they get called cscope.out.in and cscope.out.po). This 
causes cscope to fail if you create the database 
without "-f cscope" but then try to load it with "-f 
cscope". Since the vim editor plugin for cscope always 
uses the -f flag, this makes it impossible to use the 
vim plugin unless you use the -f flag to create the 
database (and the editor freezes when you try to load 
the database). This is a needless hassle for new users. 

While the easiest fix for this problem would be to 
change to default names for the -q files to match the 
regular naming convention, this could break user setups 
that rely on the existing names. So this patch takes a 
different tack. Whenever "cscope.out" is loaded as the 
main database, both "cscope.po.out" and "cscope.out.po" 
are checked (ditto for cscope.in.out & cscope.out.in) 
before. The two combinations are checked in the 
appropriate order (i.e., "cscope.po.out" is checked 
first if the -f flag was not used, and "cscope.out.po" 
if it was). Only if neither file is present does the 
database load fail. 

The patch also contains a rewrite of the documentation 
for the -q option. I remember being confused by it 
when I first read the docs, and it now also contains 
information about the -f flag that is superfluous. 


Index: cscope.1
===================================================================
RCS file: /cvsroot/cscope/cscope/doc/cscope.1,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** cscope.1	2001/02/12 17:39:04	1.13
--- cscope.1	2001/05/30 19:31:23	1.14
***************
*** 123,130 ****
  .TP
  .B -q
! Build an inverted index for quick symbol searching. If you use
! this option with the -f option, you must use -f on every call
! to cscope, including when you build the cross-reference file,
! because it changes the names of the inverted index files.
  .TP
  .B -R
--- 123,131 ----
  .TP
  .B -q
! Enable fast symbol lookup via an inverted index. This option
! causes cscope to create 2 more files (default names
! ``cscope.in.out'' and ``cscope.po.out'') in addition to the normal
! database. This allows a faster symbol search algorithm that
! provides noticeably faster lookup performance for large projects.
  .TP
  .B -R

[Cscope-cvs] CVS: cscope/contrib ocs,1.2,1.3

[Petr S. <pe...@us...>]

Update of /cvsroot/cscope/cscope/contrib
In directory usw-pr-cvs1:/tmp/cvs-serv23219/contrib

Modified Files:
	ocs 
Log Message:
Fixes to ocs.


Index: ocs
===================================================================
RCS file: /cvsroot/cscope/cscope/contrib/ocs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** ocs	2000/12/12 14:57:59	1.2
--- ocs	2001/05/22 15:40:31	1.3
***************
*** 289,296 ****
  
  OUT=${DIR}/cscope.out
! TMP=${DIR}/cscope.tmp
  INC=${DIR}/cscope.inc
  
  create_list ${TMP}
! do_cscope ${TMP} ${OUT} ${INC}
  
--- 289,296 ----
  
  OUT=${DIR}/cscope.out
! TMP=${DIR}/cscope.tmplst
  INC=${DIR}/cscope.inc
  
  create_list ${TMP}
! do_cscope ${TMP} ${OUT} ${INC} ${QUICK}
  

[Cscope-cvs] CVS: cscope ChangeLog,1.70,1.71 AUTHORS,1.23,1.24

[Petr S. <pe...@us...>]

Update of /cvsroot/cscope/cscope
In directory usw-pr-cvs1:/tmp/cvs-serv23219

Modified Files:
	ChangeLog AUTHORS 
Log Message:
Fixes to ocs.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/cscope/cscope/ChangeLog,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -r1.70 -r1.71
*** ChangeLog	2001/04/30 15:45:40	1.70
--- ChangeLog	2001/05/22 15:40:30	1.71
***************
*** 1,2 ****
--- 1,3 ----
+ (2001/05/20 - garret)  Fixed some mishaps in ocs.
  (2001/04/30 - broeker) Fixed signed char casting bug in dicode compression. 
  	               Encapsulated dicode compression idioms into macros

Index: AUTHORS
===================================================================
RCS file: /cvsroot/cscope/cscope/AUTHORS,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** AUTHORS	2001/04/26 18:26:26	1.23
--- AUTHORS	2001/05/22 15:40:31	1.24
***************
*** 23,24 ****
--- 23,25 ----
  Donald Slutz - Various fixes
  OGAWA Hirofumi - line mode fixes
+ Garret Hade - Various ocs fixes