Skip to content

U
uniset2
Commit 990196dc authored by Pavel Vainerman's avatar Pavel Vainerman
Browse files
Options

Попытка сделать так, чтобы названия переменных в сгенерированном коде

потенциально не совпадали с возможными названиями переменных пользователя.
parent 2ca67c9d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 115 additions and 119 deletions
Utilities/codegen/ctl-cpp-cc-alone.xsl
View file @ 990196dc
......@@ -106,10 +106,10 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::callback()
msleep( sleep_msec );
}
// -----------------------------------------------------------------------------
void <xsl:value-of select="$CLASSNAME"/>_SK::askSensors( UniversalIO::UIOCommand cmd )
void <xsl:value-of select="$CLASSNAME"/>_SK::askSensors( UniversalIO::UIOCommand _cmd )
{
// имитируем изменения для посылки сообщений при старте
if( cmd == UniversalIO::UIONotify )
if( _cmd == UniversalIO::UIONotify )
{
<xsl:for-each select="//sensors/item/consumers/consumer">
<xsl:choose>
......@@ -120,54 +120,54 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::askSensors( UniversalIO::UIOCommand
}
}
// -----------------------------------------------------------------------------
void <xsl:value-of select="$CLASSNAME"/>_SK::preSensorInfo( UniSetTypes::SensorMessage* sm )
void <xsl:value-of select="$CLASSNAME"/>_SK::preSensorInfo( UniSetTypes::SensorMessage* _sm )
{
sensorInfo(sm);
sensorInfo(_sm);
}
// -----------------------------------------------------------------------------
void <xsl:value-of select="$CLASSNAME"/>_SK::askState( UniSetTypes::ObjectId sid, UniversalIO::UIOCommand cmd, UniSetTypes::ObjectId node )
void <xsl:value-of select="$CLASSNAME"/>_SK::askState( UniSetTypes::ObjectId _sid, UniversalIO::UIOCommand _cmd, UniSetTypes::ObjectId _node )
{
// #warning НЕ РЕАЛИЗОВАНА...
if( cmd == UniversalIO::UIONotify )
if( _cmd == UniversalIO::UIONotify )
{
SensorMessage sm( sid, (bool)ui.getState(sid,node) );
sm.node = node;
// push( sm.transport_msg() );
sensorInfo(&amp;sm);
SensorMessage _sm( _sid, (bool)ui.getState(_sid,_node) );
_sm.node = _node;
// push( _sm.transport_msg() );
sensorInfo(&amp;_sm);
}
}
// -----------------------------------------------------------------------------
void <xsl:value-of select="$CLASSNAME"/>_SK::askValue( UniSetTypes::ObjectId sid, UniversalIO::UIOCommand cmd, UniSetTypes::ObjectId node )
void <xsl:value-of select="$CLASSNAME"/>_SK::askValue( UniSetTypes::ObjectId _sid, UniversalIO::UIOCommand _cmd, UniSetTypes::ObjectId _node )
{
// #warning НЕ РЕАЛИЗОВАНА..
if( cmd == UniversalIO::UIONotify )
if( _cmd == UniversalIO::UIONotify )
{
SensorMessage sm( sid, (long)ui.getValue(sid,node) );
sm.node = node;
// push( sm.transport_msg() );
sensorInfo(&amp;sm);
SensorMessage _sm( _sid, (long)ui.getValue(_sid,_node) );
_sm.node = _node;
// push( _sm.transport_msg() );
sensorInfo(&amp;_sm);
}
}
// -----------------------------------------------------------------------------
void <xsl:value-of select="$CLASSNAME"/>_SK::setValue( UniSetTypes::ObjectId sid, long val )
void <xsl:value-of select="$CLASSNAME"/>_SK::setValue( UniSetTypes::ObjectId _sid, long _val )
{
// ui.setState(sid,state);
<xsl:for-each select="//sensors/item/consumers/consumer">
<xsl:if test="normalize-space(../../@msg)!='1'">
<xsl:if test="normalize-space(@name)=$OID">
<xsl:if test="normalize-space(@vartype)='out'">
if( sid == <xsl:value-of select="../../@name"/> )
if( _sid == <xsl:value-of select="../../@name"/> )
{
unideb[Debug::LEVEL2] &lt;&lt; "(setValue): <xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/> = " &lt;&lt; val &lt;&lt; endl;
<xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/> = val;
unideb[Debug::LEVEL2] &lt;&lt; "(setValue): <xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/> = " &lt;&lt; _val &lt;&lt; endl;
<xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/> = _val;
return;
}
</xsl:if>
<xsl:if test="normalize-space(@vartype)='io'">
if( sid == <xsl:value-of select="../../@name"/> )
if( _sid == <xsl:value-of select="../../@name"/> )
{
unideb[Debug::LEVEL2] &lt;&lt; "(setValue): <xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/> = " &lt;&lt; val &lt;&lt; endl;
<xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/> = val;
unideb[Debug::LEVEL2] &lt;&lt; "(setValue): <xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/> = " &lt;&lt; _val &lt;&lt; endl;
<xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/> = _val;
return;
}
</xsl:if>
......@@ -176,24 +176,24 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setValue( UniSetTypes::ObjectId sid
</xsl:for-each>
}
// -----------------------------------------------------------------------------
bool <xsl:value-of select="$CLASSNAME"/>_SK::getState( UniSetTypes::ObjectId sid )
bool <xsl:value-of select="$CLASSNAME"/>_SK::getState( UniSetTypes::ObjectId _sid )
{
<xsl:for-each select="//sensors/item/consumers/consumer">
<xsl:if test="normalize-space(../../@msg)!='1'">
<xsl:if test="normalize-space(@name)=$OID">
if( sid == <xsl:value-of select="../../@name"/> )
if( _sid == <xsl:value-of select="../../@name"/> )
return <xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/>;
</xsl:if>
</xsl:if>
</xsl:for-each>
unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(getState): Обращение к неизвестному ДИСКРЕТНОМУ датчику sid="
&lt;&lt; sid &lt;&lt; endl;
&lt;&lt; _sid &lt;&lt; endl;
return false;
}
// -----------------------------------------------------------------------------
void <xsl:value-of select="$CLASSNAME"/>_SK::updateOutputs( bool force )
void <xsl:value-of select="$CLASSNAME"/>_SK::updateOutputs( bool _force )
{
<xsl:for-each select="//sensors/item">
<xsl:call-template name="setdata"/>
......@@ -209,16 +209,16 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::updateOutputs( bool force )
-->
}
// -----------------------------------------------------------------------------
void <xsl:value-of select="$CLASSNAME"/>_SK::setMsg( UniSetTypes::ObjectId code, bool state )
void <xsl:value-of select="$CLASSNAME"/>_SK::setMsg( UniSetTypes::ObjectId _code, bool _state )
{
// блокируем сброс (т.к. он автоматически по таймеру)
if( !state )
if( !_state )
{
ptResetMsg.reset();
return;
}
alarm( code, state );
alarm( _code, _state );
ptResetMsg.reset();
}
// ----------------------------------------------------------------------------
......@@ -330,9 +330,9 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setMsg( UniSetTypes::ObjectId code,
cout &lt;&lt; myname &lt;&lt; ": (DI) change state <xsl:value-of select="../../@name"/> set "
&lt;&lt; <xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/> &lt;&lt; endl;
</xsl:if>
SensorMessage sm( <xsl:value-of select="../../@name"/>, (bool)<xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/>);
// push( sm.transport_msg() );
sensorInfo(&amp;sm);
SensorMessage _sm( <xsl:value-of select="../../@name"/>, (bool)<xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/>);
// push( _sm.transport_msg() );
sensorInfo(&amp;_sm);
}
</xsl:when>
<xsl:when test="normalize-space(../../@iotype)='AI'">
......@@ -344,9 +344,9 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setMsg( UniSetTypes::ObjectId code,
cout &lt;&lt; myname &lt;&lt; ": (AI) change value <xsl:value-of select="../../@name"/> set "
&lt;&lt; <xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/> &lt;&lt; endl;
</xsl:if>
SensorMessage sm( <xsl:value-of select="../../@name"/>, (long)<xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/>);
// push( sm.transport_msg() );
sensorInfo(&amp;sm);
SensorMessage _sm( <xsl:value-of select="../../@name"/>, (long)<xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/>);
// push( _sm.transport_msg() );
sensorInfo(&amp;_sm);
}
</xsl:when>
<xsl:when test="normalize-space(../../@iotype)='DO'">
......@@ -358,8 +358,8 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setMsg( UniSetTypes::ObjectId code,
cout &lt;&lt; myname &lt;&lt; ": (DO) change state <xsl:value-of select="../../@name"/> set "
&lt;&lt; <xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/> &lt;&lt; endl;
</xsl:if>
SensorMessage sm( <xsl:value-of select="../../@name"/>, (bool)<xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/>);
push( sm.transport_msg() );
SensorMessage _sm( <xsl:value-of select="../../@name"/>, (bool)<xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/>);
push( _sm.transport_msg() );
}
</xsl:when>
<xsl:when test="normalize-space(../../@iotype)='AO'">
......@@ -371,8 +371,8 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setMsg( UniSetTypes::ObjectId code,
cout &lt;&lt; myname &lt;&lt; ": (AO) change value <xsl:value-of select="../../@name"/> set "
&lt;&lt; <xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/> &lt;&lt; endl;
</xsl:if>
SensorMessage sm( <xsl:value-of select="../../@name"/>, (long)<xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/>);
push( sm.transport_msg() );
SensorMessage _sm( <xsl:value-of select="../../@name"/>, (long)<xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/>);
push( _sm.transport_msg() );
}
</xsl:when>
</xsl:choose>
......
Utilities/codegen/ctl-cpp-common.xsl
View file @ 990196dc
......@@ -236,30 +236,30 @@
</xsl:template>
<xsl:template name="COMMON-CC-FILE">
void <xsl:value-of select="$CLASSNAME"/>_SK::processingMessage( UniSetTypes::VoidMessage* msg )
void <xsl:value-of select="$CLASSNAME"/>_SK::processingMessage( UniSetTypes::VoidMessage* _msg )
{
try
{
switch( msg->type )
switch( _msg->type )
{
case Message::SensorInfo:
{
SensorMessage sm( msg );
preSensorInfo( &amp;sm );
SensorMessage _sm( _msg );
preSensorInfo( &amp;_sm );
break;
}
case Message::Timer:
{
TimerMessage tm(msg);
preTimerInfo(&amp;tm);
TimerMessage _tm(_msg);
preTimerInfo(&amp;_tm);
break;
}
case Message::SysCommand:
{
SystemMessage sm( msg );
sysCommand( &amp;sm );
SystemMessage _sm( _msg );
sysCommand( &amp;_sm );
break;
}
......@@ -273,9 +273,9 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::processingMessage( UniSetTypes::Voi
}
}
// -----------------------------------------------------------------------------
void <xsl:value-of select="$CLASSNAME"/>_SK::sysCommand( SystemMessage* sm )
void <xsl:value-of select="$CLASSNAME"/>_SK::sysCommand( SystemMessage* _sm )
{
switch( sm->command )
switch( _sm->command )
{
case SystemMessage::WatchDog:
unideb &lt;&lt; myname &lt;&lt; "(sysCommand): WatchDog" &lt;&lt; endl;
......@@ -326,10 +326,10 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::sysCommand( SystemMessage* sm )
}
}
// -----------------------------------------------------------------------------
void <xsl:value-of select="$CLASSNAME"/>_SK::setState( UniSetTypes::ObjectId sid, bool state )
void <xsl:value-of select="$CLASSNAME"/>_SK::setState( UniSetTypes::ObjectId _sid, bool _state )
{
#warning сделать setState отдельной функцией, а не через setValue
setValue(sid, state ? 1 : 0 );
setValue(_sid, _state ? 1 : 0 );
}
// -----------------------------------------------------------------------------
bool <xsl:value-of select="$CLASSNAME"/>_SK::checkTestMode()
......@@ -359,36 +359,36 @@ bool <xsl:value-of select="$CLASSNAME"/>_SK::activateObject()
return true;
}
// -----------------------------------------------------------------------------
void <xsl:value-of select="$CLASSNAME"/>_SK::askThreshold( UniSetTypes::ObjectId sid, UniSetTypes::ThresholdId tid,
UniversalIO::UIOCommand cmd,
CORBA::Long lowLimit, CORBA::Long hiLimit, CORBA::Long sensibility,
UniSetTypes::ObjectId backid )
void <xsl:value-of select="$CLASSNAME"/>_SK::askThreshold( UniSetTypes::ObjectId _sid, UniSetTypes::ThresholdId _tid,
UniversalIO::UIOCommand _cmd,
CORBA::Long lowLimit, CORBA::Long _hiLimit, CORBA::Long _sensibility,
UniSetTypes::ObjectId _backid )
{
#warning askThreshold НЕ РЕАЛИЗОВАНА...
// ui.askThreshold( sid,tid,cmd,lowLimit,hiLimit,sensibility,backid);
// ui.askThreshold( _sid,_tid,_cmd,_lowLimit,_hiLimit,_sensibility,_backid);
}
// -----------------------------------------------------------------------------
void <xsl:value-of select="$CLASSNAME"/>_SK::preTimerInfo( UniSetTypes::TimerMessage* tm )
void <xsl:value-of select="$CLASSNAME"/>_SK::preTimerInfo( UniSetTypes::TimerMessage* _tm )
{
timerInfo(tm);
timerInfo(_tm);
}
// ----------------------------------------------------------------------------
void <xsl:value-of select="$CLASSNAME"/>_SK::waitSM( int wait_msec, ObjectId testID )
void <xsl:value-of select="$CLASSNAME"/>_SK::waitSM( int wait_msec, ObjectId _testID )
{
if( testID == DefaultObjectId )
testID = idTestMode_S;
if( _testID == DefaultObjectId )
_testID = idTestMode_S;
if( testID == DefaultObjectId )
if( _testID == DefaultObjectId )
return;
if( unideb.debugging(Debug::INFO) )
{
unideb[Debug::INFO] &lt;&lt; myname &lt;&lt; "(waitSM): waiting SM ready "
&lt;&lt; wait_msec &lt;&lt; " msec"
&lt;&lt; " testID=" &lt;&lt; testID &lt;&lt; endl;
&lt;&lt; " testID=" &lt;&lt; _testID &lt;&lt; endl;
}
if( !ui.waitReady(testID,wait_msec) )
if( !ui.waitReady(_testID,wait_msec) )
{
ostringstream err;
err &lt;&lt; myname
......@@ -622,9 +622,9 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::checkSensors()
</xsl:for-each>
}
// -----------------------------------------------------------------------------
bool <xsl:value-of select="$CLASSNAME"/>_SK::alarm( UniSetTypes::ObjectId code, bool state )
bool <xsl:value-of select="$CLASSNAME"/>_SK::alarm( UniSetTypes::ObjectId _code, bool _state )
{
if( code == UniSetTypes::DefaultObjectId )
if( _code == UniSetTypes::DefaultObjectId )
{
unideb[Debug::CRIT] &lt;&lt; getName()
&lt;&lt; "(alarm): попытка послать сообщение с DefaultObjectId"
......@@ -633,7 +633,7 @@ bool <xsl:value-of select="$CLASSNAME"/>_SK::alarm( UniSetTypes::ObjectId code,
}
unideb[Debug::LEVEL1] &lt;&lt; getName() &lt;&lt; "(alarm): ";
if( state )
if( _state )
unideb(Debug::LEVEL1) &lt;&lt; "SEND ";
else
unideb(Debug::LEVEL1) &lt;&lt; "RESET ";
......@@ -641,12 +641,12 @@ bool <xsl:value-of select="$CLASSNAME"/>_SK::alarm( UniSetTypes::ObjectId code,
unideb(Debug::LEVEL1) &lt;&lt; endl;
<xsl:for-each select="//msgmap/item">
if( code == <xsl:value-of select="@name"/> )
if( _code == <xsl:value-of select="@name"/> )
{
unideb[Debug::LEVEL1] &lt;&lt; "<xsl:value-of select="@name"/>" &lt;&lt; endl;
try
{
m_<xsl:value-of select="@name"/> = state;
m_<xsl:value-of select="@name"/> = _state;
// сохраняем сразу...
si.id = <xsl:value-of select="@name"/>;
si.node = node_<xsl:value-of select="@name"/>;
......@@ -683,9 +683,9 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::resetMsg()
</xsl:for-each>
}
// -----------------------------------------------------------------------------
void <xsl:value-of select="$CLASSNAME"/>_SK::testMode( bool state )
void <xsl:value-of select="$CLASSNAME"/>_SK::testMode( bool _state )
{
if( !state )
if( !_state )
return;
// отключаем все выходы
......@@ -821,7 +821,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::updateValues()
</xsl:for-each>
}
// -----------------------------------------------------------------------------
void <xsl:value-of select="$CLASSNAME"/>_SK::testMode( bool state )
void <xsl:value-of select="$CLASSNAME"/>_SK::testMode( bool _state )
{
// отключаем все выходы
<xsl:for-each select="//sensors/item/consumers/consumer">
......@@ -869,9 +869,9 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::resetMsg()
}
// -----------------------------------------------------------------------------
bool <xsl:value-of select="$CLASSNAME"/>_SK::alarm( UniSetTypes::ObjectId code, bool state )
bool <xsl:value-of select="$CLASSNAME"/>_SK::alarm( UniSetTypes::ObjectId _code, bool _state )
{
if( code == UniSetTypes::DefaultObjectId )
if( _code == UniSetTypes::DefaultObjectId )
{
unideb[Debug::CRIT] &lt;&lt; getName()
&lt;&lt; "(alarm): попытка послать сообщение с DefaultObjectId"
......@@ -880,10 +880,10 @@ bool <xsl:value-of select="$CLASSNAME"/>_SK::alarm( UniSetTypes::ObjectId code,
}
unideb[Debug::LEVEL1] &lt;&lt; getName() &lt;&lt; "(alarm): ";
if( state )
unideb(Debug::LEVEL1) &lt;&lt; "SEND (" &lt;&lt; code &lt;&lt; ")";
if( _state )
unideb(Debug::LEVEL1) &lt;&lt; "SEND (" &lt;&lt; _code &lt;&lt; ")";
else
unideb(Debug::LEVEL1) &lt;&lt; "RESET (" &lt;&lt; code &lt;&lt; ")";
unideb(Debug::LEVEL1) &lt;&lt; "RESET (" &lt;&lt; _code &lt;&lt; ")";
<xsl:for-each select="//sensors/item">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment