Re: [CEDET-devel] Preparing Semantic 1.4.2

[David P. <dav...@wa...>]

Hi Eric,

[...]
 > Did you include Klaus' patch for defopt in a previous changlog?  I
 > don't recall what happened to some of the patches he had sent us.

Yes I did.  Here is the change log entry:

2002-12-17 12:50  ponced

     * semantic-texi.el:

     (semantic-texi-super-regex): Added missing matcher for `defopt'.
     Thanks to "Klaus Berndl" <kla...@sd...>.

 > Here is a new c.bnf.  The patch I can create from CVS apparently
 > doesn't apply to 1.4.1.  I think my development area is out of sync.

Following is the diff between the CVS "v1p4" version and yours.  If
you find it correct, I could check the change in.  Could you send me
a change log?

Thanks!
David

Index: c.bnf
===================================================================
RCS file: /cvsroot/cedet/cedet/semantic/Attic/c.bnf,v
retrieving revision 1.59.2.2
diff -c -r1.59.2.2 c.bnf
*** c.bnf	26 Dec 2002 11:04:38 -0000	1.59.2.2
--- c.bnf	27 Dec 2002 06:57:39 -0000
***************
*** 285,294 ****
   		  ;

   class-parents : opt-class-protection opt-class-declmods
! 		symbol COMA class-parents
! 		( ,(cons $3 $5 ) )
! 	      | opt-class-protection opt-class-declmods symbol
! 		( $3 )
   	      ;

   opt-class-declmods : class-declmods opt-class-declmods
--- 285,294 ----
   		  ;

   class-parents : opt-class-protection opt-class-declmods
! 		namespace-symbol COMA class-parents
! 		( ,(cons (car $4) $6 ) )
! 	      | opt-class-protection opt-class-declmods namespace-symbol
! 		( ,$4 )
   	      ;

   opt-class-declmods : class-declmods opt-class-declmods
***************
*** 490,495 ****
--- 490,497 ----
   	| REGISTER
   	| FRIEND
   	| METADECLMOD
+ 	;; This is a hack in case we are in a class.
+ 	| VIRTUAL
   	;

   metadeclmod : METADECLMOD
***************
*** 521,538 ****
   	       ( ,$1 )
   	     | symbol template-specifier
   	       ( $1 type "class" )
! 	     | symbol COLON COLON typeformclassbase opt-template-specifier
! 	       ( (concat $1 "::" (car $4) ) )
   	     | symbol
   	       ( $1 )
   	     ;

- typeformclassbase : symbol COLON COLON typeformclassbase
- 		    ( (concat $1 "::" (car $4)) )
- 		  | symbol
- 		    ( $1 )
- 		  ;
-
   builtintype : VOID
   	    | CHAR
   	    | SHORT
--- 523,534 ----
   	       ( ,$1 )
   	     | symbol template-specifier
   	       ( $1 type "class" )
! 	     | namespace-symbol opt-stars opt-template-specifier
! 	       ( ,$1  )
   	     | symbol
   	       ( $1 )
   	     ;

   builtintype : VOID
   	    | CHAR
   	    | SHORT
***************
*** 613,622 ****
   	   ;

   # Is this true?  I don't actually know.
! throw-exception-list : symbol COMA throw-exception-list
! 		       ( ,(cons $1 $3) )
! 		     | symbol close-paren ")"
! 		       ( $1 )
   		     | open-paren "(" throw-exception-list
   		       ( ,$2 )
   		     | close-paren ")"
--- 609,618 ----
   	   ;

   # Is this true?  I don't actually know.
! throw-exception-list : namespace-symbol COMA throw-exception-list
! 		       ( ,(cons (car $1) $3) )
! 		     | namespace-symbol close-paren ")"
! 		       ( ,$1 )
   		     | open-paren "(" throw-exception-list
   		       ( ,$2 )
   		     | close-paren ")"
***************
*** 673,678 ****
--- 669,680 ----
               | varname
   	      ( $1 )
   	    ;
+
+ namespace-symbol : symbol COLON COLON namespace-symbol
+ 		   ( (concat $1 "::" (car $4)) )
+ 		 | symbol
+ 		   ( $1 )
+ 		 ;

   opt-class : symbol COLON COLON
   	    ( $1 )