cscope-cvs Mailing List for cscope

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

Modified Files:
	ChangeLog 
Log Message:
Extended {comment} pattern in Flex scanner to allow C++ comments, too.
Fixes SF bug report #455441.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/cscope/cscope/ChangeLog,v
retrieving revision 1.99
retrieving revision 1.100
diff -C2 -r1.99 -r1.100
*** ChangeLog	2001/08/15 13:04:14	1.99
--- ChangeLog	2001/08/27 13:35:43	1.100
***************
*** 1,2 ****
--- 1,5 ----
+ (2001/08/27 - broeker) Add C++-style comments to {comment} pattern. Fixes
+ 	               bug #455441: C++ comments in the middle of a function 
+ 		       definition caused it not be recognized.
  (2001/08/15 - broeker) Zero out 'disprefs' whenever the count of references, 
  	               'totallines' is set to zero. This makes sure that you 

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

Modified Files:
	fscanner.l 
Log Message:
Extended {comment} pattern in Flex scanner to allow C++ comments, too.
Fixes SF bug report #455441.


Index: fscanner.l
===================================================================
RCS file: /cvsroot/cscope/cscope/src/fscanner.l,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** fscanner.l	2001/08/03 16:13:10	1.6
--- fscanner.l	2001/08/27 13:35:25	1.7
***************
*** 128,132 ****
  identifier	[a-zA-Z_$][a-zA-Z_0-9$]*
  number		\.?[0-9][.0-9a-fA-FlLuUxX]*
! comment		"/*"([^*]*("*"+[^/])?)*"*/"
  whitespace	[ \t\n]|{comment}
  
--- 128,132 ----
  identifier	[a-zA-Z_$][a-zA-Z_0-9$]*
  number		\.?[0-9][.0-9a-fA-FlLuUxX]*
! comment		"/*"([^*]*("*"+[^/])?)*"*/"|"//"[^\n]*\n
  whitespace	[ \t\n]|{comment}
  

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

Modified Files:
	ChangeLog 
Log Message:
Avoid <Tab>ing into an empty result area

Index: ChangeLog
===================================================================
RCS file: /cvsroot/cscope/cscope/ChangeLog,v
retrieving revision 1.98
retrieving revision 1.99
diff -C2 -r1.98 -r1.99
*** ChangeLog	2001/08/13 15:31:22	1.98
--- ChangeLog	2001/08/15 13:04:14	1.99
***************
*** 1,2 ****
--- 1,6 ----
+ (2001/08/15 - broeker) Zero out 'disprefs' whenever the count of references, 
+ 	               'totallines' is set to zero. This makes sure that you 
+ 		       can't <Tab> into the selection area if there's nothing 
+ 		       in it.
  (2001/08/13 - jcduell) Revisited inverted index file name fixup routines.
                         (Patch #444669 from SourceForge).

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

Modified Files:
	command.c display.c 
Log Message:
Avoid <Tab>ing into an empty result area

Index: command.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/command.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** command.c	2001/07/05 16:47:04	1.14
--- command.c	2001/08/15 13:04:14	1.15
***************
*** 112,115 ****
--- 112,116 ----
  		postmsg("");		/* clear any previous message */
  		totallines = 0;
+ 		disprefs = 0;	
  		topline = nextline = 1;
  		selecting = 0;
***************
*** 561,564 ****
--- 562,566 ----
  	}
  	totallines = 0;
+ 	disprefs = 0;
  	nextline = 1;
  	if (writerefsfound() == YES) {
***************
*** 863,866 ****
--- 865,869 ----
  			postmsg("File does not have expected format");
  			totallines = 0;
+ 			disprefs = 0;
  			return;
  		}

Index: display.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/display.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** display.c	2001/07/09 14:00:25	1.17
--- display.c	2001/08/15 13:04:14	1.18
***************
*** 462,465 ****
--- 462,466 ----
  	nextline = 1;
  	totallines = 0;
+ 	disprefs = 0;
  	
  	/* see if it is empty */

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

Modified Files:
	ChangeLog 
Log Message:
Jason Duell's latest revision of the invname patch

Index: ChangeLog
===================================================================
RCS file: /cvsroot/cscope/cscope/ChangeLog,v
retrieving revision 1.97
retrieving revision 1.98
diff -C2 -r1.97 -r1.98
*** ChangeLog	2001/08/03 16:13:10	1.97
--- ChangeLog	2001/08/13 15:31:22	1.98
***************
*** 1,2 ****
--- 1,4 ----
+ (2001/08/13 - jcduell) Revisited inverted index file name fixup routines.
+                        (Patch #444669 from SourceForge).
  (2001/08/03 - broeker) Use %option noyywrap in fscanner.l to avoid problems
  	               with broken flex installations that can't find -lfl. 

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

Modified Files:
	constants.h invlib.c 
Log Message:
Jason Duell's latest revision of the invname patch

Index: constants.h
===================================================================
RCS file: /cvsroot/cscope/cscope/src/constants.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** constants.h	2001/07/09 14:00:25	1.10
--- constants.h	2001/08/13 15:31:22	1.11
***************
*** 73,76 ****
--- 73,79 ----
  #define	INVNAME	"cscope.in.out"	/* inverted index to the database */
  #define	INVPOST	"cscope.po.out"	/* inverted index postings */
+ #define	INVNAME2 "cscope.out.in"/* follows correct naming convention */
+ #define	INVPOST2 "cscope.out.po"/* follows correct naming convention */
+ 
  #define	STMTMAX	10000		/* maximum source statement length */
  #define	READ	4		/* access(2) parameter */

Index: invlib.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/invlib.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** invlib.c	2001/07/05 16:47:04	1.14
--- invlib.c	2001/08/13 15:31:22	1.15
***************
*** 504,507 ****
--- 504,530 ----
  }
  
+ /* 
+  * If 'invname' ends with the 'from' substring, it is replaced inline with the
+  * 'to' substring (which must be of the exact same length), and the function
+  * returns 0. Otherwise, returns -1.  
+  */
+ 
+ static int 
+ invflipname(char * invname, const char *from, const char *to)
+ {
+ 	char *temp, *i = NULL;
+ 
+ 	assert(strlen(from) == strlen(to));
+ 
+ 	temp = invname - 1;
+ 	while( (temp = strstr(temp + 1, from)))
+ 		i = temp;
+ 	if (!i || i[strlen(from)] != '\0')
+ 		return -1;
+ 	while(*to)
+ 		*i++ = *to++;
+ 	return 0;
+ }
+ 
  int
  invopen(INVCONTROL *invcntl, char *invname, char *invpost, int stat)
***************
*** 513,525 ****
  		 * 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) ? "rb" : "r+b")))) 
  				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) ? "rb" : "r+b")))) 
  				goto openedinvname;
  		}	
  		invcannotopen(invname);
--- 536,551 ----
  		 * 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 (!invflipname(invname, INVNAME2, INVNAME)) {
! 			if ((invcntl->invfile = vpfopen(invname, ((stat == 0) ? "rb" : "r+b")))) 
  				goto openedinvname;
+ 			invflipname(invname, INVNAME, INVNAME2); /* change back for err msg */
+ 		} 
  		/* 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 (!invflipname(invname, INVNAME, INVNAME2)) {
! 			if ((invcntl->invfile = vpfopen(invname, ((stat == 0) ? "rb" : "r+b")))) 
  				goto openedinvname;
+ 			invflipname(invname, INVNAME2, INVNAME); /* change back for err msg */
  		}	
  		invcannotopen(invname);
***************
*** 543,552 ****
  	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) ? "rb" : "r+b")))) 
  				goto openedinvpost;
! 		} else if (!strcmp(invpost, INVPOST)) {
! 			if ((invcntl->postfile = vpfopen("cscope.out.po",((stat == 0)?"rb":"r+b")))) 
  				goto openedinvpost;
  		}
  		invcannotopen(invpost);
--- 569,580 ----
  	if ((invcntl->postfile = vpfopen(invpost, ((stat == 0) ? "rb" : "r+b"))) == NULL) {
  		/* exact same naming convention hacks as above for invname */
! 		if (!invflipname(invpost, INVPOST2, INVPOST)) {
! 			if ((invcntl->postfile = vpfopen(invpost, ((stat == 0) ? "rb" : "r+b")))) 
  				goto openedinvpost;
! 			invflipname(invpost, INVPOST, INVPOST2); /* change back for err msg */
! 		} else if (!invflipname(invpost, INVPOST, INVPOST2)) {
! 			if ((invcntl->postfile = vpfopen(invpost,((stat == 0)?"rb":"r+b")))) 
  				goto openedinvpost;
+ 			invflipname(invpost, INVPOST2, INVPOST); /* change back for err msg */
  		}
  		invcannotopen(invpost);

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

Modified Files:
	fscanner.l 
Log Message:
Flex scanner: use option noyywrap

Index: fscanner.l
===================================================================
RCS file: /cvsroot/cscope/cscope/src/fscanner.l,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** fscanner.l	2001/06/25 12:13:18	1.5
--- fscanner.l	2001/08/03 16:13:10	1.6
***************
*** 131,136 ****
  whitespace	[ \t\n]|{comment}
  
! /* flex-only: stack of start conditions */
  %option stack
  
  %start SDL
--- 131,137 ----
  whitespace	[ \t\n]|{comment}
  
! /* flex options: stack of start conditions, and don't use yywrap() */
  %option stack
+ %option noyywrap
  
  %start SDL

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

Modified Files:
	ChangeLog 
Log Message:
Flex scanner: use option noyywrap

Index: ChangeLog
===================================================================
RCS file: /cvsroot/cscope/cscope/ChangeLog,v
retrieving revision 1.96
retrieving revision 1.97
diff -C2 -r1.96 -r1.97
*** ChangeLog	2001/07/12 15:10:13	1.96
--- ChangeLog	2001/08/03 16:13:10	1.97
***************
*** 1,2 ****
--- 1,4 ----
+ (2001/08/03 - broeker) Use %option noyywrap in fscanner.l to avoid problems
+ 	               with broken flex installations that can't find -lfl. 
  (2001/07/12 - dixon)   Updated INSTALL with new configure info for HP-UX.
  (2001/07/11 - broeker) Fixed #if syntax glitch in cohrs' SUNOS change.