- Fix testsuite

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@12582 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Compiler/BackEnd/SimCode.mo

@@ -1291,14 +1291,14 @@ public function translateFunctions
   input Option<DAE.Function> optMainFunction;
   input list<DAE.Function> idaeElements;
   input list<DAE.Type> metarecordTypes;
-  input list<String> includes;
+  input list<String> inIncludes;
 algorithm
-  _ := match (name, optMainFunction, idaeElements, metarecordTypes, includes)
+  _ := match (name, optMainFunction, idaeElements, metarecordTypes, inIncludes)
     local
       DAE.Function daeMainFunction;
       Function mainFunction;
       list<Function> fns;
-      list<String> libs, includeDirs;
+      list<String> includes, libs, includeDirs;
       MakefileParams makefileParams;
       FunctionCode fnCode;
       list<RecordDeclaration> extraRecordDecls;

Compiler/FrontEnd/InstExtends.mo

@@ -515,7 +515,7 @@ public function instDerivedClasses
   input Prefix.Prefix inPrefix;
   input SCode.Element inClass;
   input Boolean inBoolean;
-  input Absyn.Info info "File information of the extends element";
+  input Absyn.Info inInfo "File information of the extends element";
   output Env.Cache outCache;
   output Env.Env outEnv1;
   output InstanceHierarchy outIH;
@@ -526,7 +526,7 @@ public function instDerivedClasses
   output list<SCode.AlgorithmSection> outSCodeAlgorithmLst6;
 algorithm
   (outCache,outEnv1,outIH,outSCodeElementLst2,outSCodeEquationLst3,outSCodeEquationLst4,outSCodeAlgorithmLst5,outSCodeAlgorithmLst6):=
-  matchcontinue (inCache,inEnv,inIH,inMod,inPrefix,inClass,inBoolean,info)
+  matchcontinue (inCache,inEnv,inIH,inMod,inPrefix,inClass,inBoolean,inInfo)
     local
       list<SCode.Element> elt;
       list<Env.Frame> env,cenv;
@@ -544,6 +544,7 @@ algorithm
       String n,name;
       Option<SCode.ExternalDecl> extdecl;
       Prefix.Prefix pre;
+      Absyn.Info info;
 
     case (cache,env,ih,mod,pre,SCode.CLASS(name = name, classDef =
           SCode.PARTS(elementLst = elt,

Compiler/FrontEnd/ModelicaBuiltin.mo

@@ -1,9 +1,9 @@
 /*
  * This file is part of OpenModelica.
  *
- * Copyright (c) 1998-CurrentYear, Link�ping University,
+ * Copyright (c) 1998-CurrentYear, Linköping University,
  * Department of Computer and Information Science,
- * SE-58183 Link�ping, Sweden.
+ * SE-58183 Linköping, Sweden.
  *
  * All rights reserved.
  *
@@ -14,7 +14,7 @@
  *
  * The OpenModelica software and the Open Source Modelica
  * Consortium (OSMC) Public License (OSMC-PL) are obtained
- * from Link�ping University, either from the above address,
+ * from Linköping University, either from the above address,
  * from the URLs: http://www.ida.liu.se/projects/OpenModelica or  
  * http://www.openmodelica.org, and in the OpenModelica distribution. 
  * GNU version 3 is obtained from: http://www.gnu.org/copyleft/gpl.html.
@@ -2693,7 +2693,7 @@ Same as previously.
 <h4>OpenModelica Development Environment (OMDev)</h4> 
 Several enhancements. Support for match-expressions in addition to matchcontinue. Support for real if-then-else. Support for if-then without else-branches. Modelica Development Tooling 0.7.7 with small improvements such as more settings, improved error detection in console, etc.
 <h4>New Graphic Editor OMEdit</h4>
-A new improved open source graphic model connection editor called OMEdit, supporting 3.1 graphical annotations, which makes it possible to move models back and forth to other tools without problems. The editor has been implemented by students at Link�ping University and is based on the C++ Qt library.
+A new improved open source graphic model connection editor called OMEdit, supporting 3.1 graphical annotations, which makes it possible to move models back and forth to other tools without problems. The editor has been implemented by students at Linköping University and is based on the C++ Qt library.
 </html>"));
 end '1.6.0';
 package '1.7.0' "Version 1.7.0 (r8711, 2011-04-20)"