[E-p-i-c-commits] org.epic.debug/src/org/epic/debug/varparser add.g,1.7,1.8 PerlParserSimple.java,1.22,1.23 PerlBaseLexer.java,1.22,1.23

[Stephan R. <ste...@us...>]

Update of /cvsroot/e-p-i-c/org.epic.debug/src/org/epic/debug/varparser
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18813/src/org/epic/debug/varparser

Modified Files:
	add.g PerlParserSimple.java PerlBaseLexer.java 
Log Message:
Displaying undef values added
Plugin path calculation fixed for Eclipse 3

Index: PerlBaseLexer.java
===================================================================
RCS file: /cvsroot/e-p-i-c/org.epic.debug/src/org/epic/debug/varparser/PerlBaseLexer.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- PerlBaseLexer.java	12 Jun 2004 20:27:44 -0000	1.22
+++ PerlBaseLexer.java	13 Jun 2004 06:14:19 -0000	1.23
@@ -171,8 +171,8 @@
 		int _saveIndex;
 		
 		{
-		int _cnt263=0;
-		_loop263:
+		int _cnt158=0;
+		_loop158:
 		do {
 			if ((_tokenSet_1.member(LA(1)))) {
 				{
@@ -180,10 +180,10 @@
 				}
 			}
 			else {
-				if ( _cnt263>=1 ) { break _loop263; } else {throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());}
+				if ( _cnt158>=1 ) { break _loop158; } else {throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());}
 			}
 			
-			_cnt263++;
+			_cnt158++;
 		} while (true);
 		}
 		if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
@@ -254,10 +254,10 @@
 		_ttype = MODULE_NAME;
 		int _saveIndex;
 		
-		boolean synPredMatched270 = false;
+		boolean synPredMatched165 = false;
 		if (((LA(1)=='A') && (LA(2)=='R') && (LA(3)=='R') && (LA(4)=='A'))) {
-			int _m270 = mark();
-			synPredMatched270 = true;
+			int _m165 = mark();
+			synPredMatched165 = true;
 			inputState.guessing++;
 			try {
 				{
@@ -265,22 +265,22 @@
 				}
 			}
 			catch (RecognitionException pe) {
-				synPredMatched270 = false;
+				synPredMatched165 = false;
 			}
-			rewind(_m270);
+			rewind(_m165);
 			inputState.guessing--;
 		}
-		if ( synPredMatched270 ) {
+		if ( synPredMatched165 ) {
 			match("ARRAY");
 			if ( inputState.guessing==0 ) {
 				_ttype = ARRAY_REF;
 			}
 		}
 		else {
-			boolean synPredMatched272 = false;
+			boolean synPredMatched167 = false;
 			if (((LA(1)=='S') && (LA(2)=='C') && (LA(3)=='A') && (LA(4)=='L'))) {
-				int _m272 = mark();
-				synPredMatched272 = true;
+				int _m167 = mark();
+				synPredMatched167 = true;
 				inputState.guessing++;
 				try {
 					{
@@ -288,22 +288,22 @@
 					}
 				}
 				catch (RecognitionException pe) {
-					synPredMatched272 = false;
+					synPredMatched167 = false;
 				}
-				rewind(_m272);
+				rewind(_m167);
 				inputState.guessing--;
 			}
-			if ( synPredMatched272 ) {
+			if ( synPredMatched167 ) {
 				match("SCALAR");
 				if ( inputState.guessing==0 ) {
 					_ttype = SCALAR_REF;
 				}
 			}
 			else {
-				boolean synPredMatched274 = false;
+				boolean synPredMatched169 = false;
 				if (((LA(1)=='H') && (LA(2)=='A') && (LA(3)=='S') && (LA(4)=='H'))) {
-					int _m274 = mark();
-					synPredMatched274 = true;
+					int _m169 = mark();
+					synPredMatched169 = true;
 					inputState.guessing++;
 					try {
 						{
@@ -311,22 +311,22 @@
 						}
 					}
 					catch (RecognitionException pe) {
-						synPredMatched274 = false;
+						synPredMatched169 = false;
 					}
-					rewind(_m274);
+					rewind(_m169);
 					inputState.guessing--;
 				}
-				if ( synPredMatched274 ) {
+				if ( synPredMatched169 ) {
 					match("HASH");
 					if ( inputState.guessing==0 ) {
 						_ttype = HASH_REF;
 					}
 				}
 				else {
-					boolean synPredMatched276 = false;
+					boolean synPredMatched171 = false;
 					if (((LA(1)=='C') && (LA(2)=='O') && (LA(3)=='D') && (LA(4)=='E'))) {
-						int _m276 = mark();
-						synPredMatched276 = true;
+						int _m171 = mark();
+						synPredMatched171 = true;
 						inputState.guessing++;
 						try {
 							{
@@ -334,22 +334,22 @@
 							}
 						}
 						catch (RecognitionException pe) {
-							synPredMatched276 = false;
+							synPredMatched171 = false;
 						}
-						rewind(_m276);
+						rewind(_m171);
 						inputState.guessing--;
 					}
-					if ( synPredMatched276 ) {
+					if ( synPredMatched171 ) {
 						match("CODE");
 						if ( inputState.guessing==0 ) {
 							_ttype = CODE_REF;
 						}
 					}
 					else {
-						boolean synPredMatched280 = false;
+						boolean synPredMatched175 = false;
 						if (((LA(1)=='F') && (LA(2)=='i') && (LA(3)=='l') && (LA(4)=='e'))) {
-							int _m280 = mark();
-							synPredMatched280 = true;
+							int _m175 = mark();
+							synPredMatched175 = true;
 							inputState.guessing++;
 							try {
 								{
@@ -357,22 +357,22 @@
 								}
 							}
 							catch (RecognitionException pe) {
-								synPredMatched280 = false;
+								synPredMatched175 = false;
 							}
-							rewind(_m280);
+							rewind(_m175);
 							inputState.guessing--;
 						}
-						if ( synPredMatched280 ) {
+						if ( synPredMatched175 ) {
 							match("FileHandle");
 							if ( inputState.guessing==0 ) {
 								_ttype = FILE_HANDLE;
 							}
 						}
 						else {
-							boolean synPredMatched282 = false;
+							boolean synPredMatched177 = false;
 							if (((LA(1)=='f') && (LA(2)=='i') && (LA(3)=='l') && (LA(4)=='e'))) {
-								int _m282 = mark();
-								synPredMatched282 = true;
+								int _m177 = mark();
+								synPredMatched177 = true;
 								inputState.guessing++;
 								try {
 									{
@@ -380,27 +380,27 @@
 									}
 								}
 								catch (RecognitionException pe) {
-									synPredMatched282 = false;
+									synPredMatched177 = false;
 								}
-								rewind(_m282);
+								rewind(_m177);
 								inputState.guessing--;
 							}
-							if ( synPredMatched282 ) {
+							if ( synPredMatched177 ) {
 								{
 								match("fileno(");
 								}
 								{
-								int _cnt285=0;
-								_loop285:
+								int _cnt180=0;
+								_loop180:
 								do {
 									if (((LA(1) >= '0' && LA(1) <= '9'))) {
 										matchRange('0','9');
 									}
 									else {
-										if ( _cnt285>=1 ) { break _loop285; } else {throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());}
+										if ( _cnt180>=1 ) { break _loop180; } else {throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());}
 									}
 									
-									_cnt285++;
+									_cnt180++;
 								} while (true);
 								}
 								match(')');
@@ -409,10 +409,10 @@
 								}
 							}
 							else {
-								boolean synPredMatched278 = false;
+								boolean synPredMatched173 = false;
 								if (((LA(1)=='R') && (LA(2)=='E') && (LA(3)=='F') && (true))) {
-									int _m278 = mark();
-									synPredMatched278 = true;
+									int _m173 = mark();
+									synPredMatched173 = true;
 									inputState.guessing++;
 									try {
 										{
@@ -420,12 +420,12 @@
 										}
 									}
 									catch (RecognitionException pe) {
-										synPredMatched278 = false;
+										synPredMatched173 = false;
 									}
-									rewind(_m278);
+									rewind(_m173);
 									inputState.guessing--;
 								}
-								if ( synPredMatched278 ) {
+								if ( synPredMatched173 ) {
 									match("REF");
 									if ( inputState.guessing==0 ) {
 										_ttype = REF;
@@ -457,13 +457,13 @@
 		mFIRST_PURE_NAME_CHAR(false);
 		}
 		{
-		_loop293:
+		_loop188:
 		do {
 			if ((_tokenSet_2.member(LA(1)))) {
 				mPURE_NAME_CHAR(false);
 			}
 			else {
-				break _loop293;
+				break _loop188;
 			}
 			
 		} while (true);
@@ -512,8 +512,8 @@
 		
 		match("(0x");
 		{
-		int _cnt296=0;
-		_loop296:
+		int _cnt191=0;
+		_loop191:
 		do {
 			switch ( LA(1)) {
 			case '0':  case '1':  case '2':  case '3':
@@ -531,10 +531,10 @@
 			}
 			default:
 			{
-				if ( _cnt296>=1 ) { break _loop296; } else {throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());}
+				if ( _cnt191>=1 ) { break _loop191; } else {throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());}
 			}
 			}
-			_cnt296++;
+			_cnt191++;
 		} while (true);
 		}
 		match(')');
@@ -606,7 +606,7 @@
 		
 		match('\'');
 		{
-		_loop304:
+		_loop199:
 		do {
 			if ((_tokenSet_3.member(LA(1)))) {
 				{
@@ -619,7 +619,7 @@
 				mCHAR_ESC(false);
 			}
 			else {
-				break _loop304;
+				break _loop199;
 			}
 			
 		} while (true);
@@ -639,7 +639,7 @@
 		
 		match('\"');
 		{
-		_loop309:
+		_loop204:
 		do {
 			if ((_tokenSet_4.member(LA(1)))) {
 				{
@@ -652,7 +652,7 @@
 				mCHAR_ESC(false);
 			}
 			else {
-				break _loop309;
+				break _loop204;
 			}
 			
 		} while (true);
@@ -740,34 +740,34 @@
 		int _saveIndex;
 		
 		{
-		int _cnt312=0;
-		_loop312:
+		int _cnt207=0;
+		_loop207:
 		do {
 			if (((LA(1) >= '0' && LA(1) <= '9'))) {
 				matchRange('0','9');
 			}
 			else {
-				if ( _cnt312>=1 ) { break _loop312; } else {throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());}
+				if ( _cnt207>=1 ) { break _loop207; } else {throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());}
 			}
 			
-			_cnt312++;
+			_cnt207++;
 		} while (true);
 		}
 		{
 		if ((LA(1)=='.')) {
 			match('.');
 			{
-			int _cnt315=0;
-			_loop315:
+			int _cnt210=0;
+			_loop210:
 			do {
 				if (((LA(1) >= '0' && LA(1) <= '9'))) {
 					matchRange('0','9');
 				}
 				else {
-					if ( _cnt315>=1 ) { break _loop315; } else {throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());}
+					if ( _cnt210>=1 ) { break _loop210; } else {throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());}
 				}
 				
-				_cnt315++;
+				_cnt210++;
 			} while (true);
 			}
 		}
@@ -801,8 +801,8 @@
 		int _saveIndex;
 		
 		{
-		int _cnt319=0;
-		_loop319:
+		int _cnt214=0;
+		_loop214:
 		do {
 			switch ( LA(1)) {
 			case ' ':
@@ -817,10 +817,10 @@
 			}
 			default:
 			{
-				if ( _cnt319>=1 ) { break _loop319; } else {throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());}
+				if ( _cnt214>=1 ) { break _loop214; } else {throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());}
 			}
 			}
-			_cnt319++;
+			_cnt214++;
 		} while (true);
 		}
 		if ( inputState.guessing==0 ) {

Index: add.g
===================================================================
RCS file: /cvsroot/e-p-i-c/org.epic.debug/src/org/epic/debug/varparser/add.g,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- add.g	12 Jun 2004 20:27:44 -0000	1.7
+++ add.g	13 Jun 2004 06:14:19 -0000	1.8
@@ -142,7 +142,7 @@
 arrayReference: ARRAY_REF name:ADR NL {addVar("Array->"+name.getText()," ");printConsole("++++ARRAYREF:"+name.getText()+"\n");}(arrayEntries)? {finalizeVar();printConsole("----ARRAYREF:"+name.getText()+"\n");};
 arrayEntries:  INDENT_START (arrayEntry)* INDENT_END
 			| INDENT_START REF_SYMB PURE_NAME NL INDENT_END;
-arrayEntry: start:NUMBER {addVar("["+start.getText()+"]",null);printConsole("INDEX:"+start.getText());} (value | NL) {finalizeVar();};
+arrayEntry: start:NUMBER {addVar("["+start.getText()+"]",null);printConsole("INDEX:"+start.getText());} value {finalizeVar();};
 
 
 
@@ -162,7 +162,7 @@
 fileHandle: FILE_HANDLE PAREN_OP name:PURE_NAME{addVar(name.getText(),"FileHandle");printConsole("++++FH:"+name.getText()+"\n");} PAREN_CL KEY_ASSIGN val:FILE_NO{setVal(val.getText(),"FileHandle"); finalizeVar();printConsole("++++FNO_SYMB:"+val.getText()+"\n");};
 fileHandleRef: name:FILE_REF{addVar("->"+name.getText(),"FileHandleRef");printConsole("++++FRef:"+name.getText()+"\n");}  NL (INDENT_START fileHandle NL INDENT_END)? {finalizeVar();};
 
-value: p:PURE_NAME{setVal(p.getText(),"");System.out.print(" VAL:"+p.getText());} ((p2:PURE_NAME){appendVal(" "+p2.getText());printConsole(" "+p2.getText());})? {printConsole("\n");}NL  | refs | s:STRING{setVal(s.getText(),"Scalar");printConsole(" VAL:"+s.getText()+"\n");} NL | n:NUMBER{setVal(n.getText(),"Scalar");printConsole(" VAL_NUM:"+n.getText()+"\n");}NL ;
+value: p:PURE_NAME{setVal(p.getText(),"");System.out.print(" VAL:"+p.getText());} ((p2:PURE_NAME){appendVal(" "+p2.getText());printConsole(" "+p2.getText());})? {printConsole("\n");}NL  | refs | s:STRING{setVal(s.getText(),"Scalar");printConsole(" VAL:"+s.getText()+"\n");} NL | n:NUMBER{setVal(n.getText(),"Scalar");printConsole(" VAL_NUM:"+n.getText()+"\n");}NL | NL{setVal("undef","Scalar");};
 refs:  (hashReference | arrayReference | scalarRef | codeRef | ref | fileHandleRef);
 //refs: (PURE_NAME EQ)? (hashReference | arrayReference | scalarRef | codeRef | ref | fileHandleRef);
 // ----------------------------------------------------------------------------

Index: PerlParserSimple.java
===================================================================
RCS file: /cvsroot/e-p-i-c/org.epic.debug/src/org/epic/debug/varparser/PerlParserSimple.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- PerlParserSimple.java	12 Jun 2004 20:27:44 -0000	1.22
+++ PerlParserSimple.java	13 Jun 2004 06:14:19 -0000	1.23
@@ -146,37 +146,37 @@
 		
 		try {      // for error handling
 			{
-			_loop218:
+			_loop114:
 			do {
 				if ((LA(1)==NL)) {
 					match(NL);
 				}
 				else {
-					break _loop218;
+					break _loop114;
 				}
 				
 			} while (true);
 			}
 			{
-			_loop222:
+			_loop118:
 			do {
 				if ((_tokenSet_0.member(LA(1)))) {
 					namedVar();
 					{
-					_loop221:
+					_loop117:
 					do {
 						if ((LA(1)==NL)) {
 							match(NL);
 						}
 						else {
-							break _loop221;
+							break _loop117;
 						}
 						
 					} while (true);
 					}
 				}
 				else {
-					break _loop222;
+					break _loop118;
 				}
 				
 			} while (true);
@@ -238,7 +238,7 @@
 			match(SCALAR_NAME);
 			addVar(name.getText(),"Scalar");printConsole("++++SCALAR:"+name.getText()+"\n");
 			{
-			if ((LA(1)==EQ) && (_tokenSet_3.member(LA(2))) && (LA(3)==NL||LA(3)==ADR||LA(3)==PURE_NAME)) {
+			if ((LA(1)==EQ) && (_tokenSet_3.member(LA(2))) && (_tokenSet_4.member(LA(3)))) {
 				match(EQ);
 				value();
 				finalizeVar();printConsole("----SCALAR:"+name.getText()+"\n");
@@ -372,13 +372,13 @@
 			if ((LA(1)==INDENT_START) && (LA(2)==NUMBER||LA(2)==INDENT_END)) {
 				match(INDENT_START);
 				{
-				_loop230:
+				_loop126:
 				do {
 					if ((LA(1)==NUMBER)) {
 						arrayEntry();
 					}
 					else {
-						break _loop230;
+						break _loop126;
 					}
 					
 				} while (true);
@@ -400,7 +400,7 @@
 		catch (RecognitionException ex) {
 			reportError(ex);
 			consume();
-			consumeUntil(_tokenSet_4);
+			consumeUntil(_tokenSet_5);
 		}
 	}
 	
@@ -444,7 +444,7 @@
 		catch (RecognitionException ex) {
 			reportError(ex);
 			consume();
-			consumeUntil(_tokenSet_5);
+			consumeUntil(_tokenSet_6);
 		}
 	}
 	
@@ -456,38 +456,13 @@
 			start = LT(1);
 			match(NUMBER);
 			addVar("["+start.getText()+"]",null);printConsole("INDEX:"+start.getText());
-			{
-			switch ( LA(1)) {
-			case ARRAY_REF:
-			case SCALAR_REF:
-			case HASH_REF:
-			case CODE_REF:
-			case REF:
-			case NUMBER:
-			case PURE_NAME:
-			case STRING:
-			case FILE_REF:
-			{
-				value();
-				break;
-			}
-			case NL:
-			{
-				match(NL);
-				break;
-			}
-			default:
-			{
-				throw new NoViableAltException(LT(1), getFilename());
-			}
-			}
-			}
+			value();
 			finalizeVar();
 		}
 		catch (RecognitionException ex) {
 			reportError(ex);
 			consume();
-			consumeUntil(_tokenSet_6);
+			consumeUntil(_tokenSet_7);
 		}
 	}
 	
@@ -556,6 +531,12 @@
 				match(NL);
 				break;
 			}
+			case NL:
+			{
+				match(NL);
+				setVal("undef","Scalar");
+				break;
+			}
 			default:
 			{
 				throw new NoViableAltException(LT(1), getFilename());
@@ -565,7 +546,7 @@
 		catch (RecognitionException ex) {
 			reportError(ex);
 			consume();
-			consumeUntil(_tokenSet_5);
+			consumeUntil(_tokenSet_6);
 		}
 	}
 	
@@ -576,13 +557,13 @@
 			if ((LA(1)==INDENT_START) && (LA(2)==INDENT_END||LA(2)==STRING)) {
 				match(INDENT_START);
 				{
-				_loop239:
+				_loop134:
 				do {
 					if ((LA(1)==STRING)) {
 						hashEntry();
 					}
 					else {
-						break _loop239;
+						break _loop134;
 					}
 					
 				} while (true);
@@ -604,7 +585,7 @@
 		catch (RecognitionException ex) {
 			reportError(ex);
 			consume();
-			consumeUntil(_tokenSet_4);
+			consumeUntil(_tokenSet_5);
 		}
 	}
 	
@@ -648,7 +629,7 @@
 		catch (RecognitionException ex) {
 			reportError(ex);
 			consume();
-			consumeUntil(_tokenSet_5);
+			consumeUntil(_tokenSet_6);
 		}
 	}
 	
@@ -668,7 +649,7 @@
 		catch (RecognitionException ex) {
 			reportError(ex);
 			consume();
-			consumeUntil(_tokenSet_7);
+			consumeUntil(_tokenSet_8);
 		}
 	}
 	
@@ -718,7 +699,7 @@
 		catch (RecognitionException ex) {
 			reportError(ex);
 			consume();
-			consumeUntil(_tokenSet_5);
+			consumeUntil(_tokenSet_6);
 		}
 	}
 	
@@ -741,7 +722,7 @@
 		catch (RecognitionException ex) {
 			reportError(ex);
 			consume();
-			consumeUntil(_tokenSet_5);
+			consumeUntil(_tokenSet_6);
 		}
 	}
 	
@@ -784,7 +765,7 @@
 			}
 			}
 			{
-			_loop250:
+			_loop145:
 			do {
 				switch ( LA(1)) {
 				case PURE_NAME:
@@ -816,7 +797,7 @@
 				}
 				default:
 				{
-					break _loop250;
+					break _loop145;
 				}
 				}
 			} while (true);
@@ -828,7 +809,7 @@
 		catch (RecognitionException ex) {
 			reportError(ex);
 			consume();
-			consumeUntil(_tokenSet_5);
+			consumeUntil(_tokenSet_6);
 		}
 	}
 	
@@ -851,7 +832,7 @@
 		catch (RecognitionException ex) {
 			reportError(ex);
 			consume();
-			consumeUntil(_tokenSet_5);
+			consumeUntil(_tokenSet_6);
 		}
 	}
 	
@@ -897,7 +878,7 @@
 		catch (RecognitionException ex) {
 			reportError(ex);
 			consume();
-			consumeUntil(_tokenSet_5);
+			consumeUntil(_tokenSet_6);
 		}
 	}
 	
@@ -957,29 +938,34 @@
 	}
 	public static final BitSet _tokenSet_2 = new BitSet(mk_tokenSet_2());
 	private static final long[] mk_tokenSet_3() {
-		long[] data = { 369114880L, 0L};
+		long[] data = { 369639168L, 0L};
 		return data;
 	}
 	public static final BitSet _tokenSet_3 = new BitSet(mk_tokenSet_3());
 	private static final long[] mk_tokenSet_4() {
-		long[] data = { 72032370L, 0L};
+		long[] data = { 42598514L, 0L};
 		return data;
 	}
 	public static final BitSet _tokenSet_4 = new BitSet(mk_tokenSet_4());
 	private static final long[] mk_tokenSet_5() {
-		long[] data = { 67838066L, 0L};
+		long[] data = { 72032370L, 0L};
 		return data;
 	}
 	public static final BitSet _tokenSet_5 = new BitSet(mk_tokenSet_5());
 	private static final long[] mk_tokenSet_6() {
-		long[] data = { 73728L, 0L};
+		long[] data = { 67838066L, 0L};
 		return data;
 	}
 	public static final BitSet _tokenSet_6 = new BitSet(mk_tokenSet_6());
 	private static final long[] mk_tokenSet_7() {
-		long[] data = { 67174400L, 0L};
+		long[] data = { 73728L, 0L};
 		return data;
 	}
 	public static final BitSet _tokenSet_7 = new BitSet(mk_tokenSet_7());
+	private static final long[] mk_tokenSet_8() {
+		long[] data = { 67174400L, 0L};
+		return data;
+	}
+	public static final BitSet _tokenSet_8 = new BitSet(mk_tokenSet_8());
 	
 	}