You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ro...@apache.org on 2006/04/10 13:31:02 UTC
svn commit: r392922 - in /incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl: SCA4CPPIntfProxyCPP.xsl SCA4CPPIntfWrapperCPP.xsl

Author: robbinspg
Date: Mon Apr 10 04:30:58 2006
New Revision: 392922

URL: http://svn.apache.org/viewcvs?rev=392922&view=rev
Log:
TUSCANY-164 scagen tool updates for parameter type setting

Modified:
    incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfProxyCPP.xsl
    incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfWrapperCPP.xsl

Modified: incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfProxyCPP.xsl
URL: http://svn.apache.org/viewcvs/incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfProxyCPP.xsl?rev=392922&r1=392921&r2=392922&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfProxyCPP.xsl (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfProxyCPP.xsl Mon Apr 10 04:30:58 2006
@@ -225,9 +225,11 @@
 <xsl:text>
     Operation operation("</xsl:text>
     <xsl:value-of select="../@operationNameAttr"/>
+<!--
     <xsl:text>", </xsl:text>
     <xsl:value-of select="$noOfParms"/>
-    <xsl:text>);</xsl:text>
+-->
+    <xsl:text>");</xsl:text>
     <xsl:if test="$noOfParms!=0">
     <xsl:for-each select="../scaOperationParameter">
         <xsl:call-template name="proxy_method_body_set_parameter"/>
@@ -249,9 +251,11 @@
 <xsl:text>
     Operation operation("</xsl:text>
     <xsl:value-of select="@operationNameAttr"/>
+<!--
     <xsl:text>", </xsl:text>
     <xsl:value-of select="$noOfParms"/>
-    <xsl:text>);
+-->
+    <xsl:text>");
  </xsl:text>
     <xsl:call-template name="proxy_method_body_prepare_return_var_no_parms"/>
     <xsl:text>
@@ -389,10 +393,9 @@
     <xsl:variable name="type">
         <xsl:value-of select="."/>
     </xsl:variable>
-    operation.setParameter(<xsl:value-of select="position()-1"/><xsl:text>, (void*)</xsl:text>
-<xsl:if test="not(contains($type, '*'))">&amp;</xsl:if>
-<xsl:value-of select="$scaOperationParameterNameAttrInner"/>
-<xsl:text>);
+<!--    operation.setParameter(<xsl:value-of select="position()-1"/><xsl:text>, (void*)</xsl:text> 
+<xsl:if test="not(contains($type, '*'))">&amp;</xsl:if> -->
+    operation.addParameter(&amp;<xsl:value-of select="$scaOperationParameterNameAttrInner"/><xsl:text>);
 </xsl:text>
 </xsl:template>
 </xsl:stylesheet>

Modified: incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfWrapperCPP.xsl
URL: http://svn.apache.org/viewcvs/incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfWrapperCPP.xsl?rev=392922&r1=392921&r2=392922&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfWrapperCPP.xsl (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfWrapperCPP.xsl Mon Apr 10 04:30:58 2006
@@ -196,25 +196,25 @@
                 <xsl:value-of select="substring-before($type, '&amp;')"/>
             </xsl:variable>
             <xsl:value-of select="$type"/><xsl:text> p</xsl:text><xsl:value-of select="position()-1"/><xsl:text> = *(</xsl:text><xsl:value-of select="$type_no_amp"/>
-             <xsl:text>*)operation.getParameter(</xsl:text><xsl:value-of select="position()-1"/><xsl:text>);
+             <xsl:text>*)operation.getParameterValue(</xsl:text><xsl:value-of select="position()-1"/><xsl:text>);
 </xsl:text>
         </xsl:when>
         <xsl:when test="contains($type, '*')"><!-- pointer -->
             <xsl:if test="contains($isConst,'true')">const </xsl:if>
-            <xsl:value-of select="."/><xsl:text> p</xsl:text><xsl:value-of select="position()-1"/><xsl:text> = (</xsl:text>
+            <xsl:value-of select="."/><xsl:text> p</xsl:text><xsl:value-of select="position()-1"/><xsl:text> = *(</xsl:text>
              <xsl:if test="contains($isConst,'true')">const</xsl:if><xsl:text> </xsl:text>
               <xsl:value-of select="$type"/>
-             <xsl:text>)operation.getParameter(</xsl:text><xsl:value-of select="position()-1"/><xsl:text>);
+             <xsl:text>*)operation.getParameterValue(</xsl:text><xsl:value-of select="position()-1"/><xsl:text>);
 </xsl:text>
         </xsl:when>
         <xsl:when test="contains($type, 'DataObjectPtr')"><!-- DataObjectPtr -->
-            <xsl:text>DataObjectPtr&amp; p</xsl:text><xsl:value-of select="position()-1"/><xsl:text> = *(DataObjectPtr*)operation.getParameter(</xsl:text><xsl:value-of select="position()-1"/><xsl:text>);</xsl:text>
+            <xsl:text>DataObjectPtr&amp; p</xsl:text><xsl:value-of select="position()-1"/><xsl:text> = *(DataObjectPtr*)operation.getParameterValue(</xsl:text><xsl:value-of select="position()-1"/><xsl:text>);</xsl:text>
         </xsl:when>
         <xsl:otherwise><!-- simple type -->
     <xsl:if test="contains($isConst,'true')">const </xsl:if><xsl:value-of select="$type"/><xsl:text>&amp; p</xsl:text><xsl:value-of select="position()-1"/><xsl:text> = *(</xsl:text>
     <xsl:if test="contains($isConst,'true')">const</xsl:if><xsl:text> </xsl:text>
           <xsl:value-of select="$type"/>
-     <xsl:text>*)operation.getParameter(</xsl:text><xsl:value-of select="position()-1"/><xsl:text>);
+     <xsl:text>*)operation.getParameterValue(</xsl:text><xsl:value-of select="position()-1"/><xsl:text>);
 </xsl:text>
 
         </xsl:otherwise>