- changed "inital" with "initial" in Builtin.mo

- replaced return with returnType in Codegen.mo and DAE.mo as "return" is a keyword now!

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

Author: adrpo

Compiler/Builtin.mo

@@ -2538,7 +2538,7 @@ algorithm
       env = Env.extendFrameC(env, booleanType);
       env = Env.extendFrameC(env, stateSelectType);
       env = Env.extendFrameV(env, timeVar, NONE, Env.VAR_UNTYPED(), {});
-      env = Env.extendFrameT(env, "inital", nil2real) "non-functions" ;
+      env = Env.extendFrameT(env, "initial", nil2real) "non-functions" ;
       env = Env.extendFrameT(env, "terminal", nil2real);
       env = Env.extendFrameT(env, "event", bool2bool);
       env = Env.extendFrameT(env, "switch", bool2bool);

Compiler/Codegen.mo

@@ -1011,7 +1011,7 @@ algorithm
         fn_name_str = generateFunctionName(fpath);
         fn_name_str = stringAppend("_", fn_name_str);
         Debug.fprintl("cgtr", {"generating external function ",fn_name_str,"\n"});
-        DAE.EXTERNALDECL(ident = extfnname,external_ = extargs,parameters = extretarg,return = lang,language = ann) = extdecl;
+        DAE.EXTERNALDECL(ident = extfnname,external_ = extargs,parameters = extretarg,returnType = lang,language = ann) = extdecl;
         Debug.fprintln("cgtrdumpdae1", "Dumping DAE:");
         Debug.fcall("cgtrdumpdae1", DAE.dump2, DAE.DAE(orgdae));
         dae = Inst.initVarsModelicaOutput(orgdae);
@@ -2080,15 +2080,15 @@ algorithm
     case ({},rv,tnr,extdecl) then (cEmptyFunction,tnr); 
     case (((var as DAE.VAR(componentRef = cr,varible = vk,variable = vd,input_ = t,one = e,binding = id,dimension = start,value = flow_,flow_ = class_,variableAttributesOption = dae_var_attr,absynCommentOption = comment)) :: r),rv,tnr,extdecl)
       equation 
-        DAE.EXTERNALDECL(return = "C") = extdecl;
+        DAE.EXTERNALDECL(returnType = "C") = extdecl;
         (cfn1,tnr1) = generateAllocOutvar(var, rv, tnr, CONTEXT(FUNCTION(),NORMAL()));
         (cfn2,tnr2) = generateAllocOutvarsExt(r, rv, tnr1, extdecl);
         cfn = cMergeFn(cfn1, cfn2);
       then
         (cfn,tnr2);
     case (((var as DAE.VAR(componentRef = cr,varible = vk,variable = vd,input_ = t,one = e,binding = id,dimension = start,value = flow_,flow_ = class_,variableAttributesOption = dae_var_attr,absynCommentOption = comment)) :: r),rv,tnr,extdecl)
       equation 
-        DAE.EXTERNALDECL(return = "FORTRAN 77") = extdecl;
+        DAE.EXTERNALDECL(returnType = "FORTRAN 77") = extdecl;
         (cfn1,tnr1) = generateAllocOutvarF77(var, rv, tnr);
         (cfn2,tnr2) = generateAllocOutvarsExt(r, rv, tnr1, extdecl);
         cfn = cMergeFn(cfn1, cfn2);
@@ -5064,7 +5064,7 @@ algorithm
       Option<Absyn.Annotation> ann;
       list<tuple<Lib, tuple<Types.TType, Option<Absyn.Path>>>> args;
       tuple<Types.TType, Option<Absyn.Path>> restype;
-    case (fnname,outvars,retstr,invars,(extdecl as DAE.EXTERNALDECL(ident = extfnname,external_ = extargs,parameters = extretarg,return = lang,language = ann)),bivars,(Types.T_FUNCTION(funcArg = args,funcResultType = restype),_)) /* function name output variables return type input variables external declaration bidirectional vars function type */ 
+    case (fnname,outvars,retstr,invars,(extdecl as DAE.EXTERNALDECL(ident = extfnname,external_ = extargs,parameters = extretarg,returnType = lang,language = ann)),bivars,(Types.T_FUNCTION(funcArg = args,funcResultType = restype),_)) /* function name output variables return type input variables external declaration bidirectional vars function type */ 
       equation 
         tnr = 1;
         arg_strs = Util.listMap(args, generateFunctionArg);
@@ -5181,7 +5181,7 @@ algorithm
       DAE.ExternalDecl extdecl;
       DAE.ExtArg retarg;
       Option<Absyn.Annotation> ann;
-    case (vars,(extdecl as DAE.EXTERNALDECL(ident = n,external_ = arglist,parameters = retarg,return = lang,language = ann)),tnr)
+    case (vars,(extdecl as DAE.EXTERNALDECL(ident = n,external_ = arglist,parameters = retarg,returnType = lang,language = ann)),tnr)
       equation 
         Debug.fcall("cgtrdumpdaeextcall", DAE.dump2, DAE.DAE(vars));
         extdeclstr = DAE.dumpExtDeclStr(extdecl);

Compiler/DAE.mo

@@ -318,7 +318,7 @@ uniontype ExternalDecl
     Ident ident;
     list<ExtArg> external_ "external function name" ;
     ExtArg parameters "parameters" ;
-    String return "return type" ;
+    String returnType "return type" ;
     Option<Absyn.Annotation> language "language e.g. Library" ;
   end EXTERNALDECL;
 
@@ -731,7 +731,7 @@ algorithm
       list<ExtArg> extargs;
       ExtArg retty;
       Option<Absyn.Annotation> ann;
-    case EXTERNALDECL(ident = id,external_ = extargs,parameters = retty,return = lang,language = ann)
+    case EXTERNALDECL(ident = id,external_ = extargs,parameters = retty,returnType = lang,language = ann)
       equation 
         extargsstr = Dump.getStringList(extargs, dumpExtArgStr, ",");
         rettystr = dumpExtArgStr(retty);
@@ -3845,7 +3845,7 @@ algorithm
         exps = listAppend(exps1, exps2);
       then
         exps;
-    case EXTFUNCTION(path = path,dAElist = DAE(elementLst = elements),type_ = ty,externalDecl = EXTERNALDECL(ident = fname,external_ = args,parameters = retarg,return = lang,language = ann))
+    case EXTFUNCTION(path = path,dAElist = DAE(elementLst = elements),type_ = ty,externalDecl = EXTERNALDECL(ident = fname,external_ = args,parameters = retarg,returnType = lang,language = ann))
       local tuple<Types.TType, Option<Absyn.Path>> ty;
       equation 
         exps1 = getAllExps(elements);