[eclipse-ccase-cvs] net.sourceforge.clearcase/src/commandline/net/sourceforge/clearcase/commandline/parser CleartoolOutputParser.java, 1.10, 1.11 CleartoolOutput__.g, 1.8, 1.9 CleartoolOutputLexer.java, 1.8, 1.9 CleartoolOutput.g, 1.10, 1.11

[Mikael P. <er...@us...>]

Update of /cvsroot/clearcase-java/net.sourceforge.clearcase/src/commandline/net/sourceforge/clearcase/commandline/parser
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv22563/src/commandline/net/sourceforge/clearcase/commandline/parser

Modified Files:
	CleartoolOutputParser.java CleartoolOutput__.g 
	CleartoolOutputLexer.java CleartoolOutput.g 
Log Message:
Added support for merge message

Index: CleartoolOutputParser.java
===================================================================
RCS file: /cvsroot/clearcase-java/net.sourceforge.clearcase/src/commandline/net/sourceforge/clearcase/commandline/parser/CleartoolOutputParser.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** CleartoolOutputParser.java	7 Sep 2008 18:52:59 -0000	1.10
--- CleartoolOutputParser.java	10 Sep 2008 13:51:36 -0000	1.11
***************
*** 1,3 ****
! // $ANTLR 3.0.1 C:\\Documents and Settings\\eraonel\\opensource\\net.sourceforge.clearcase\\src\\commandline\\net\\sourceforge\\clearcase\\commandline\\parser\\CleartoolOutput.g 2008-09-07 20:26:27
  
  package net.sourceforge.clearcase.commandline.parser;
--- 1,3 ----
! // $ANTLR 3.0.1 /home/eraonel/opensource_projects/net.sourceforge.clearcase/src/commandline/net/sourceforge/clearcase/commandline/parser/CleartoolOutput.g 2008-09-10 15:41:35
  
  package net.sourceforge.clearcase.commandline.parser;
***************
*** 48,57 ****
  
[...2335 lines suppressed...]
!     public static final BitSet FOLLOW_VIEW_in_typeElement976 = new BitSet(new long[]{0x0000000000000000L,0x0000000002000000L});
!     public static final BitSet FOLLOW_89_in_typeElement978 = new BitSet(new long[]{0x0000000000800000L,0x0000000004000000L});
!     public static final BitSet FOLLOW_set_in_typeElement980 = new BitSet(new long[]{0x0000000000000002L});
!     public static final BitSet FOLLOW_DERIVED_in_typeElement994 = new BitSet(new long[]{0x0000000000000000L,0x0000000004000000L});
!     public static final BitSet FOLLOW_90_in_typeElement996 = new BitSet(new long[]{0x0000000000200002L});
!     public static final BitSet FOLLOW_VERSION_in_typeElement998 = new BitSet(new long[]{0x0000000000000002L});
!     public static final BitSet FOLLOW_SYMBOLIC_in_typeElement1008 = new BitSet(new long[]{0x0000000000000000L,0x0000000008000000L});
!     public static final BitSet FOLLOW_91_in_typeElement1010 = new BitSet(new long[]{0x0000000000000002L});
!     public static final BitSet FOLLOW_DIRECTORY_in_typeElement1017 = new BitSet(new long[]{0x0000000000200000L});
!     public static final BitSet FOLLOW_VERSION_in_typeElement1020 = new BitSet(new long[]{0x0000000000000002L});
      public static final BitSet FOLLOW_set_in_derivedType0 = new BitSet(new long[]{0x0000000000000002L});
!     public static final BitSet FOLLOW_LITERAL_in_filename1063 = new BitSet(new long[]{0x0000000000000402L});
!     public static final BitSet FOLLOW_filename_in_filename1067 = new BitSet(new long[]{0x0000000000000002L});
!     public static final BitSet FOLLOW_96_in_rule1077 = new BitSet(new long[]{0x0000000000000400L});
!     public static final BitSet FOLLOW_LITERAL_in_rule1079 = new BitSet(new long[]{0x0000000000000402L});
!     public static final BitSet FOLLOW_set_in_trash1089 = new BitSet(new long[]{0xFFFFFFFFFFFFFFE2L,0x00000001FFFFFFFFL});
!     public static final BitSet FOLLOW_set_in_trash1102 = new BitSet(new long[]{0xFFFFFFFFFFFFFFE2L,0x00000001FFFFFFFFL});
  
  }
\ No newline at end of file

Index: CleartoolOutput.g
===================================================================
RCS file: /cvsroot/clearcase-java/net.sourceforge.clearcase/src/commandline/net/sourceforge/clearcase/commandline/parser/CleartoolOutput.g,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** CleartoolOutput.g	7 Sep 2008 18:52:59 -0000	1.10
--- CleartoolOutput.g	10 Sep 2008 13:51:37 -0000	1.11
***************
*** 62,70 ****
  	| 'Can\u0027t' 'modify' 'directory' elem=STRING 'because' 'it' 'is' 'not' 'checked' 'out.' {throwException = true; exceptionCode |= ClearCase.ERROR_DIR_IS_NOT_CHECKED_OUT;}
  	| 'Unable' 'to' 'access' elem=STRING ':' 'No' 'such' 'file' 'or' 'directory.' {throwException = true; exceptionCode |= ClearCase.ERROR_NOT_ACCESSIBLE;}
! 	| 'By' 'default' COMMA 'won\u0027t' 'create' 'version' 'with' 'data' 'identical' 'to' 'predecessor.'
! 	| 'Unable' 'to' 'check' 'in' elem=STRING DOT  {throwException = true; exceptionCode |= ClearCase.ERROR_PREDECESSOR_IS_IDENTICAL;}
  	| 'The' 'most' 'recent' 'version' 'on' 'branch' STRING 'is' 'not' 'the' 'predecessor' 'of' 'this' 'version.'NEWLINE
  	 CLEARTOOL 'Error:' 'Unable' 'to' 'check' 'in' elem=STRING DOT {throwException = true; exceptionCode |= ClearCase.ERROR_MOST_RECENT_NOT_PREDECESSOR_OF_THIS_VERSION;}
! 	| (LITERAL | STRING | DOT)+)
  	{if (throwException) throw new ClearCaseException(exceptionCode, new String[]{$elem.text}, null);}
  	;
--- 62,70 ----
  	| 'Can\u0027t' 'modify' 'directory' elem=STRING 'because' 'it' 'is' 'not' 'checked' 'out.' {throwException = true; exceptionCode |= ClearCase.ERROR_DIR_IS_NOT_CHECKED_OUT;}
  	| 'Unable' 'to' 'access' elem=STRING ':' 'No' 'such' 'file' 'or' 'directory.' {throwException = true; exceptionCode |= ClearCase.ERROR_NOT_ACCESSIBLE;}
! 	| 'By' 'default' COMMA 'won\u0027t' 'create' 'version' 'with' 'data' 'identical' 'to' 'predecessor.' NEWLINE
! 	 CLEARTOOL 'Error:' 'Unable' 'to' 'check' 'in' elem=STRING DOT  {throwException = true; exceptionCode |= ClearCase.ERROR_PREDECESSOR_IS_IDENTICAL;}
  	| 'The' 'most' 'recent' 'version' 'on' 'branch' STRING 'is' 'not' 'the' 'predecessor' 'of' 'this' 'version.'NEWLINE
  	 CLEARTOOL 'Error:' 'Unable' 'to' 'check' 'in' elem=STRING DOT {throwException = true; exceptionCode |= ClearCase.ERROR_MOST_RECENT_NOT_PREDECESSOR_OF_THIS_VERSION;}
!                 | (LITERAL | STRING | DOT)+)
  	{if (throwException) throw new ClearCaseException(exceptionCode, new String[]{$elem.text}, null);}
  	;

Index: CleartoolOutputLexer.java
===================================================================
RCS file: /cvsroot/clearcase-java/net.sourceforge.clearcase/src/commandline/net/sourceforge/clearcase/commandline/parser/CleartoolOutputLexer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** CleartoolOutputLexer.java	7 Sep 2008 18:52:59 -0000	1.8
--- CleartoolOutputLexer.java	10 Sep 2008 13:51:36 -0000	1.9
***************
*** 1,3 ****
! // $ANTLR 3.0.1 C:\\Documents and Settings\\eraonel\\opensource\\net.sourceforge.clearcase\\src\\commandline\\net\\sourceforge\\clearcase\\commandline\\parser\\CleartoolOutput.g 2008-09-07 20:26:28
  
  package net.sourceforge.clearcase.commandline.parser;
--- 1,3 ----
! // $ANTLR 3.0.1 /home/eraonel/opensource_projects/net.sourceforge.clearcase/src/commandline/net/sourceforge/clearcase/commandline/parser/CleartoolOutput.g 2008-09-10 15:41:36
  
  package net.sourceforge.clearcase.commandline.parser;
***************
*** 109,113 ****
          super(input);
[...2699 lines suppressed...]
                  mDOT(); 
--- 5510,5514 ----
                  break;
              case 91 :
!                 // /home/eraonel/opensource_projects/net.sourceforge.clearcase/src/commandline/net/sourceforge/clearcase/commandline/parser/CleartoolOutput.g:1:439: DOT
                  {
                  mDOT(); 
***************
*** 5517,5521 ****
                  break;
              case 92 :
!                 // C:\\Documents and Settings\\eraonel\\opensource\\net.sourceforge.clearcase\\src\\commandline\\net\\sourceforge\\clearcase\\commandline\\parser\\CleartoolOutput.g:1:443: COMMA
                  {
                  mCOMMA(); 
--- 5517,5521 ----
                  break;
              case 92 :
!                 // /home/eraonel/opensource_projects/net.sourceforge.clearcase/src/commandline/net/sourceforge/clearcase/commandline/parser/CleartoolOutput.g:1:443: COMMA
                  {
                  mCOMMA(); 

Index: CleartoolOutput__.g
===================================================================
RCS file: /cvsroot/clearcase-java/net.sourceforge.clearcase/src/commandline/net/sourceforge/clearcase/commandline/parser/CleartoolOutput__.g,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** CleartoolOutput__.g	7 Sep 2008 18:52:59 -0000	1.8
--- CleartoolOutput__.g	10 Sep 2008 13:51:36 -0000	1.9
***************
*** 1,5 ****
  lexer grammar CleartoolOutput;
! @header {
! package net.sourceforge.clearcase.commandline.parser;
  }
  
--- 1,5 ----
  lexer grammar CleartoolOutput;
! @header {
! package net.sourceforge.clearcase.commandline.parser;
  }
  
***************
*** 76,197 ****
  T96 : 'Rule:' ;
  
! // $ANTLR src "C:\Documents and Settings\eraonel\opensource\net.sourceforge.clearcase\src\commandline\net\sourceforge\clearcase\commandline\parser\CleartoolOutput.g" 166
! CLEARTOOL
! 	:	'cleartool:';
! 	
! // $ANTLR src "C:\Documents and Settings\eraonel\opensource\net.sourceforge.clearcase\src\commandline\net\sourceforge\clearcase\commandline\parser\CleartoolOutput.g" 169
! CHECKED
! 	:	'Checked';
! 	
! // $ANTLR src "C:\Documents and Settings\eraonel\opensource\net.sourceforge.clearcase\src\commandline\net\sourceforge\clearcase\commandline\parser\CleartoolOutput.g" 172
! CREATING
! 	:	'Creating';
! 	
! // $ANTLR src "C:\Documents and Settings\eraonel\opensource\net.sourceforge.clearcase\src\commandline\net\sourceforge\clearcase\commandline\parser\CleartoolOutput.g" 175
! CREATED
! 	:	'Created';
! 	
! // $ANTLR src "C:\Documents and Settings\eraonel\opensource\net.sourceforge.clearcase\src\commandline\net\sourceforge\clearcase\commandline\parser\CleartoolOutput.g" 178
! MAKING
! 	:	'Making';
! 
! // $ANTLR src "C:\Documents and Settings\eraonel\opensource\net.sourceforge.clearcase\src\commandline\net\sourceforge\clearcase\commandline\parser\CleartoolOutput.g" 181
! LOADING
! 	:	'Loading'
! 	;
! 
! // $ANTLR src "C:\Documents and Settings\eraonel\opensource\net.sourceforge.clearcase\src\commandline\net\sourceforge\clearcase\commandline\parser\CleartoolOutput.g" 185
! CHECKING
! 	:	'Checking'
! 	;
! 
! // $ANTLR src "C:\Documents and Settings\eraonel\opensource\net.sourceforge.clearcase\src\commandline\net\sourceforge\clearcase\commandline\parser\CleartoolOutput.g" 189
! VIEW
! 	:	'view'
! 	;
! 
! // $ANTLR src "C:\Documents and Settings\eraonel\opensource\net.sourceforge.clearcase\src\commandline\net\sourceforge\clearcase\commandline\parser\CleartoolOutput.g" 193
! DERIVED
! 	:	'derived'
! 	;
! 
! // $ANTLR src "C:\Documents and Settings\eraonel\opensource\net.sourceforge.clearcase\src\commandline\net\sourceforge\clearcase\commandline\parser\CleartoolOutput.g" 197
! SYMBOLIC
! 	:	'symbolic'
! 	;
! 
! // $ANTLR src "C:\Documents and Settings\eraonel\opensource\net.sourceforge.clearcase\src\commandline\net\sourceforge\clearcase\commandline\parser\CleartoolOutput.g" 201
! DIRECTORY
! 	:	'directory'
! 	;
! 
! // $ANTLR src "C:\Documents and Settings\eraonel\opensource\net.sourceforge.clearcase\src\commandline\net\sourceforge\clearcase\commandline\parser\CleartoolOutput.g" 205
! VERSION
! 	:	'version'
! 	;
! 
! // $ANTLR src "C:\Documents and Settings\eraonel\opensource\net.sourceforge.clearcase\src\commandline\net\sourceforge\clearcase\commandline\parser\CleartoolOutput.g" 209
! MOVED
! 	:	'Moved'
! 	;
! 
! // $>
! 	
! // $ANTLR src "C:\Documents and Settings\eraonel\opensource\net.sourceforge.clearcase\src\commandline\net\sourceforge\clearcase\commandline\parser\CleartoolOutput.g" 215
! LITERAL
! 	:	CHAR(CHAR|DOT)(CHAR|DOT)*;
! 
! // newline
! // $ANTLR src "C:\Documents and Settings\eraonel\opensource\net.sourceforge.clearcase\src\commandline\net\sourceforge\clearcase\commandline\parser\CleartoolOutput.g" 219
! NEWLINE
!     :	( '\r' '\n'   // DOS
! 		| '\n'        // UNIX
! 		| '\r'        // MAC
! 		)
!     ;	
! 
! // $ANTLR src "C:\Documents and Settings\eraonel\opensource\net.sourceforge.clearcase\src\commandline\net\sourceforge\clearcase\commandline\parser\CleartoolOutput.g" 226
! WS	:	(' ' | '\t')+ {$channel=HIDDEN;};
! 
! 
! // $ANTLR src "C:\Documents and Settings\eraonel\opensource\net.sourceforge.clearcase\src\commandline\net\sourceforge\clearcase\commandline\parser\CleartoolOutput.g" 229
! LPAREN
! 	:	'(';
! 
! 
! // $ANTLR src "C:\Documents and Settings\eraonel\opensource\net.sourceforge.clearcase\src\commandline\net\sourceforge\clearcase\commandline\parser\CleartoolOutput.g" 233
! RPAREN
! 	:	 ')';
! 
! // $ANTLR src "C:\Documents and Settings\eraonel\opensource\net.sourceforge.clearcase\src\commandline\net\sourceforge\clearcase\commandline\parser\CleartoolOutput.g" 236
! STRING
! 	:	'"'! ( ~'"' ) * '"'!
! 	;
! 
! // $ANTLR src "C:\Documents and Settings\eraonel\opensource\net.sourceforge.clearcase\src\commandline\net\sourceforge\clearcase\commandline\parser\CleartoolOutput.g" 240
! DOT	:	'.';
! 
! // $ANTLR src "C:\Documents and Settings\eraonel\opensource\net.sourceforge.clearcase\src\commandline\net\sourceforge\clearcase\commandline\parser\CleartoolOutput.g" 242
! COMMA	:	',';
! 
! // $ANTLR src "C:\Documents and Settings\eraonel\opensource\net.sourceforge.clearcase\src\commandline\net\sourceforge\clearcase\commandline\parser\CleartoolOutput.g" 244
! fragment
! CHAR
! 	:	'A'..'Z'
! 	|	'a'..'z'
!     |	'\u0080'..'\ufffe'
!     |	'0'..'9'
!     |	'/' 
!     | 	'\\' 
!     | 	'?' 
!     |	'*' 
!     |	'-'
!     |	'+'
!     |	':'
!     |	'$'
!     |	'_'
!     |   '['
!     |   ']'
! 	;
! 
! 
--- 76,197 ----
  T96 : 'Rule:' ;
  
! // $ANTLR src "/home/eraonel/opensource_projects/net.sourceforge.clearcase/src/commandline/net/sourceforge/clearcase/commandline/parser/CleartoolOutput.g" 166
! CLEARTOOL
! 	:	'cleartool:';
! 	
! // $ANTLR src "/home/eraonel/opensource_projects/net.sourceforge.clearcase/src/commandline/net/sourceforge/clearcase/commandline/parser/CleartoolOutput.g" 169
! CHECKED
! 	:	'Checked';
! 	
! // $ANTLR src "/home/eraonel/opensource_projects/net.sourceforge.clearcase/src/commandline/net/sourceforge/clearcase/commandline/parser/CleartoolOutput.g" 172
! CREATING
! 	:	'Creating';
! 	
! // $ANTLR src "/home/eraonel/opensource_projects/net.sourceforge.clearcase/src/commandline/net/sourceforge/clearcase/commandline/parser/CleartoolOutput.g" 175
! CREATED
! 	:	'Created';
! 	
! // $ANTLR src "/home/eraonel/opensource_projects/net.sourceforge.clearcase/src/commandline/net/sourceforge/clearcase/commandline/parser/CleartoolOutput.g" 178
! MAKING
! 	:	'Making';
! 
! // $ANTLR src "/home/eraonel/opensource_projects/net.sourceforge.clearcase/src/commandline/net/sourceforge/clearcase/commandline/parser/CleartoolOutput.g" 181
! LOADING
! 	:	'Loading'
! 	;
! 
! // $ANTLR src "/home/eraonel/opensource_projects/net.sourceforge.clearcase/src/commandline/net/sourceforge/clearcase/commandline/parser/CleartoolOutput.g" 185
! CHECKING
! 	:	'Checking'
! 	;
! 
! // $ANTLR src "/home/eraonel/opensource_projects/net.sourceforge.clearcase/src/commandline/net/sourceforge/clearcase/commandline/parser/CleartoolOutput.g" 189
! VIEW
! 	:	'view'
! 	;
! 
! // $ANTLR src "/home/eraonel/opensource_projects/net.sourceforge.clearcase/src/commandline/net/sourceforge/clearcase/commandline/parser/CleartoolOutput.g" 193
! DERIVED
! 	:	'derived'
! 	;
! 
! // $ANTLR src "/home/eraonel/opensource_projects/net.sourceforge.clearcase/src/commandline/net/sourceforge/clearcase/commandline/parser/CleartoolOutput.g" 197
! SYMBOLIC
! 	:	'symbolic'
! 	;
! 
! // $ANTLR src "/home/eraonel/opensource_projects/net.sourceforge.clearcase/src/commandline/net/sourceforge/clearcase/commandline/parser/CleartoolOutput.g" 201
! DIRECTORY
! 	:	'directory'
! 	;
! 
! // $ANTLR src "/home/eraonel/opensource_projects/net.sourceforge.clearcase/src/commandline/net/sourceforge/clearcase/commandline/parser/CleartoolOutput.g" 205
! VERSION
! 	:	'version'
! 	;
! 
! // $ANTLR src "/home/eraonel/opensource_projects/net.sourceforge.clearcase/src/commandline/net/sourceforge/clearcase/commandline/parser/CleartoolOutput.g" 209
! MOVED
! 	:	'Moved'
! 	;
! 
! // $>
! 	
! // $ANTLR src "/home/eraonel/opensource_projects/net.sourceforge.clearcase/src/commandline/net/sourceforge/clearcase/commandline/parser/CleartoolOutput.g" 215
! LITERAL
! 	:	CHAR(CHAR|DOT)(CHAR|DOT)*;
! 
! // newline
! // $ANTLR src "/home/eraonel/opensource_projects/net.sourceforge.clearcase/src/commandline/net/sourceforge/clearcase/commandline/parser/CleartoolOutput.g" 219
! NEWLINE
!     :	( '\r' '\n'   // DOS
! 		| '\n'        // UNIX
! 		| '\r'        // MAC
! 		)
!     ;	
! 
! // $ANTLR src "/home/eraonel/opensource_projects/net.sourceforge.clearcase/src/commandline/net/sourceforge/clearcase/commandline/parser/CleartoolOutput.g" 226
! WS	:	(' ' | '\t')+ {$channel=HIDDEN;};
! 
! 
! // $ANTLR src "/home/eraonel/opensource_projects/net.sourceforge.clearcase/src/commandline/net/sourceforge/clearcase/commandline/parser/CleartoolOutput.g" 229
! LPAREN
! 	:	'(';
! 
! 
! // $ANTLR src "/home/eraonel/opensource_projects/net.sourceforge.clearcase/src/commandline/net/sourceforge/clearcase/commandline/parser/CleartoolOutput.g" 233
! RPAREN
! 	:	 ')';
! 
! // $ANTLR src "/home/eraonel/opensource_projects/net.sourceforge.clearcase/src/commandline/net/sourceforge/clearcase/commandline/parser/CleartoolOutput.g" 236
! STRING
! 	:	'"'! ( ~'"' ) * '"'!
! 	;
! 
! // $ANTLR src "/home/eraonel/opensource_projects/net.sourceforge.clearcase/src/commandline/net/sourceforge/clearcase/commandline/parser/CleartoolOutput.g" 240
! DOT	:	'.';
! 
! // $ANTLR src "/home/eraonel/opensource_projects/net.sourceforge.clearcase/src/commandline/net/sourceforge/clearcase/commandline/parser/CleartoolOutput.g" 242
! COMMA	:	',';
! 
! // $ANTLR src "/home/eraonel/opensource_projects/net.sourceforge.clearcase/src/commandline/net/sourceforge/clearcase/commandline/parser/CleartoolOutput.g" 244
! fragment
! CHAR
! 	:	'A'..'Z'
! 	|	'a'..'z'
!     |	'\u0080'..'\ufffe'
!     |	'0'..'9'
!     |	'/' 
!     | 	'\\' 
!     | 	'?' 
!     |	'*' 
!     |	'-'
!     |	'+'
!     |	':'
!     |	'$'
!     |	'_'
!     |   '['
!     |   ']'
! 	;
! 
!