From b87a68746a14aa2ead164140298dbb263ef65d59 Mon Sep 17 00:00:00 2001
From: Erwan Jahier <jahier@imag.fr>
Date: Thu, 21 Aug 2008 16:37:11 +0200
Subject: [PATCH] Fix a bug when printing structure expression: they should
have been prefixed by "_".
---
src/licDump.ml | 4 +-
src/split.ml | 2 +-
src/test/test.res.exp | 182 +++++++++++++++++++++---------------------
3 files changed, 94 insertions(+), 94 deletions(-)
diff --git a/src/licDump.ml b/src/licDump.ml
index 4d6852f7..587d3488 100644
--- a/src/licDump.ml
+++ b/src/licDump.ml
@@ -1,4 +1,4 @@
-(** Time-stamp: <modified the 21/08/2008 (at 16:01) by Erwan Jahier> *)
+(** Time-stamp: <modified the 21/08/2008 (at 16:34) by Erwan Jahier> *)
open CompiledData
open Printf
@@ -321,7 +321,7 @@ and string_of_val_exp_eff = function
| CallByNameEff(by_name_op_eff, fl) ->
(match by_name_op_eff.it with
- | STRUCT_eff (pn,idref) -> (
+ | STRUCT_eff (pn,idref) -> prefix ^ (
match Ident.pack_of_idref idref with
| Some pn -> Ident.string_of_idref idref
| None ->
diff --git a/src/split.ml b/src/split.ml
index 98ab7d89..fe9e1081 100644
--- a/src/split.ml
+++ b/src/split.ml
@@ -1,4 +1,4 @@
-(** Time-stamp: <modified the 21/08/2008 (at 16:04) by Erwan Jahier> *)
+(** Time-stamp: <modified the 21/08/2008 (at 16:35) by Erwan Jahier> *)
open Lxm
diff --git a/src/test/test.res.exp b/src/test/test.res.exp
index 1869c7b8..812bbaa2 100644
--- a/src/test/test.res.exp
+++ b/src/test/test.res.exp
@@ -7987,7 +7987,7 @@ let
t[0].a[1 .. 99 step 2][1] = true;
t[0].a[5 .. 99 step 2] = (false^48);
t[0].b = 42;
- t[1 .. 2] = (left::truc{a=(true^100);b=0}^2);
+ t[1 .. 2] = (_left::truc{a=(true^100);b=0}^2);
tel
-- end of node left::toto
-- automatically defined aliases:
@@ -8038,7 +8038,7 @@ var
_v5:real;
_v6:real;
let
- out2 = inter::selType{i=0;b=true;r=.0};
+ out2 = _inter::selType{i=0;b=true;r=.0};
out.i = (pint::fby1(_v1, _v2));
_v1 = out2.i;
_v2 = in.i;
@@ -9212,7 +9212,7 @@ var
_v5:real;
_v6:real;
let
- out2 = inter::selType{i=0;b=true;r=.0};
+ out2 = _inter::selType{i=0;b=true;r=.0};
out.i = (pint::fby1(_v1, _v2));
_v1 = out2.i;
_v2 = in.i;
@@ -9283,7 +9283,7 @@ var
_v5:real;
_v6:real;
let
- out2 = inter::selType{i=0;b=true;r=0.0};
+ out2 = _inter::selType{i=0;b=true;r=0.0};
out.i = (pint::fby1(_v1, _v2));
_v1 = out2.i;
_v2 = in.i;
@@ -9317,7 +9317,7 @@ Opening file should_work/Pascal/struct0.lus
type _struct0::Toto = struct {x : int = 1; y : int = 2};
node struct0::bibi(dummy:int) returns (z:_struct0::Toto);
let
- z = struct0::Toto{x=3};
+ z = _struct0::Toto{x=3};
tel
-- end of node struct0::bibi
@@ -9950,7 +9950,7 @@ var
_v3:bool;
_v4:_Gyroscope2::Valid_ChannelT;
let
- acc_out = Gyroscope2::CFF_Eltstruct{indx=(acc_in.indx +
+ acc_out = _Gyroscope2::CFF_Eltstruct{indx=(acc_in.indx +
1);indx_toChange=acc_in.indx_toChange;value=acc_in.value};
elt_out = ( if _v3 then _v4 else elt_in);
_v1 = acc_in.indx;
@@ -9970,7 +9970,7 @@ var
acc_out:_Gyroscope2::CFF_Eltstruct;
let
(acc_out, tabToFillAfter) = (fillred<<Gyroscope2::addOneChannelIter,
- 3>>(Gyroscope2::CFF_Eltstruct{indx=0;indx_toChange=indx_toChange;value=channeltToAdd},
+ 3>>(_Gyroscope2::CFF_Eltstruct{indx=0;indx_toChange=indx_toChange;value=channeltToAdd},
tabToFill));
tel
-- end of node Gyroscope2::addOneChannel
@@ -9981,7 +9981,7 @@ node Gyroscope2::CFC_iter(
returns (
structOut:_Gyroscope2::CFF_struct);
let
- structOut = Gyroscope2::CFF_struct{indx=(structIn.indx +
+ structOut = _Gyroscope2::CFF_struct{indx=(structIn.indx +
1);indx_toChange=structIn.indx_toChange;tabToFill=( if
(structIn.indx_toChange = structIn.indx) then structIn.tabToFill else
(Gyroscope2::addOneChannel(structIn.indx, currentChannel,
@@ -9999,9 +9999,9 @@ var
localtabToFill:_Gyroscope2::Valid_ChannelT;
let
localtabToFill =
- Gyroscope2::Valid_ChannelT{local_failure=false;local_value=0.0};
+ _Gyroscope2::Valid_ChannelT{local_failure=false;local_value=0.0};
acc_out = (red<<Gyroscope2::CFC_iter,
- 4>>(Gyroscope2::CFF_struct{indx=0;indx_toChange=currentChannelIndx;tabToFill=(localtabToFill^3)},
+ 4>>(_Gyroscope2::CFF_struct{indx=0;indx_toChange=currentChannelIndx;tabToFill=(localtabToFill^3)},
allChannels));
foreignChannels = acc_out.tabToFill;
tel
@@ -10146,12 +10146,12 @@ var
localChannel:_Gyroscope2::Valid_ChannelT;
let
localChannel =
- Gyroscope2::Valid_ChannelT{local_failure=((Gyroscope2::abs((inChannel.valuea
+ _Gyroscope2::Valid_ChannelT{local_failure=((Gyroscope2::abs((inChannel.valuea
- inChannel.valueb))) > delta);local_value=( if
((Gyroscope2::abs((inChannel.valuea - inChannel.valueb))) > delta) then 0.0
else ((inChannel.valuea + inChannel.valueb) / 2.0))};
outChannel =
- Gyroscope2::Valid_ChannelT{local_failure=(localChannel.local_failure or
+ _Gyroscope2::Valid_ChannelT{local_failure=(localChannel.local_failure or
(Gyroscope2::CrossFailDetect(nbInChannel, localChannel,
previousOutChannel)));local_value=localChannel.local_value};
nextOutChannel = previousOutChannel;
@@ -10289,7 +10289,7 @@ var
_v5:A__Gyroscope2::Valid_ChannelT_4;
let
initChannels =
- (Gyroscope2::Valid_ChannelT{local_failure=false;local_value=0.0}^4);
+ (_Gyroscope2::Valid_ChannelT{local_failure=false;local_value=0.0}^4);
(dumbChannel, resChannels) = (fillred<<Gyroscope2::Channel,
4>>(fillredInit, _v1, channels, _v2, _v3, _v4));
_v1 = ([0, 1, 2, 3]);
@@ -12118,7 +12118,7 @@ var
_v10:int;
_v11:A_int_2;
let
- yo.titi = morel4::tube{in=i;out=(i + 1)};
+ yo.titi = _morel4::tube{in=i;out=(i + 1)};
yo.tutu = true;
t = (_v5 -> _v11);
_v1 = yo.titi;
@@ -12326,7 +12326,7 @@ var
_v12:A_int_2;
_v13:A_int_2;
let
- yo.titi = morel5::tube{in=i;out=(i + 1)};
+ yo.titi = _morel5::tube{in=i;out=(i + 1)};
yo.tutu = true;
t = (_v5 -> _v11);
_v1 = yo.titi;
@@ -15044,7 +15044,7 @@ let
_v4 = (Gyroscope::abs(_v3));
_v5 = (_v4 > delta);
outChannel =
- Gyroscope::Valid_ChannelT{local_failure=maintain;local_value=( if maintain
+ _Gyroscope::Valid_ChannelT{local_failure=maintain;local_value=( if maintain
then 0.0 else ((inChannel.valuea + inChannel.valueb) / 2.0))};
tel
-- end of node Gyroscope::Channel
@@ -15329,7 +15329,7 @@ returns (
acc_out:_produitBool::T_isElementOf_);
let
acc_out =
- produitBool::T_isElementOf_{eltToSearch=acc_in.eltToSearch;iselementof=(acc_in.iselementof
+ _produitBool::T_isElementOf_{eltToSearch=acc_in.eltToSearch;iselementof=(acc_in.iselementof
or (acc_in.eltToSearch = elt_in))};
tel
-- end of node produitBool::iterated_isElementOf_
@@ -15343,7 +15343,7 @@ var
acc_out:_produitBool::T_isElementOf_;
let
acc_out = (red<<produitBool::iterated_isElementOf_,
- 10>>(produitBool::T_isElementOf_{eltToSearch=e;iselementof=false}, t));
+ 10>>(_produitBool::T_isElementOf_{eltToSearch=e;iselementof=false}, t));
iselementof = acc_out.iselementof;
tel
-- end of node produitBool::_isElementOf_
@@ -15354,7 +15354,7 @@ node produitBool::selectOneStage(
returns (
acc_out:_produitBool::iteratedStruct);
let
- acc_out = produitBool::iteratedStruct{currentRank=(acc_in.currentRank +
+ acc_out = _produitBool::iteratedStruct{currentRank=(acc_in.currentRank +
1);rankToSelect=acc_in.rankToSelect;elementSelected=( if
(acc_in.currentRank = acc_in.rankToSelect) then currentElt else
acc_in.elementSelected)};
@@ -15370,7 +15370,7 @@ var
iterationResult:_produitBool::iteratedStruct;
let
iterationResult = (red<<produitBool::selectOneStage,
- 10>>(produitBool::iteratedStruct{currentRank=0;rankToSelect=rankToSelect;elementSelected=array[0]},
+ 10>>(_produitBool::iteratedStruct{currentRank=0;rankToSelect=rankToSelect;elementSelected=array[0]},
array));
elementSelected = iterationResult.elementSelected;
tel
@@ -15397,7 +15397,7 @@ var
_v13:bool;
let
acc_out =
- produitBool::Tacc_inShift2{multiplieur=acc_in.multiplieur;rank=acc_in.rank;actual_rank=(acc_in.actual_rank
+ _produitBool::Tacc_inShift2{multiplieur=acc_in.multiplieur;rank=acc_in.rank;actual_rank=(acc_in.actual_rank
+ 1)};
elt_out = ( if _v8 then _v13 else false);
_v1 = acc_in.actual_rank;
@@ -15424,7 +15424,7 @@ var
bidon:_produitBool::Tacc_inShift2;
let
(bidon, ligne) = (fill<<produitBool::shiftFill,
- 20>>(produitBool::Tacc_inShift2{multiplieur=acc_in.multiplieur;rank=acc_in.rank;actual_rank=0}));
+ 20>>(_produitBool::Tacc_inShift2{multiplieur=acc_in.multiplieur;rank=acc_in.rank;actual_rank=0}));
tel
-- end of node produitBool::shift
@@ -15485,8 +15485,8 @@ node shiftFill_ludic::n_selectOneStage(
returns (
o_acc_out:_shiftFill_ludic::T3_STRUCT);
let
- o_acc_out = shiftFill_ludic::T3_STRUCT{currentRank=(i_acc_in.currentRank +
- 1);rankToSelect=i_acc_in.rankToSelect;elementSelected=( if
+ o_acc_out = _shiftFill_ludic::T3_STRUCT{currentRank=(i_acc_in.currentRank
+ + 1);rankToSelect=i_acc_in.rankToSelect;elementSelected=( if
(i_acc_in.currentRank = i_acc_in.rankToSelect) then i_currentElt else
i_acc_in.elementSelected)};
tel
@@ -15501,7 +15501,7 @@ var
v_iterationResult:_shiftFill_ludic::T3_STRUCT;
let
v_iterationResult = (red<<shiftFill_ludic::n_selectOneStage,
- 10>>(shiftFill_ludic::T3_STRUCT{currentRank=0;rankToSelect=i_rankToSelect;elementSelected=i_array[0]},
+ 10>>(_shiftFill_ludic::T3_STRUCT{currentRank=0;rankToSelect=i_rankToSelect;elementSelected=i_array[0]},
i_array));
o_elementSelected = v_iterationResult.elementSelected;
tel
@@ -15526,7 +15526,7 @@ var
_v11:bool;
let
o_acc_out =
- shiftFill_ludic::T2_STRUCT{multiplieur=i_acc_in.multiplieur;rank=i_acc_in.rank;actual_rank=(i_acc_in.actual_rank
+ _shiftFill_ludic::T2_STRUCT{multiplieur=i_acc_in.multiplieur;rank=i_acc_in.rank;actual_rank=(i_acc_in.actual_rank
+ 1)};
o_elt_out = ( if _v8 then _v11 else false);
_v1 = i_acc_in.actual_rank;
@@ -15567,7 +15567,7 @@ node shift_ludic::n_selectOneStage(
returns (
o_acc_out:_shift_ludic::T4_STRUCT);
let
- o_acc_out = shift_ludic::T4_STRUCT{currentRank=(i_acc_in.currentRank +
+ o_acc_out = _shift_ludic::T4_STRUCT{currentRank=(i_acc_in.currentRank +
1);rankToSelect=i_acc_in.rankToSelect;elementSelected=( if
(i_acc_in.currentRank = i_acc_in.rankToSelect) then i_currentElt else
i_acc_in.elementSelected)};
@@ -15583,7 +15583,7 @@ var
v_iterationResult:_shift_ludic::T4_STRUCT;
let
v_iterationResult = (red<<shift_ludic::n_selectOneStage,
- 10>>(shift_ludic::T4_STRUCT{currentRank=0;rankToSelect=i_rankToSelect;elementSelected=i_array[0]},
+ 10>>(_shift_ludic::T4_STRUCT{currentRank=0;rankToSelect=i_rankToSelect;elementSelected=i_array[0]},
i_array));
o_elementSelected = v_iterationResult.elementSelected;
tel
@@ -15608,7 +15608,7 @@ var
_v11:bool;
let
o_acc_out =
- shift_ludic::T2_STRUCT{multiplieur=i_acc_in.multiplieur;rank=i_acc_in.rank;actual_rank=(i_acc_in.actual_rank
+ _shift_ludic::T2_STRUCT{multiplieur=i_acc_in.multiplieur;rank=i_acc_in.rank;actual_rank=(i_acc_in.actual_rank
+ 1)};
o_elt_out = ( if _v8 then _v11 else false);
_v1 = i_acc_in.actual_rank;
@@ -15633,7 +15633,7 @@ var
v_bidon:_shift_ludic::T2_STRUCT;
let
(v_bidon, o_ligne) = (fill<<shift_ludic::n_shiftFill,
- 20>>(shift_ludic::T2_STRUCT{multiplieur=i_acc_in.multiplieur;rank=i_acc_in.rank;actual_rank=0}));
+ 20>>(_shift_ludic::T2_STRUCT{multiplieur=i_acc_in.multiplieur;rank=i_acc_in.rank;actual_rank=0}));
tel
-- end of node shift_ludic::n_shift
-- automatically defined aliases:
@@ -15773,7 +15773,7 @@ var
_v8:_calculs_max::struct_max;
let
strout = ( if _v2 then
- calculs_max::struct_max{max1=strin.max1;max2=strin.max2;imax1=strin.imax1;imax2=strin.imax2;icourant=(strin.icourant
+ _calculs_max::struct_max{max1=strin.max1;max2=strin.max2;imax1=strin.imax1;imax2=strin.imax2;icourant=(strin.icourant
+ 1)} else _v8);
_v1 = strin.max2;
_v2 = (ecourant <= _v1);
@@ -15783,9 +15783,9 @@ let
_v6 = (ecourant <= _v5);
_v7 = (_v4 and _v6);
_v8 = ( if _v7 then
- calculs_max::struct_max{max1=strin.max1;max2=ecourant;imax1=strin.imax1;imax2=strin.icourant;icourant=(strin.icourant
+ _calculs_max::struct_max{max1=strin.max1;max2=ecourant;imax1=strin.imax1;imax2=strin.icourant;icourant=(strin.icourant
+ 1)} else
- calculs_max::struct_max{max1=ecourant;max2=strin.max1;imax1=strin.icourant;imax2=strin.imax1;icourant=(strin.icourant
+ _calculs_max::struct_max{max1=ecourant;max2=strin.max1;imax1=strin.icourant;imax2=strin.imax1;icourant=(strin.icourant
+ 1)});
tel
-- end of node calculs_max::max
@@ -15804,7 +15804,7 @@ var
_v6:bool;
let
s_out =
- calculs_max::struct_fill_bool{imax1=s_in.imax1;imax2=s_in.imax2;icourant=(s_in.icourant
+ _calculs_max::struct_fill_bool{imax1=s_in.imax1;imax2=s_in.imax2;icourant=(s_in.icourant
+ 1)};
elt = (_v3 or _v6);
_v1 = s_in.icourant;
@@ -15821,10 +15821,10 @@ var
tmp:_calculs_max::struct_fill_bool;
let
local_struct = (red<<calculs_max::max,
- 10>>(calculs_max::struct_max{max1=0;max2=0;imax1=(-1);imax2=(-1);icourant=0},
+ 10>>(_calculs_max::struct_max{max1=0;max2=0;imax1=(-1);imax2=(-1);icourant=0},
A));
(tmp, res) = (fill<<calculs_max::fill_bool,
- 10>>(calculs_max::struct_fill_bool{imax1=local_struct.imax1;imax2=local_struct.imax2;icourant=0}));
+ 10>>(_calculs_max::struct_fill_bool{imax1=local_struct.imax1;imax2=local_struct.imax2;icourant=0}));
tel
-- end of node calculs_max::calculs_max
-- automatically defined aliases:
@@ -15860,7 +15860,7 @@ let
_v5 = (pre ackout);
_v6 = (false -> _v5);
_v7 = (not _v6);
- accu_out = deSimone::cell_accu{token=accu_in.token;grant=((not req) and
+ accu_out = _deSimone::cell_accu{token=accu_in.token;grant=((not req) and
accu_in.grant)};
tel
-- end of node deSimone::oneCell
@@ -15887,7 +15887,7 @@ var
accu_out:_deSimone::cell_accu;
let
(accu_out, acknowledge) = (fillred<<deSimone::oneCell,
- 10>>(deSimone::cell_accu{token=new_token;grant=true}, request));
+ 10>>(_deSimone::cell_accu{token=new_token;grant=true}, request));
tel
-- end of node deSimone::deSimone
node deSimone::prop1(request:A_bool_10) returns (ok:bool);
@@ -16128,7 +16128,7 @@ node moyenne::moyenne_step(
returns (
accu_out:_moyenne::moyenne_accu);
let
- accu_out = moyenne::moyenne_accu{sum=(accu_in.sum +
+ accu_out = _moyenne::moyenne_accu{sum=(accu_in.sum +
elt_in);moyenne=((accu_in.sum + elt_in) / (accu_in.rank +
1.0));rank=(accu_in.rank + 1.0)};
tel
@@ -16138,7 +16138,7 @@ var
accu_out:_moyenne::moyenne_accu;
let
accu_out = (red<<moyenne::moyenne_step,
- 10>>(moyenne::moyenne_accu{sum=0.0;moyenne=0.0;rank=0.0}, Tab));
+ 10>>(_moyenne::moyenne_accu{sum=0.0;moyenne=0.0;rank=0.0}, Tab));
moy = accu_out.moyenne;
tel
-- end of node moyenne::moyenne
@@ -16172,7 +16172,7 @@ node normal::int2InfoChgIndiv(
returns (
InfoChgIndiv:_normal::T_InfoChgIndiv);
let
- InfoChgIndiv = normal::T_InfoChgIndiv{mesure_chg=m};
+ InfoChgIndiv = _normal::T_InfoChgIndiv{mesure_chg=m};
tel
-- end of node normal::int2InfoChgIndiv
@@ -16193,7 +16193,7 @@ node normal::int2InfoGenIndiv(
returns (
InfoGenIndiv:_normal::T_InfoGenIndiv);
let
- InfoGenIndiv = normal::T_InfoGenIndiv{mesure_gen=m};
+ InfoGenIndiv = _normal::T_InfoGenIndiv{mesure_gen=m};
tel
-- end of node normal::int2InfoGenIndiv
@@ -16308,7 +16308,7 @@ node normal::extract_info_chg_glob(
returns (
InfoChgGlob:_normal::T_InfoChgGlob);
let
- InfoChgGlob = normal::T_InfoChgGlob{chg2gen=(map<<normal::id,
+ InfoChgGlob = _normal::T_InfoChgGlob{chg2gen=(map<<normal::id,
20>>(EntreeGlob.chg2gen))};
tel
-- end of node normal::extract_info_chg_glob
@@ -16396,7 +16396,7 @@ node normal::extract_info_gen_glob(
returns (
InfoGenGlob:_normal::T_InfoGenGlob);
let
- InfoGenGlob = normal::T_InfoGenGlob{elt_bidon=0;chg2gen=(map<<normal::id,
+ InfoGenGlob = _normal::T_InfoGenGlob{elt_bidon=0;chg2gen=(map<<normal::id,
20>>(EntreeGlob.chg2gen))};
tel
-- end of node normal::extract_info_gen_glob
@@ -16734,7 +16734,7 @@ node testSilus::int2InfoChgIndiv(
returns (
InfoChgIndiv:_testSilus::T_InfoChgIndiv);
let
- InfoChgIndiv = testSilus::T_InfoChgIndiv{mesure_chg=m};
+ InfoChgIndiv = _testSilus::T_InfoChgIndiv{mesure_chg=m};
tel
-- end of node testSilus::int2InfoChgIndiv
@@ -16755,7 +16755,7 @@ node testSilus::int2InfoGenIndiv(
returns (
InfoGenIndiv:_testSilus::T_InfoGenIndiv);
let
- InfoGenIndiv = testSilus::T_InfoGenIndiv{mesure_gen=m};
+ InfoGenIndiv = _testSilus::T_InfoGenIndiv{mesure_gen=m};
tel
-- end of node testSilus::int2InfoGenIndiv
@@ -16841,7 +16841,7 @@ node testSilus::extract_info_chg_glob(
returns (
InfoChgGlob:_testSilus::T_InfoChgGlob);
let
- InfoChgGlob = testSilus::T_InfoChgGlob{chg2gen=(map<<testSilus::id,
+ InfoChgGlob = _testSilus::T_InfoChgGlob{chg2gen=(map<<testSilus::id,
20>>(EntreeGlob.chg2gen))};
tel
-- end of node testSilus::extract_info_chg_glob
@@ -16913,7 +16913,7 @@ returns (
InfoGenGlob:_testSilus::T_InfoGenGlob);
let
InfoGenGlob =
- testSilus::T_InfoGenGlob{elt_bidon=0;chg2gen=(map<<testSilus::id,
+ _testSilus::T_InfoGenGlob{elt_bidon=0;chg2gen=(map<<testSilus::id,
20>>(EntreeGlob.chg2gen))};
tel
-- end of node testSilus::extract_info_gen_glob
@@ -17034,7 +17034,7 @@ node triSel::minFromRank(
returns (
accu_out:_triSel::MinFR_accu);
let
- accu_out = triSel::MinFR_accu{MinVal=( if ((accu_in.Rank = 0) or
+ accu_out = _triSel::MinFR_accu{MinVal=( if ((accu_in.Rank = 0) or
(accu_in.Rank = accu_in.RankFrom)) then TabEltIn else ( if (accu_in.Rank >=
accu_in.RankFrom) then ( if (TabEltIn < accu_in.MinVal) then TabEltIn else
accu_in.MinVal) else accu_in.MinVal));MinRank=( if ((accu_in.Rank = 0) or
@@ -17052,7 +17052,7 @@ returns (
accu_out:_triSel::Select_accu);
let
accu_out =
- triSel::Select_accu{RankToFind=accu_in.RankToFind;CurrentRank=(accu_in.CurrentRank
+ _triSel::Select_accu{RankToFind=accu_in.RankToFind;CurrentRank=(accu_in.CurrentRank
+ 1);Val=( if (accu_in.RankToFind = accu_in.CurrentRank) then elt else
accu_in.Val)};
tel
@@ -17076,7 +17076,7 @@ var
_v9:int;
let
accu_out =
- triSel::Exchange_accu{MinVal=accu_in.MinVal;MinRank=accu_in.MinRank;RankFrom=accu_in.RankFrom;CurrentVal=accu_in.CurrentVal;Rank=(accu_in.Rank
+ _triSel::Exchange_accu{MinVal=accu_in.MinVal;MinRank=accu_in.MinRank;RankFrom=accu_in.RankFrom;CurrentVal=accu_in.CurrentVal;Rank=(accu_in.Rank
+ 1)};
eltOut = ( if _v3 then _v4 else _v9);
_v1 = accu_in.Rank;
@@ -17106,18 +17106,18 @@ var
_v3:A_int_50;
let
accu_out_min = (red<<triSel::minFromRank,
- 50>>(triSel::MinFR_accu{MinVal=0;MinRank=0;RankFrom=accu_in.CurrentRank;Rank=0},
+ 50>>(_triSel::MinFR_accu{MinVal=0;MinRank=0;RankFrom=accu_in.CurrentRank;Rank=0},
_v1));
_v1 = accu_in.Tab;
accu_out_select = (red<<triSel::select,
- 50>>(triSel::Select_accu{RankToFind=accu_in.CurrentRank;CurrentRank=0;Val=0},
+ 50>>(_triSel::Select_accu{RankToFind=accu_in.CurrentRank;CurrentRank=0;Val=0},
_v2));
_v2 = accu_in.Tab;
(accu_out_exchange, localTab) = (fillred<<triSel::Exchange_i_j,
- 50>>(triSel::Exchange_accu{MinVal=accu_out_min.MinVal;MinRank=accu_out_min.MinRank;RankFrom=accu_out_select.RankToFind;CurrentVal=accu_out_select.Val;Rank=0},
+ 50>>(_triSel::Exchange_accu{MinVal=accu_out_min.MinVal;MinRank=accu_out_min.MinRank;RankFrom=accu_out_select.RankToFind;CurrentVal=accu_out_select.Val;Rank=0},
_v3));
_v3 = accu_in.Tab;
- accu_out = triSel::Sort_accu{CurrentRank=(accu_in.CurrentRank +
+ accu_out = _triSel::Sort_accu{CurrentRank=(accu_in.CurrentRank +
1);Tab=localTab};
tel
-- end of node triSel::UnarySort
@@ -17126,7 +17126,7 @@ var
UnarySort_accu_out:_triSel::Sort_accu;
let
UnarySort_accu_out = (red<<triSel::UnarySort,
- 50>>(triSel::Sort_accu{CurrentRank=0;Tab=TIn}, TIn));
+ 50>>(_triSel::Sort_accu{CurrentRank=0;Tab=TIn}, TIn));
TSorted = UnarySort_accu_out.Tab;
tel
-- end of node triSel::triSel
@@ -17138,8 +17138,8 @@ returns (
accu_out:_triSel::sorted_iter_accu);
let
accu_out =
- triSel::sorted_iter_accu{prev_elt=elt;prop_is_tt=((accu_in.prev_elt <= elt)
- and accu_in.prop_is_tt)};
+ _triSel::sorted_iter_accu{prev_elt=elt;prop_is_tt=((accu_in.prev_elt <=
+ elt) and accu_in.prop_is_tt)};
tel
-- end of node triSel::sorted_iter
node triSel::Sorted(TIn:A_int_50) returns (ok:bool);
@@ -17149,7 +17149,7 @@ var
let
TSorted = (triSel::triSel(TIn));
accu_out = (red<<triSel::sorted_iter,
- 50>>(triSel::sorted_iter_accu{prev_elt=0;prop_is_tt=true}, TSorted));
+ 50>>(_triSel::sorted_iter_accu{prev_elt=0;prop_is_tt=true}, TSorted));
ok = accu_out.prop_is_tt;
tel
-- end of node triSel::Sorted
@@ -17202,7 +17202,7 @@ returns (
acc_out:_contractForElementSelectionInArray::iteratedStruct);
let
acc_out =
- contractForElementSelectionInArray::iteratedStruct{currentRank=(acc_in.currentRank
+ _contractForElementSelectionInArray::iteratedStruct{currentRank=(acc_in.currentRank
+ 1);rankToSelect=acc_in.rankToSelect;elementSelected=( if
(acc_in.currentRank = acc_in.rankToSelect) then currentElt else
acc_in.elementSelected)};
@@ -17219,7 +17219,7 @@ var
let
iterationResult =
(red<<contractForElementSelectionInArray::selectOneStage,
- 10>>(contractForElementSelectionInArray::iteratedStruct{currentRank=0;rankToSelect=rankToSelect;elementSelected=0},
+ 10>>(_contractForElementSelectionInArray::iteratedStruct{currentRank=0;rankToSelect=rankToSelect;elementSelected=0},
array));
elementSelected = iterationResult.elementSelected;
tel
@@ -17257,7 +17257,7 @@ returns (
acc_out:_intArray::T_isElementOf_);
let
acc_out =
- intArray::T_isElementOf_{eltToSearch=acc_in.eltToSearch;iselementof=(acc_in
+ _intArray::T_isElementOf_{eltToSearch=acc_in.eltToSearch;iselementof=(acc_in
or (intArray::_isEqualTo_(acc_in.eltToSearch, elt_in)))};
tel
-- end of node intArray::iterated_isElementOf_
@@ -17271,7 +17271,7 @@ var
acc_out:_intArray::T_isElementOf_;
let
acc_out = (red<<intArray::iterated_isElementOf_,
- 10>>(intArray::T_isElementOf_{eltToSearch=e;iselementof=false}, t));
+ 10>>(_intArray::T_isElementOf_{eltToSearch=e;iselementof=false}, t));
iselementof = acc_out.iselementof;
tel
-- end of node intArray::_isElementOf_
@@ -17294,7 +17294,7 @@ returns (
acc_out:_intArray::forSortingAlgo);
let
acc_out =
- intArray::forSortingAlgo{previousElement=elt;sortedUpToHere=((intArray::_isGreaterOrEqualTo_(elt,
+ _intArray::forSortingAlgo{previousElement=elt;sortedUpToHere=((intArray::_isGreaterOrEqualTo_(elt,
acc_in.previousElement)) and acc_in.sortedUpToHere)};
tel
-- end of node intArray::isLocallyLoselySorted
@@ -17307,7 +17307,7 @@ var
result:_intArray::forSortingAlgo;
let
result = (red<<intArray::isLocallyLoselySorted,
- 10>>(intArray::forSortingAlgo{previousElement=array[0];sortedUpToHere=true},
+ 10>>(_intArray::forSortingAlgo{previousElement=array[0];sortedUpToHere=true},
array));
array_isLoselySorted = result.sortedUpToHere;
tel
@@ -17323,7 +17323,7 @@ node intArray::minFromRank(
returns (
accu_out:_intArray::MinFR_accu);
let
- accu_out = intArray::MinFR_accu{MinVal=( if (accu_in.Rank <=
+ accu_out = _intArray::MinFR_accu{MinVal=( if (accu_in.Rank <=
accu_in.RankFrom) then TabEltIn else ( if (accu_in.Rank >=
accu_in.RankFrom) then ( if (TabEltIn < accu_in.MinVal) then TabEltIn else
accu_in.MinVal) else accu_in.MinVal));MinRank=( if (accu_in.Rank >
@@ -17340,7 +17340,7 @@ returns (
accu_out:_intArray::Select_accu);
let
accu_out =
- intArray::Select_accu{RankToFind=accu_in.RankToFind;CurrentRank=(accu_in.CurrentRank
+ _intArray::Select_accu{RankToFind=accu_in.RankToFind;CurrentRank=(accu_in.CurrentRank
+ 1);Val=( if (accu_in.RankToFind = accu_in.CurrentRank) then elt else
accu_in.Val)};
tel
@@ -17364,7 +17364,7 @@ var
_v9:int;
let
accu_out =
- intArray::Exchange_accu{MinVal=accu_in.MinVal;MinRank=accu_in.MinRank;RankFrom=accu_in.RankFrom;CurrentVal=accu_in.CurrentVal;Rank=(accu_in.Rank
+ _intArray::Exchange_accu{MinVal=accu_in.MinVal;MinRank=accu_in.MinRank;RankFrom=accu_in.RankFrom;CurrentVal=accu_in.CurrentVal;Rank=(accu_in.Rank
+ 1)};
eltOut = ( if _v3 then _v4 else _v9);
_v1 = accu_in.Rank;
@@ -17394,18 +17394,18 @@ var
_v3:A_int_10;
let
accu_out_min = (red<<intArray::minFromRank,
- 10>>(intArray::MinFR_accu{MinVal=0;MinRank=accu_in.CurrentRank;RankFrom=accu_in.CurrentRank;Rank=0},
+ 10>>(_intArray::MinFR_accu{MinVal=0;MinRank=accu_in.CurrentRank;RankFrom=accu_in.CurrentRank;Rank=0},
_v1));
_v1 = accu_in.Tab;
accu_out_select = (red<<intArray::select,
- 10>>(intArray::Select_accu{RankToFind=accu_in.CurrentRank;CurrentRank=0;Val=0},
+ 10>>(_intArray::Select_accu{RankToFind=accu_in.CurrentRank;CurrentRank=0;Val=0},
_v2));
_v2 = accu_in.Tab;
(accu_out_exchange, localTab) = (fillred<<intArray::Exchange_i_j,
- 10>>(intArray::Exchange_accu{MinVal=accu_out_min.MinVal;MinRank=accu_out_min.MinRank;RankFrom=accu_out_select.RankToFind;CurrentVal=accu_out_select.Val;Rank=0},
+ 10>>(_intArray::Exchange_accu{MinVal=accu_out_min.MinVal;MinRank=accu_out_min.MinRank;RankFrom=accu_out_select.RankToFind;CurrentVal=accu_out_select.Val;Rank=0},
_v3));
_v3 = accu_in.Tab;
- accu_out = intArray::Sort_accu{CurrentRank=(accu_in.CurrentRank +
+ accu_out = _intArray::Sort_accu{CurrentRank=(accu_in.CurrentRank +
1);Tab=localTab};
tel
-- end of node intArray::UnarySort
@@ -17414,7 +17414,7 @@ var
UnarySort_accu_out:_intArray::Sort_accu;
let
UnarySort_accu_out = (red<<intArray::UnarySort,
- 10>>(intArray::Sort_accu{CurrentRank=0;Tab=array}, array));
+ 10>>(_intArray::Sort_accu{CurrentRank=0;Tab=array}, array));
arraySorted = UnarySort_accu_out.Tab;
tel
-- end of node intArray::sort_
@@ -17446,7 +17446,7 @@ node intArray::selectOneStage(
returns (
acc_out:_intArray::iteratedStruct);
let
- acc_out = intArray::iteratedStruct{currentRank=(acc_in.currentRank +
+ acc_out = _intArray::iteratedStruct{currentRank=(acc_in.currentRank +
1);rankToSelect=acc_in.rankToSelect;elementSelected=( if
(acc_in.currentRank = acc_in.rankToSelect) then currentElt else
acc_in.elementSelected)};
@@ -17462,7 +17462,7 @@ var
iterationResult:_intArray::iteratedStruct;
let
iterationResult = (red<<intArray::selectOneStage,
- 10>>(intArray::iteratedStruct{currentRank=0;rankToSelect=rankToSelect;elementSelected=array[0]},
+ 10>>(_intArray::iteratedStruct{currentRank=0;rankToSelect=rankToSelect;elementSelected=array[0]},
array));
elementSelected = iterationResult.elementSelected;
tel
@@ -17496,7 +17496,7 @@ returns (
acc_out:_intArray::currentRank_withMemorizedRank);
let
acc_out =
- intArray::currentRank_withMemorizedRank{currentRank=(acc_in.currentRank +
+ _intArray::currentRank_withMemorizedRank{currentRank=(acc_in.currentRank +
1);rankOfMemorizedVal=( if (intArray::_isGreaterThan_(e1,
acc_in.memorizedVal)) then acc_in.currentRank else
acc_in.rankOfMemorizedVal);memorizedVal=( if (intArray::_isGreaterThan_(e1,
@@ -17512,7 +17512,7 @@ var
local:_intArray::currentRank_withMemorizedRank;
let
local = (red<<intArray::selectMaxRank,
- 10>>(intArray::currentRank_withMemorizedRank{currentRank=0;rankOfMemorizedVal=0;memorizedVal=array[0]},
+ 10>>(_intArray::currentRank_withMemorizedRank{currentRank=0;rankOfMemorizedVal=0;memorizedVal=array[0]},
array));
rankOfMaximumElement = local.rankOfMemorizedVal;
tel
@@ -17525,7 +17525,7 @@ returns (
acc_out:_intArray::currentRank_withMemorizedRank);
let
acc_out =
- intArray::currentRank_withMemorizedRank{currentRank=(acc_in.currentRank +
+ _intArray::currentRank_withMemorizedRank{currentRank=(acc_in.currentRank +
1);rankOfMemorizedVal=( if (intArray::_isEqualTo_(acc_in.memorizedVal,
elt)) then acc_in.currentRank else
acc_in.rankOfMemorizedVal);memorizedVal=acc_in.memorizedVal};
@@ -17543,7 +17543,7 @@ let
minElement = (intArray::getMinimumIn_(array));
rankOfMinimumElement = _v1.rankOfMemorizedVal;
_v1 = (red<<intArray::selectMinRank,
- 10>>(intArray::currentRank_withMemorizedRank{currentRank=0;rankOfMemorizedVal=0;memorizedVal=minElement},
+ 10>>(_intArray::currentRank_withMemorizedRank{currentRank=0;rankOfMemorizedVal=0;memorizedVal=minElement},
array));
tel
-- end of node intArray::getRank_ofMinimumIn_
@@ -17602,7 +17602,7 @@ node tri::minFromRank(
returns (
accu_out:_tri::MinFR_accu);
let
- accu_out = tri::MinFR_accu{MinVal=( if (accu_in.Rank <= accu_in.RankFrom)
+ accu_out = _tri::MinFR_accu{MinVal=( if (accu_in.Rank <= accu_in.RankFrom)
then TabEltIn else ( if (accu_in.Rank >= accu_in.RankFrom) then ( if
(TabEltIn < accu_in.MinVal) then TabEltIn else accu_in.MinVal) else
accu_in.MinVal));MinRank=( if (accu_in.Rank > accu_in.RankFrom) then ( if
@@ -17618,7 +17618,7 @@ returns (
accu_out:_tri::Select_accu);
let
accu_out =
- tri::Select_accu{RankToFind=accu_in.RankToFind;CurrentRank=(accu_in.CurrentRank
+ _tri::Select_accu{RankToFind=accu_in.RankToFind;CurrentRank=(accu_in.CurrentRank
+ 1);Val=( if (accu_in.RankToFind = accu_in.CurrentRank) then elt else
accu_in.Val)};
tel
@@ -17642,7 +17642,7 @@ var
_v9:int;
let
accu_out =
- tri::Exchange_accu{MinVal=accu_in.MinVal;MinRank=accu_in.MinRank;RankFrom=accu_in.RankFrom;CurrentVal=accu_in.CurrentVal;Rank=(accu_in.Rank
+ _tri::Exchange_accu{MinVal=accu_in.MinVal;MinRank=accu_in.MinRank;RankFrom=accu_in.RankFrom;CurrentVal=accu_in.CurrentVal;Rank=(accu_in.Rank
+ 1)};
eltOut = ( if _v3 then _v4 else _v9);
_v1 = accu_in.Rank;
@@ -17672,18 +17672,18 @@ var
_v3:A_int_10;
let
accu_out_min = (red<<tri::minFromRank,
- 10>>(tri::MinFR_accu{MinVal=0;MinRank=accu_in.CurrentRank;RankFrom=accu_in.CurrentRank;Rank=0},
+ 10>>(_tri::MinFR_accu{MinVal=0;MinRank=accu_in.CurrentRank;RankFrom=accu_in.CurrentRank;Rank=0},
_v1));
_v1 = accu_in.Tab;
accu_out_select = (red<<tri::select,
- 10>>(tri::Select_accu{RankToFind=accu_in.CurrentRank;CurrentRank=0;Val=0},
+ 10>>(_tri::Select_accu{RankToFind=accu_in.CurrentRank;CurrentRank=0;Val=0},
_v2));
_v2 = accu_in.Tab;
(accu_out_exchange, localTab) = (fillred<<tri::Exchange_i_j,
- 10>>(tri::Exchange_accu{MinVal=accu_out_min.MinVal;MinRank=accu_out_min.MinRank;RankFrom=accu_out_select.RankToFind;CurrentVal=accu_out_select.Val;Rank=0},
+ 10>>(_tri::Exchange_accu{MinVal=accu_out_min.MinVal;MinRank=accu_out_min.MinRank;RankFrom=accu_out_select.RankToFind;CurrentVal=accu_out_select.Val;Rank=0},
_v3));
_v3 = accu_in.Tab;
- accu_out = tri::Sort_accu{CurrentRank=(accu_in.CurrentRank +
+ accu_out = _tri::Sort_accu{CurrentRank=(accu_in.CurrentRank +
1);Tab=localTab};
tel
-- end of node tri::UnarySort
@@ -17693,7 +17693,7 @@ var
_v1:A_int_10;
let
UnarySort_accu_out = (red<<tri::UnarySort,
- 10>>(tri::Sort_accu{CurrentRank=0;Tab=([7, 8, 4, 3, 2, 9, 1, 10, 2, 7])},
+ 10>>(_tri::Sort_accu{CurrentRank=0;Tab=([7, 8, 4, 3, 2, 9, 1, 10, 2, 7])},
_v1));
_v1 = ([7, 8, 4, 3, 2, 9, 1, 10, 2, 7]);
TSorted = UnarySort_accu_out.Tab;
@@ -17707,7 +17707,7 @@ returns (
accu_out:_tri::sorted_iter_accu);
let
accu_out =
- tri::sorted_iter_accu{prev_elt=elt;prop_is_tt=((accu_in.prev_elt <= elt)
+ _tri::sorted_iter_accu{prev_elt=elt;prop_is_tt=((accu_in.prev_elt <= elt)
and accu_in.prop_is_tt)};
tel
-- end of node tri::sorted_iter
@@ -17718,7 +17718,7 @@ var
let
TSorted = (tri::main(TIn));
accu_out = (red<<tri::sorted_iter,
- 10>>(tri::sorted_iter_accu{prev_elt=0;prop_is_tt=true}, TSorted));
+ 10>>(_tri::sorted_iter_accu{prev_elt=0;prop_is_tt=true}, TSorted));
res = accu_out.prop_is_tt;
tel
-- end of node tri::Sorted
@@ -17824,7 +17824,7 @@ var
_v5:real;
_v6:real;
let
- out2 = inter::selType{i=0;b=true;r=0.};
+ out2 = _inter::selType{i=0;b=true;r=0.};
out.i = (pint::fby1(_v1, _v2));
_v1 = out2.i;
_v2 = in.i;
@@ -17891,7 +17891,7 @@ var
_v5:real;
_v6:real;
let
- out2 = inter::selType{i=0;b=true;r=0.};
+ out2 = _inter::selType{i=0;b=true;r=0.};
out.i = (pint::fby1(_v1, _v2));
_v1 = out2.i;
_v2 = in.i;
--
GitLab