Skip to content

Commit

Permalink
- fixed some Linux stuff
Browse files Browse the repository at this point in the history
- fixed the API to return Modelica compatible syntax
- fixed the API testsuite/mosfiles/loadFileInteractiveQualified.mos
- added stdlib.h include to ExtObj.c
- removed more unnecesarry files within mosfiles/ExtObj.mos


git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@2488 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
adrpo committed Aug 27, 2006
1 parent 5be5cb9 commit 85d7363
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
6 changes: 5 additions & 1 deletion Compiler/Ceval.mo
Expand Up @@ -2774,7 +2774,11 @@ algorithm
omhome = Settings.getInstallationDirectoryPath();
omhome_1 = System.stringReplace(omhome, "\"", "");
pd = System.pathDelimiter();
s_call = Util.stringAppendList({"\"",omhome_1,pd,"bin",pd,"Compile.bat","\""});
/* adrpo - 2006-08-28 ->
* please leave Compile instead of Compile.bat
* here as it has to work on Linux too
*/
s_call = Util.stringAppendList({"\"",omhome_1,pd,"bin",pd,"Compile","\""});
retVal = System.regularFileExists(s_call);
true = retVal != 0;
str=Util.stringAppendList({"command ",s_call," not found. Check OPENMODELICAHOME"});
Expand Down
10 changes: 6 additions & 4 deletions Compiler/Interactive.mo
Expand Up @@ -4734,6 +4734,8 @@ algorithm
s = stringAppend(s, str_eline);
s = stringAppend(s, ",");
s = stringAppend(s, str_ecol);
s = stringAppend("{", s);
s = stringAppend(s, "}");
then
s;
case (_,_) then "Error";
Expand Down Expand Up @@ -4906,14 +4908,14 @@ algorithm
case (visibility_str,(current :: {})) /* deal with the last element */
equation
s1 = getElementInfo(current);
element_str = Util.stringAppendList({"{ elementvisibility=",visibility_str,", ",s1," }"});
element_str = Util.stringAppendList({"{ rec(elementvisibility=",visibility_str,", ",s1,") }"});
res = Util.stringAppendList({element_str,"\n"});
then
res;
case (visibility_str,(current :: rest))
equation
s1 = getElementInfo(current);
element_str = Util.stringAppendList({"{ elementvisibility=",visibility_str,", ",s1," }"});
element_str = Util.stringAppendList({"{ rec(elementvisibility=",visibility_str,", ",s1,") }"});
s2 = constructElementsInfo(visibility_str, rest);
res = Util.stringAppendList({element_str,",\n",s2});
then
Expand Down Expand Up @@ -7596,11 +7598,11 @@ algorithm
str_eline := intString(el);
str_ecol := intString(ec);
res_1 := Util.stringAppendList(
{"{name=\"",name,"\", partial=",strPartial,", final=",
{"{ rec(name=\"",name,"\", partial=",strPartial,", final=",
strFinal,", encapsulated=",strEncapsulated,", restriction=",res,", comment=",
cmt,", file=\"",file,"\", readonly=\"",str_readonly,"\", startLine=",
str_sline,", startColumn=",str_scol,", endLine=",str_eline,", endColumn=",
str_ecol,"}"}) "composing the final returned string" ;
str_ecol,") }"}) "composing the final returned string" ;
end getClassAttributes;

protected function getClassComment "function: getClassComment
Expand Down

0 comments on commit 85d7363

Please sign in to comment.