You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by db...@apache.org on 2001/11/27 00:20:04 UTC

cvs commit: xml-xalan/c/src/XSLT ElemLiteralResult.cpp ElemSort.cpp ElemTemplateElement.cpp ElemValueOf.cpp ElemVariable.cpp ElemWhen.cpp

dbertoni    01/11/26 15:20:04

  Modified:    c/src/XSLT ElemLiteralResult.cpp ElemSort.cpp
                        ElemTemplateElement.cpp ElemValueOf.cpp
                        ElemVariable.cpp ElemWhen.cpp
  Log:
  Fixed error reporting.
  
  Revision  Changes    Path
  1.45      +4 -1      xml-xalan/c/src/XSLT/ElemLiteralResult.cpp
  
  Index: ElemLiteralResult.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemLiteralResult.cpp,v
  retrieving revision 1.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- ElemLiteralResult.cpp	2001/09/26 21:30:23	1.44
  +++ ElemLiteralResult.cpp	2001/11/26 23:20:04	1.45
  @@ -127,7 +127,10 @@
   
   				if(ns == 0)
   				{
  -					constructionContext.error("Cannot resolve namespace prefix: " + prefix);
  +					constructionContext.error(
  +						"Cannot resolve namespace prefix: " + prefix,
  +						0,
  +						this);
   				}
   				else if(equals(*ns, stylesheetTree.getXSLTNamespaceURI()))
   				{
  
  
  
  1.11      +4 -1      xml-xalan/c/src/XSLT/ElemSort.cpp
  
  Index: ElemSort.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemSort.cpp,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ElemSort.cpp	2001/07/18 04:33:15	1.10
  +++ ElemSort.cpp	2001/11/26 23:20:04	1.11
  @@ -123,7 +123,10 @@
   		}
   		else if(!isAttrOK(aname, atts, i, constructionContext))
   		{
  -			constructionContext.error(Constants::ELEMNAME_SORT_WITH_PREFIX_STRING + " has an illegal attribute: " + aname);
  +			constructionContext.error(
  +				"xsl:sort has an illegal attribute",
  +				0,
  +				this);
   		}
   	}
   
  
  
  
  1.69      +8 -2      xml-xalan/c/src/XSLT/ElemTemplateElement.cpp
  
  Index: ElemTemplateElement.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemTemplateElement.cpp,v
  retrieving revision 1.68
  retrieving revision 1.69
  diff -u -r1.68 -r1.69
  --- ElemTemplateElement.cpp	2001/11/19 20:15:52	1.68
  +++ ElemTemplateElement.cpp	2001/11/26 23:20:04	1.69
  @@ -214,7 +214,10 @@
   	}
   	else
   	{
  -		constructionContext.error("xml:space has an illegal value");
  +		constructionContext.error(
  +			"xml:space has an illegal value",
  +			0,
  +			this);
   	}
   }
   
  @@ -243,7 +246,10 @@
   		}
   		else
   		{
  -			constructionContext.error("xml:space has an illegal value");
  +			constructionContext.error(
  +				"xml:space has an illegal value",
  +				0,
  +				this);
   		}
       }
   
  
  
  
  1.27      +8 -2      xml-xalan/c/src/XSLT/ElemValueOf.cpp
  
  Index: ElemValueOf.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemValueOf.cpp,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- ElemValueOf.cpp	2001/09/19 21:20:46	1.26
  +++ ElemValueOf.cpp	2001/11/26 23:20:04	1.27
  @@ -140,14 +140,20 @@
   		default:
   			if(!isAttrOK(aname, atts, i, constructionContext))
   			{
  -				constructionContext.error(Constants::ELEMNAME_VALUEOF_WITH_PREFIX_STRING + " has an illegal attribute: " + aname);
  +				constructionContext.error(
  +					"xsl:value-of has an illegal attribute",
  +					0,
  +					this);
   			} 
   		}
   	}
   
   	if(0 == m_selectPattern)
   	{
  -		constructionContext.error(Constants::ELEMNAME_VALUEOF_WITH_PREFIX_STRING + " requires a select attribute.");
  +		constructionContext.error(
  +			"xsl:value-of requires a 'select' attribute",
  +			0,
  +			this);
   	}
   }
   
  
  
  
  1.22      +5 -2      xml-xalan/c/src/XSLT/ElemVariable.cpp
  
  Index: ElemVariable.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemVariable.cpp,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- ElemVariable.cpp	2001/09/19 21:20:46	1.21
  +++ ElemVariable.cpp	2001/11/26 23:20:04	1.22
  @@ -123,7 +123,10 @@
   		default:
   			if(!isAttrOK(aname, atts, i, constructionContext))
   			{
  -				constructionContext.error("xsl:variable has an illegal attribute", 0, this);
  +				constructionContext.error(
  +					"xsl:variable has an illegal attribute",
  +					0,
  +					this);
   			}
   		}
   	}
  @@ -131,7 +134,7 @@
   	if(m_qname.isEmpty())
   	{
   		constructionContext.error(
  -			"xsl:variable must have a 'name' attribute.",
  +			"xsl:variable must have a 'name' attribute",
   			0,
   			this);
   	}
  
  
  
  1.10      +1 -1      xml-xalan/c/src/XSLT/ElemWhen.cpp
  
  Index: ElemWhen.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemWhen.cpp,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ElemWhen.cpp	2001/09/19 21:20:46	1.9
  +++ ElemWhen.cpp	2001/11/26 23:20:04	1.10
  @@ -117,7 +117,7 @@
   	if(0 == m_pTest)
   	{
   		constructionContext.error(
  -			"xsl:when must have a 'test' attribute.",
  +			"xsl:when must have a 'test' attribute",
   			0,
   			this);
   	}
  
  
  

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