Skip to content

Commit

Permalink
- Fixed r5075 (which changed encoding of Swedish letters into ???)
Browse files Browse the repository at this point in the history
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@5080 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
sjoelund committed Mar 4, 2010
1 parent b625b00 commit c9a3785
Show file tree
Hide file tree
Showing 8 changed files with 66 additions and 66 deletions.
16 changes: 8 additions & 8 deletions Compiler/CevalScript.mo
@@ -1,9 +1,9 @@
/*
* This file is part of OpenModelica.
*
* Copyright (c) 1998-2010, Link�pings University,
* Copyright (c) 1998-2010, Linköpings University,
* Department of Computer and Information Science,
* SE-58183 Link�ping, Sweden.
* SE-58183 Linköping, Sweden.
*
* All rights reserved.
*
Expand All @@ -14,7 +14,7 @@
*
* The OpenModelica software and the Open Source Modelica
* Consortium (OSMC) Public License (OSMC-PL) are obtained
* from Link�pings University, either from the above address,
* from Linköpings University, either from the above address,
* from the URL: http://www.ida.liu.se/projects/OpenModelica
* and in the OpenModelica distribution.
*
Expand Down Expand Up @@ -1161,11 +1161,11 @@ algorithm
equation
print("visualize(model)\n");
//H�r ska jag komma in, bygga en vettig argumentlista till readptol...
//Här ska jag komma in, bygga en vettig argumentlista till readptol...
//Jag m�ste f� readptol att skicka alla variabler i .plt-filen, och en id� �r
//att g�ra en egen enkel funktion som i princip �r en grep p� DataSet: i filen..
//Kolla p� senddata:emulateStreamData
//Jag måste få readptol att skicka alla variabler i .plt-filen, och en ide är
//att göra en egen enkel funktion som i princip är en grep DataSet: i filen..
//Kolla senddata:emulateStreamData
//vars = Util.listMap(vars,Exp.CodeVarToCref);
//vars = Util.listMap(vars, Exp.printExpStr) "plot" ;
Expand Down Expand Up @@ -1232,7 +1232,7 @@ algorithm
Boolean legend, logX, logY, points;
Boolean grid;
equation
print("hittader�ttigen\n");
print("hittaderättigen\n");
vars = Util.listMap(vars,Exp.CodeVarToCref);
vars_1 = Util.listMap(vars, Exp.printExpStr) "plot" ;
vars_2 = Util.listUnionElt("time", vars_1);
Expand Down
6 changes: 3 additions & 3 deletions Compiler/DAELow.mo
@@ -1,9 +1,9 @@
/*
* This file is part of OpenModelica.
*
* Copyright (c) 1998-2010, Link�pings University,
* Copyright (c) 1998-2010, Link�pings University,
* Department of Computer and Information Science,
* SE-58183 Link�ping, Sweden.
* SE-58183 Link�ping, Sweden.
*
* All rights reserved.
*
Expand All @@ -14,7 +14,7 @@
*
* The OpenModelica software and the Open Source Modelica
* Consortium (OSMC) Public License (OSMC-PL) are obtained
* from Link�pings University, either from the above address,
* from Link�pings University, either from the above address,
* from the URL: http://www.ida.liu.se/projects/OpenModelica
* and in the OpenModelica distribution.
*
Expand Down
6 changes: 3 additions & 3 deletions Compiler/DAEQuery.mo
@@ -1,9 +1,9 @@
/*
* This file is part of OpenModelica.
*
* Copyright (c) 1998-2010, Link�pings University,
* Copyright (c) 1998-2010, Linköpings University,
* Department of Computer and Information Science,
* SE-58183 Link�ping, Sweden.
* SE-58183 Linköping, Sweden.
*
* All rights reserved.
*
Expand All @@ -14,7 +14,7 @@
*
* The OpenModelica software and the Open Source Modelica
* Consortium (OSMC) Public License (OSMC-PL) are obtained
* from Link�pings University, either from the above address,
* from Linköpings University, either from the above address,
* from the URL: http://www.ida.liu.se/projects/OpenModelica
* and in the OpenModelica distribution.
*
Expand Down
6 changes: 3 additions & 3 deletions Compiler/Inline.mo
@@ -1,9 +1,9 @@
/*
* This file is part of OpenModelica.
*
* Copyright (c) 1998-2010, Link�pings University,
* Copyright (c) 1998-2010, Linköpings University,
* Department of Computer and Information Science,
* SE-58183 Link�ping, Sweden.
* SE-58183 Linköping, Sweden.
*
* All rights reserved.
*
Expand All @@ -14,7 +14,7 @@
*
* The OpenModelica software and the Open Source Modelica
* Consortium (OSMC) Public License (OSMC-PL) are obtained
* from Link�pings University, either from the above address,
* from Linköpings University, either from the above address,
* from the URL: http://www.ida.liu.se/projects/OpenModelica
* and in the OpenModelica distribution.
*
Expand Down
8 changes: 4 additions & 4 deletions Compiler/PartFn.mo
@@ -1,9 +1,9 @@
/*
* This file is part of OpenModelica.
*
* Copyright (c) 1998-2010, Link�pings University,
* Copyright (c) 1998-2010, Linköpings University,
* Department of Computer and Information Science,
* SE-58183 Link�ping, Sweden.
* SE-58183 Linköping, Sweden.
*
* All rights reserved.
*
Expand All @@ -14,7 +14,7 @@
*
* The OpenModelica software and the Open Source Modelica
* Consortium (OSMC) Public License (OSMC-PL) are obtained
* from Link�pings University, either from the above address,
* from Linköpings University, either from the above address,
* from the URL: http://www.ida.liu.se/projects/OpenModelica
* and in the OpenModelica distribution.
*
Expand Down Expand Up @@ -1812,4 +1812,4 @@ end getPartEvalFunction;



end PartFn;
end PartFn;
6 changes: 3 additions & 3 deletions Compiler/SimCodegen.mo
@@ -1,9 +1,9 @@
/*
* This file is part of OpenModelica.
*
* Copyright (c) 1998-2010, Link�pings University,
* Copyright (c) 1998-2010, Linköpings University,
* Department of Computer and Information Science,
* SE-58183 Link�ping, Sweden.
* SE-58183 Linköping, Sweden.
*
* All rights reserved.
*
Expand All @@ -14,7 +14,7 @@
*
* The OpenModelica software and the Open Source Modelica
* Consortium (OSMC) Public License (OSMC-PL) are obtained
* from Link�pings University, either from the above address,
* from Linköpings University, either from the above address,
* from the URL: http://www.ida.liu.se/projects/OpenModelica
* and in the OpenModelica distribution.
*
Expand Down
6 changes: 3 additions & 3 deletions Compiler/VarTransform.mo
@@ -1,9 +1,9 @@
/*
* This file is part of OpenModelica.
*
* Copyright (c) 1998-2010, Link�pings University,
* Copyright (c) 1998-2010, Linköpings University,
* Department of Computer and Information Science,
* SE-58183 Link�ping, Sweden.
* SE-58183 Linköping, Sweden.
*
* All rights reserved.
*
Expand All @@ -14,7 +14,7 @@
*
* The OpenModelica software and the Open Source Modelica
* Consortium (OSMC) Public License (OSMC-PL) are obtained
* from Link�pings University, either from the above address,
* from Linköpings University, either from the above address,
* from the URL: http://www.ida.liu.se/projects/OpenModelica
* and in the OpenModelica distribution.
*
Expand Down
78 changes: 39 additions & 39 deletions Compiler/XMLDump.mo
@@ -1,9 +1,9 @@
/*
* This file is a part of OpenModelica.
*
* Copyright (c) 1998-2010, Link�pings University,
* Copyright (c) 1998-2010, Linköpings University,
* Department of Computer and Information Science,
* SE-58183 Link�ping, Sweden.
* SE-58183 Linköping, Sweden.
*
* This program is distributed WITHOUT ANY WARRANTY; without
* even the implied warranty of MERCHANTABILITY or FITNESS
Expand All @@ -20,7 +20,7 @@
*
* The OpenModelica software and the Open Source Modelica
* Consortium (OSMC) Public License (OSMC-PL) are obtained
* from Link�pings University, either from the above address,
* from Linköpings University, either from the above address,
* from the URL: http://www.ida.liu.se/projects/OpenModelica
* and in the OpenModelica distribution.
*
Expand Down Expand Up @@ -75,7 +75,7 @@ within the equation element.


package XMLDump
" file: XMLDump.mo
" file: XMLDump.mo
package: XMLDump
description: Dumping of DAE as XML

Expand All @@ -101,9 +101,9 @@ protected import Util;

protected constant String HEADER = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
protected constant String DAE_OPEN = "dae xmlns:p1=\"http://www.w3.org/1998/Math/MathML\"
xmlns:xlink=\"http://www.w3.org/1999/xlink\"
xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"
xsi:noNamespaceSchemaLocation=\"http://home.dei.polimi.it/donida/Projects/AutoEdit/Images/DAE.xsd\"";
xmlns:xlink=\"http://www.w3.org/1999/xlink\"
xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"
xsi:noNamespaceSchemaLocation=\"http://home.dei.polimi.it/donida/Projects/AutoEdit/Images/DAE.xsd\"";
protected constant String DAE_CLOSE = "dae";

protected constant String LABEL = "label";
Expand Down Expand Up @@ -1102,7 +1102,7 @@ algorithm
dumpAlgorithms(arrayList(algs));
dumpFunctions(inFunctionNames,inFunctions);
dumpSolvingInfo(addOrInMatrix,addSolInfo,inDAELow);
dumpStrCloseTag(DAE_CLOSE);
dumpStrCloseTag(DAE_CLOSE);
then ();
end matchcontinue;
end dumpDAELow;
Expand Down Expand Up @@ -2004,8 +2004,8 @@ algorithm
case (names,funcelems)
equation
dumpStrOpenTag(FUNCTIONS);
dumpFunctions2(inFunctionNames,funcelems);
dumpStrCloseTag(FUNCTIONS);
dumpFunctions2(inFunctionNames,funcelems);
dumpStrCloseTag(FUNCTIONS);
then();
end matchcontinue;
end dumpFunctions;
Expand Down Expand Up @@ -2612,26 +2612,26 @@ input, that defines the element's name, the
element is something like:
<Content=StateSelection/>,
"
input Option<DAE.StateSelect> ss;
input String Content;
input Option<DAE.StateSelect> ss;
input String Content;
algorithm
_ :=
matchcontinue (ss,Content)
case (NONE(),_)
equation
Print.printBuf("");
then ();
case (SOME(DAE.NEVER()),_)
equation dumpStrTagContent(Content, STATE_SELECT_NEVER); then ();
case (SOME(DAE.AVOID()),_)
equation dumpStrTagContent(Content, STATE_SELECT_AVOID); then ();
case (SOME(DAE.DEFAULT()),_)
equation dumpStrTagContent(Content, STATE_SELECT_DEFAULT); then ();
case (SOME(DAE.PREFER()),_)
equation dumpStrTagContent(Content, STATE_SELECT_PREFER); then ();
case (SOME(DAE.ALWAYS()),_)
equation dumpStrTagContent(Content, STATE_SELECT_ALWAYS); then ();
end matchcontinue;
_ :=
matchcontinue (ss,Content)
case (NONE(),_)
equation
Print.printBuf("");
then ();
case (SOME(DAE.NEVER()),_)
equation dumpStrTagContent(Content, STATE_SELECT_NEVER); then ();
case (SOME(DAE.AVOID()),_)
equation dumpStrTagContent(Content, STATE_SELECT_AVOID); then ();
case (SOME(DAE.DEFAULT()),_)
equation dumpStrTagContent(Content, STATE_SELECT_DEFAULT); then ();
case (SOME(DAE.PREFER()),_)
equation dumpStrTagContent(Content, STATE_SELECT_PREFER); then ();
case (SOME(DAE.ALWAYS()),_)
equation dumpStrTagContent(Content, STATE_SELECT_ALWAYS); then ();
end matchcontinue;
end dumpOptionDAEStateSelect;


Expand Down Expand Up @@ -2760,7 +2760,7 @@ algorithm
dumpStrCloseTag(SOLVING_INFO);
dumpStrCloseTag(ADDITIONAL_INFO);
then ();
end matchcontinue;
end matchcontinue;
end dumpSolvingInfo;


Expand All @@ -2783,7 +2783,7 @@ algorithm
equation
Print.printBuf("\n</");Print.printBuf(inString);Print.printBuf(">");
then ();
end matchcontinue;
end matchcontinue;
end dumpStrCloseTag;


Expand All @@ -2806,11 +2806,11 @@ algorithm
case (s,names)
equation
dumpStrOpenTag(FUNCTIONS);
dumpFunctionNames(inFunctionNames);
dumpFunctionNames(inFunctionNames);
dumpStrTagContent(C_IMPLEMENTATIONS, inFunctions);
dumpStrCloseTag(FUNCTIONS);
then();
end matchcontinue;
dumpStrCloseTag(FUNCTIONS);
then();
end matchcontinue;
end dumpStrFunctions;


Expand Down Expand Up @@ -2981,7 +2981,7 @@ algorithm
equation
Print.printBuf("\n<");Print.printBuf(inString);Print.printBuf(">");
then ();
end matchcontinue;
end matchcontinue;
end dumpStrOpenTag;


Expand Down Expand Up @@ -3010,7 +3010,7 @@ algorithm
equation
Print.printBuf("\n<");Print.printBuf(inString);Print.printBuf(" ");Print.printBuf(Attribute);Print.printBuf("=\"");Print.printBuf(inAttributeContent);Print.printBuf("\">");
then();
end matchcontinue;
end matchcontinue;
end dumpStrOpenTagAttr;


Expand Down Expand Up @@ -3039,7 +3039,7 @@ algorithm
equation
Print.printBuf("\n<");Print.printBuf(inString);Print.printBuf(" ");Print.printBuf(Attribute);Print.printBuf("=\"");Print.printBuf(inAttributeContent);Print.printBuf("\" />");
then();
end matchcontinue;
end matchcontinue;
end dumpStrTagAttrNoChild;


Expand All @@ -3065,7 +3065,7 @@ algorithm
Print.printBuf("\n");Print.printBuf(inTagContent);
dumpStrCloseTag(inTagString);
then ();
end matchcontinue;
end matchcontinue;
end dumpStrTagContent;


Expand Down

0 comments on commit c9a3785

Please sign in to comment.