SCodeFlatten fails to rename imports

[Martin Sjölund]

SCodeFlatten fails to rename imports that are part of a path

package N
  import N.X.x;
  package X
    Real x = 1.0;
  end X;
end N;

model M
  import N.X.x;
  Real r1 = N.x;
  Real r2 = x;
end M;

[Per Östlund]

Renamed component r to x so that the model is valid.

[Per Östlund]

This model actually seems to work as intended. It only looked like it was failing because of using r instead of x at first, and bad error reporting for missing imports (see #1977). You'll have to submit a better model :)

[Martin Sjölund]

These are lots of fun:

package N
  import Modelica.Media.Water.ConstantPropertyLiquidWater.simpleWaterConstants;
end N;

model M
  import Modelica.Media.Water.ConstantPropertyLiquidWater.simpleWaterConstants;
  // Modelica.Media.Water.ConstantPropertyLiquidWater.FluidConstants[1] r1 = N.simpleWaterConstants;
  // Modelica.Media.Water.ConstantPropertyLiquidWater.FluidConstants[1] r2 = simpleWaterConstants;
  Modelica.Media.Water.ConstantPropertyLiquidWater.FluidConstants[1] r3 = Modelica.Media.Water.ConstantPropertyLiquidWater.simpleWaterConstants;
end M;

[Per Östlund]

saveTotalSCode on M with the latest MSL 3.2.1 and a clean trunk gives:

model M 
  Modelica.Media.Water.ConstantPropertyLiquidWater.FluidConstants[1] r1 = .Modelica.Media.Water.ConstantPropertyLiquidWater.simpleWaterConstants;
  Modelica.Media.Water.ConstantPropertyLiquidWater.FluidConstants[1] r2 = .Modelica.Media.Water.ConstantPropertyLiquidWater.simpleWaterConstants;
  Modelica.Media.Water.ConstantPropertyLiquidWater.FluidConstants[1] r3 = Modelica.Media.Water.ConstantPropertyLiquidWater.simpleWaterConstants;
end M;

Seems correct to me, and the model instantiates fine it seems.

[Martin Sjölund]

With saveTotalSCode I get:

model M 
  Modelica.Media.Water.ConstantPropertyLiquidWater.FluidConstants[1] r1 = N.simpleWaterConstants;
  Modelica.Media.Water.ConstantPropertyLiquidWater.FluidConstants[1] r2 = simpleWaterConstants;
  Modelica.Media.Water.ConstantPropertyLiquidWater.FluidConstants[1] r3 = Modelica.Media.Water.ConstantPropertyLiquidWater.simpleWaterConstants;
end M;

I guess I will try make clean.

[Martin Sjölund]

Nope. Make clean still gives me the same output (which is different from yours).

[Adrian Pop]

I get the same output as Per for

adrpo@testone:~/om/build/bin$ cat m.mos
loadModel(Modelica); getErrorString();
loadFile("m.mo"); getErrorString();
saveTotalSCode("m-total.mo", M); getErrorString();
readFile("m-total.mo"); getErrorString();

File m.mo

adrpo@testone:~/om/build/bin$ cat m.mo
package N
  import Modelica.Media.Water.ConstantPropertyLiquidWater.simpleWaterConstants;
end N;

model M
  import Modelica.Media.Water.ConstantPropertyLiquidWater.simpleWaterConstants;
  Modelica.Media.Water.ConstantPropertyLiquidWater.FluidConstants[1] r1 = N.simpleWaterConstants;
  Modelica.Media.Water.ConstantPropertyLiquidWater.FluidConstants[1] r2 = simpleWaterConstants;
  Modelica.Media.Water.ConstantPropertyLiquidWater.FluidConstants[1] r3 = Modelica.Media.Water.ConstantPropertyLiquidWater.simpleWaterConstants;
end M;

result:

adrpo@testone:~/om/build/bin$ ./omc m.mos | grep -5 "model M"
package N end N;
model M
  Modelica.Media.Water.ConstantPropertyLiquidWater.FluidConstants[1] r1 = .Modelica.Media.Water.ConstantPropertyLiquidWater.simpleWaterConstants;
  Modelica.Media.Water.ConstantPropertyLiquidWater.FluidConstants[1] r2 = .Modelica.Media.Water.ConstantPropertyLiquidWater.simpleWaterConstants;
  Modelica.Media.Water.ConstantPropertyLiquidWater.FluidConstants[1] r3 = Modelica.Media.Water.ConstantPropertyLiquidWater.simpleWaterConstants;
end M;

[Martin Sjölund]

Ok. rm -rf Compiler works, make clean did not. Go figure, it works in trunk so I'll just close this.