xalan-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zong...@apache.org
Subject cvs commit: xml-xalan/java/src/org/apache/xalan/xsltc/compiler Param.java ParameterRef.java
Date Tue, 24 Feb 2004 13:16:14 GMT
zongaro     2004/02/24 05:16:14

  Modified:    java/src/org/apache/xalan/xsltc/compiler Tag:
                        xslt20-compiled Param.java ParameterRef.java
  Log:
  Patch for Bugzilla bug report 25368 from Joanne Tong (joannet () ca ! ibm ! com)
  reviewed by myself.
  
  Code was basing variable and parameter names on the local part of the name,
  rather than including the namespace URI in the name.  This resulted in
  collisions in the generated code between distinct variables that had the same
  local-name.
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.24.2.1  +2 -2      xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Param.java
  
  Index: Param.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Param.java,v
  retrieving revision 1.24
  retrieving revision 1.24.2.1
  diff -u -r1.24 -r1.24.2.1
  --- Param.java	23 Jun 2003 18:23:15 -0000	1.24
  +++ Param.java	24 Feb 2004 13:16:14 -0000	1.24.2.1
  @@ -204,7 +204,7 @@
   	if (_ignore) return;
   	// _ignore = true;
   
  -	final String name = getVariable();
  +	final String name = getEscapedName();
   	final String signature = _type.toSignature();
   	final String className = _type.getClassName();
   
  
  
  
  1.14.6.1  +2 -2      xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ParameterRef.java
  
  Index: ParameterRef.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ParameterRef.java,v
  retrieving revision 1.14
  retrieving revision 1.14.6.1
  diff -u -r1.14 -r1.14.6.1
  --- ParameterRef.java	30 Jan 2003 18:46:01 -0000	1.14
  +++ ParameterRef.java	24 Feb 2004 13:16:14 -0000	1.14.6.1
  @@ -88,7 +88,7 @@
   	final ConstantPoolGen cpg = classGen.getConstantPool();
   	final InstructionList il = methodGen.getInstructionList();
   
  -	final String name = _variable.getVariable();
  +	final String name = _variable.getEscapedName();
   	final String signature = _type.toSignature();
   
   	if (_variable.isLocal()) {
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org


Mime
View raw message