Skip to content
This repository has been archived by the owner on May 18, 2019. It is now read-only.

fix compile warnings #2928

Closed
wants to merge 2 commits into from
Closed

fix compile warnings #2928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2099d6
fix compile warnings
hkiel Feb 11, 2019
a3049c3
update documentation of some functions
hkiel Feb 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
40 changes: 34 additions & 6 deletions Compiler/FrontEnd/MetaModelicaBuiltin.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
*/

function boolAnd
"Logically combine two Booleans with 'and' operator"
input Boolean b1;
input Boolean b2;
output Boolean b;
Expand All @@ -39,6 +40,7 @@ algorithm
end boolAnd;

function boolOr
"Logically combine two Booleans with 'or' operator"
input Boolean b1;
input Boolean b2;
output Boolean b;
Expand All @@ -48,6 +50,7 @@ algorithm
end boolOr;

function boolNot
"Logically invert Boolean value using 'not' operator"
input Boolean b;
output Boolean nb;
algorithm
Expand All @@ -56,6 +59,7 @@ algorithm
end boolNot;

function boolEq
"Compares two Booleans"
input Boolean b1;
input Boolean b2;
output Boolean b;
Expand All @@ -65,6 +69,7 @@ algorithm
end boolEq;

function boolString
"Returns \"true\" or \"false\" string"
input Boolean b;
output String str;
algorithm
Expand All @@ -73,6 +78,7 @@ algorithm
end boolString;

function intAdd
"Adds two Integer values"
input Integer i1;
input Integer i2;
output Integer i;
Expand All @@ -82,6 +88,7 @@ algorithm
end intAdd;

function intSub
"Subtracts two Integer values"
input Integer i1;
input Integer i2;
output Integer i;
Expand All @@ -91,6 +98,7 @@ algorithm
end intSub;

function intMul
"Multiplies two Integer values"
input Integer i1;
input Integer i2;
output Integer i;
Expand All @@ -100,6 +108,7 @@ algorithm
end intMul;

function intDiv
"Divides two Integer values"
input Integer i1;
input Integer i2;
output Integer i;
Expand All @@ -109,6 +118,7 @@ algorithm
end intDiv;

function intMod
"Calculates remainder of Integer division i1/i2"
input Integer i1;
input Integer i2;
output Integer i;
Expand All @@ -118,6 +128,7 @@ algorithm
end intMod;

function intMax
"Returns the bigger one of two Integer values"
input Integer i1;
input Integer i2;
output Integer i;
Expand All @@ -127,6 +138,7 @@ algorithm
end intMax;

function intMin
"Returns the smaller one of two Integer values"
input Integer i1;
input Integer i2;
output Integer i;
Expand All @@ -136,6 +148,7 @@ algorithm
end intMin;

function intAbs
"Returns the absolute value of Integer i"
input Integer i;
output Integer oi;
algorithm
Expand All @@ -144,6 +157,7 @@ algorithm
end intAbs;

function intNeg
"Returns negative value of Integer i"
input Integer i;
output Integer oi;
algorithm
Expand All @@ -152,6 +166,7 @@ algorithm
end intNeg;

function intLt
"Returns whether Integer i1 is smaller than Integer i2"
input Integer i1;
input Integer i2;
output Boolean b;
Expand All @@ -161,6 +176,7 @@ algorithm
end intLt;

function intLe
"Returns whether Integer i1 is smaller than or equal to Integer i2"
input Integer i1;
input Integer i2;
output Boolean b;
Expand All @@ -170,6 +186,7 @@ algorithm
end intLe;

function intEq
"Returns whether Integer i1 is equal to Integer i2"
input Integer i1;
input Integer i2;
output Boolean b;
Expand All @@ -179,6 +196,7 @@ algorithm
end intEq;

function intNe
"Returns whether Integer i1 is not equal to Integer i2"
input Integer i1;
input Integer i2;
output Boolean b;
Expand All @@ -188,6 +206,7 @@ algorithm
end intNe;

function intGe
"Returns whether Integer i1 is greater than or equal to Integer i2"
input Integer i1;
input Integer i2;
output Boolean b;
Expand All @@ -197,6 +216,7 @@ algorithm
end intGe;

function intGt
"Returns whether Integer i1 is greater than Integer i2"
input Integer i1;
input Integer i2;
output Boolean b;
Expand All @@ -206,65 +226,72 @@ algorithm
end intGt;

function intBitNot
"Returns bitwise inverted Integer number of i"
input Integer i;
output Integer o;
external "builtin";
annotation(Documentation(info="<html>
<p>Bit-wise and (like C, ~i).</p>
<p>Bitwise not (like C, ~i).</p>
</html>"));
end intBitNot;

function intBitAnd
"Returns bitwise 'and' of Integers i1 and i2"
input Integer i1;
input Integer i2;
output Integer o;
external "builtin";
annotation(Documentation(info="<html>
<p>Bit-wise and (like C, i1 &amp; i2).</p>
<p>Bitwise and (like C, i1 &amp; i2).</p>
</html>"));
end intBitAnd;

function intBitOr
"Returns bitwise 'or' of Integers i1 and i2"
input Integer i1;
input Integer i2;
output Integer o;
external "builtin";
annotation(Documentation(info="<html>
<p>Bit-wise or (like C, i1 | i2).</p>
<p>Bitwise or (like C, i1 | i2).</p>
</html>"));
end intBitOr;

function intBitXor
"Returns bitwise 'xor' of Integers i1 and i2"
input Integer i1;
input Integer i2;
output Integer o;
external "builtin";
annotation(Documentation(info="<html>
<p>Bit-wise exclusive or (like C, i1 ^ i2).</p>
<p>Bitwise exclusive or (like C, i1 ^ i2).</p>
</html>"));
end intBitXor;

function intBitLShift
"Returns bitwise left shift of Integer i by s bits"
input Integer i;
input Integer s;
output Integer o;
external "builtin";
annotation(Documentation(info="<html>
<p>Bit-wise left shift (like C, i << s).</p>
<p>Bitwise left shift (like C, i << s).</p>
</html>"));
end intBitLShift;

function intBitRShift
"Returns bitwise right shift of Integer i by s bits"
input Integer i;
input Integer s;
output Integer o;
external "builtin";
annotation(Documentation(info="<html>
<p>Bit-wise right shift (like C, i >> s).</p>
<p>Bitwise right shift (like C, i >> s).</p>
</html>"));
end intBitRShift;

function intReal
"Converts Integer to Real"
input Integer i;
output Real r;
algorithm
Expand All @@ -273,6 +300,7 @@ algorithm
end intReal;

function intString
"Converts Integer to String"
input Integer i;
output String s;
external "builtin";
Expand Down
2 changes: 1 addition & 1 deletion Compiler/runtime/systemimpl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1999,7 +1999,7 @@ static modelicaPathEntry* getAllModelicaPaths(const char *name, size_t nlen, voi
/* fprintf(stderr, "found dir match: %ld %s - ok=%d\n", i, ent->d_name, ok); */
}
entlen = strlen(ent->d_name);
if (!ok && ((entlen > 3 && 0==strcmp(ent->d_name+entlen-3,".mo")) || entlen > 4 && 0==strcmp(ent->d_name+entlen-4,".moc")) && regularFileExistsInDirectory(mp,"",ent->d_name)) {
if (!ok && ((entlen > 3 && 0==strcmp(ent->d_name+entlen-3,".mo")) || (entlen > 4 && 0==strcmp(ent->d_name+entlen-4,".moc"))) && regularFileExistsInDirectory(mp,"",ent->d_name)) {
/* fprintf(stderr, "found match file: %ld %s - ok=%d\n", i, ent->d_name, ok); */
res[i].fileIsDir=0;
ok=1;
Expand Down
1 change: 1 addition & 0 deletions SimulationRuntime/c/Makefile.common
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,7 @@ install: bootstrap-dependencies $(LIBSIMULATION) $(LIBFMIRUNTIME) $(ALL_OBJS) fm
test ! `uname` = Darwin || install_name_tool -change libsundials_ida.2.dylib @rpath/libsundials_ida.2.dylib $(builddir_lib)/$(LIBSIMULATION)
test ! `uname` = Darwin || install_name_tool -change libsundials_nvecserial.0.dylib @rpath/libsundials_nvecserial.0.dylib $(builddir_lib)/$(LIBSIMULATION)
test ! `uname` = Darwin || install_name_tool -change libsundials_kinsol.1.dylib @rpath/libsundials_kinsol.1.dylib $(builddir_lib)/$(LIBSIMULATION)
test ! `uname` = Darwin || install_name_tool -change liblis.dylib @rpath/liblis.dylib $(builddir_lib)/$(LIBSIMULATION)
# copy fmi stuff
cp -p $(RUNTIME_HEADERS_FMU) ../fmi/export/fmi1/*.h \
../fmi/export/fmi1/fmu1_model_interface.c $(builddir_inc)/c/fmi1
Expand Down
2 changes: 1 addition & 1 deletion SimulationRuntime/c/simulation/simulation_runtime.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,7 @@ int startNonInteractiveSimulation(int argc, char**argv, DATA* data, threadData_t
if(0 == retVal && omc_flag[FLAG_DATA_RECONCILE])
{
infoStreamPrint(LOG_STDOUT, 0, "DataReconciliation Starting!");
infoStreamPrint(LOG_STDOUT, 0, data->modelData->modelName);
infoStreamPrint(LOG_STDOUT, 0, "%s", data->modelData->modelName);
retVal = dataReconciliation(data, threadData);
infoStreamPrint(LOG_STDOUT, 0, "DataReconciliation Completed!");
}
Expand Down