[Exspiminator-commits] CVS: exspiminator/base NewAssembler.java,1.6,1.7 Line.java,1.3,1.4

[Nigel P. <nph...@us...>]

Update of /cvsroot/exspiminator/exspiminator/base
In directory usw-pr-cvs1:/tmp/cvs-serv23472/base

Modified Files:
	NewAssembler.java Line.java 
Log Message:
Fixed and tested duplicate label on backpatched lines bug.

Index: NewAssembler.java
===================================================================
RCS file: /cvsroot/exspiminator/exspiminator/base/NewAssembler.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** NewAssembler.java	2001/11/23 10:50:14	1.6
--- NewAssembler.java	2001/11/26 14:11:58	1.7
***************
*** 225,228 ****
--- 225,230 ----
  				if (incompletes!=null)
  				{
+ 					// remove label so we don't process it twice and get duplicate label error
+ 					line.stripLabel();
  					incompletes.add(new AssemblyLine(line, lineNum, currentAddress));
  				}

Index: Line.java
===================================================================
RCS file: /cvsroot/exspiminator/exspiminator/base/Line.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Line.java	2001/11/22 17:39:16	1.3
--- Line.java	2001/11/26 14:11:58	1.4
***************
*** 41,44 ****
--- 41,52 ----
  	}
  	
+ 	/** Sets the label component to null and returns this line. Note this interface requires the
+ 	mutability of this class.*/
+ 	public Line stripLabel()
+ 	{
+ 		label=null;
+ 		return this;
+ 	}
+ 	
  	/** For debugging.*/
  	public String toString()