(uniset-codegen): добавил возможность задать тип double в <variables>

Utilities/codegen/ctl-cpp-common.xsl

@@ -433,6 +433,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::waitSM( int wait_msec, ObjectId _te
 <xsl:if test="normalize-space(@const)!=''">
 <xsl:if test="normalize-space(@type)='int'"><xsl:value-of select="normalize-space(@name)"/>(0),</xsl:if>
 <xsl:if test="normalize-space(@type)='float'"><xsl:value-of select="normalize-space(@name)"/>(0),</xsl:if>
+<xsl:if test="normalize-space(@type)='double'"><xsl:value-of select="normalize-space(@name)"/>(0),</xsl:if>
 <xsl:if test="normalize-space(@type)='bool'"><xsl:value-of select="normalize-space(@name)"/>(false),</xsl:if>
 <xsl:if test="normalize-space(@type)='str'"><xsl:value-of select="normalize-space(@name)"/>(""),</xsl:if>
 </xsl:if>
@@ -444,6 +445,9 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::waitSM( int wait_msec, ObjectId _te
 <xsl:if test="normalize-space(@type)='float'">
 <xsl:value-of select="normalize-space(@name)"/>(atof( init3_str(conf->getArgParam("--<xsl:value-of select="../@arg_prefix"/><xsl:value-of select="@name"/>"),conf->getProp(cnode,"<xsl:value-of select="@name"/>"),"<xsl:value-of select="normalize-space(@default)"/>").c_str())),
 </xsl:if>
+<xsl:if test="normalize-space(@type)='double'">
+<xsl:value-of select="normalize-space(@name)"/>(atof( init3_str(conf->getArgParam("--<xsl:value-of select="../@arg_prefix"/><xsl:value-of select="@name"/>"),conf->getProp(cnode,"<xsl:value-of select="@name"/>"),"<xsl:value-of select="normalize-space(@default)"/>").c_str())),
+</xsl:if>
 <xsl:if test="normalize-space(@type)='bool'">
 <xsl:value-of select="normalize-space(@name)"/>(uni_atoi( init3_str(conf->getArgParam("--<xsl:value-of select="../@arg_prefix"/><xsl:value-of select="@name"/>"),conf->getProp(cnode,"<xsl:value-of select="@name"/>"),"<xsl:value-of select="normalize-space(@default)"/>"))),
 </xsl:if>

Utilities/codegen/tests/testgen.src.xml

@@ -28,15 +28,16 @@
 		 default - значение по умолчанию (может быть не задано)
 		 no_range_exception=1 - при выходе за границы min или max только писать unideb[WARN].
       -->
-		<item name="test_int" type="int" min="0" comment="test int variable"/>
+		<item name="test_int" type="int" min="0" comment="test int variable" const="1" public="1"/>
 		<item name="test_int2" type="int" max="100" default="110" no_range_exception="1"/>
 		<item name="test_float" type="float" max="100.0" default="50.0" />
-		<item name="test_bool" type="bool" />
-		<item name="test_str" type="str" default1="ddd"/>
+		<item name="test_double" type="double" max="100.340" default="52.044" />
+		<item name="test_bool" type="bool" private="1"/>
+		<item name="test_str" type="str" default="ddd"/>
   </variables>
-  <smap> 
+  <smap>
 	<!-- name - название переменной в конф. файле -->
-	<item name="input1_s" vartype="in" iotype="DI" comment="comment for input1" />
+	<item name="input1_s" vartype="in" iotype="DI" comment="comment for input1" smTestID="1"/>
 	<item name="input2_s" vartype="in" iotype="DI" comment="comment for input2" />
 	<item name="output1_c" vartype="out" iotype="DO" omment="comment for output1" no_check_id="1"/>
   </smap>

conf/libuniset.spec

@@ -3,7 +3,7 @@
 
 Name: libuniset
 Version: 1.4
-Release: alt1
+Release: alt2
 Summary: UniSet - library for building distributed industrial control systems
 License: GPL
 Group: Development/C++
@@ -213,6 +213,9 @@ rm -f %buildroot%_libdir/*.la
 
 
 %changelog
+* Fri Jun 08 2012 Pavel Vainerman <pv@altlinux.ru> 1.4-alt2
+- added support type 'double' for uniset-codegen (<variables>)
+
 * Thu May 31 2012 Pavel Vainerman <pv@altlinux.ru> 1.4-alt1
 - rename unet2 -->unetudp
 - release version 1.4