Added annotation to external decl, needed for Library and Include annotation. Still need to do the implementation though.

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

Author: Peter Aronsson

Compiler/Codegen.rml

@@ -590,7 +590,7 @@ relation generate_function : DAE.Element => CFunction list =
   rule	generate_function_name fpath => fn_name_str &
 	string_append("_",fn_name_str) => fn_name_str &
 	Debug.fprintl ("cgtr", ["generating external function ", fn_name_str, "\n"]) &
-	let  DAE.EXTERNALDECL(extfnname,extargs,extretarg,lang) = extdecl &
+	let  DAE.EXTERNALDECL(extfnname,extargs,extretarg,lang,ann) = extdecl &
 
 	Debug.fprintln ("cgtrdumpdae1", "Dumping DAE:") &
 	Debug.fcall ("cgtrdumpdae1", DAE.dump2, DAE.DAE(orgdae)) &
@@ -1358,7 +1358,7 @@ relation generate_alloc_outvars_ext : (DAE.Element list, string,int, DAE.Externa
   axiom	generate_alloc_outvars_ext([],rv,tnr,extdecl) => (c_empty_function,tnr)
 
 
-  rule	let DAE.EXTERNALDECL(_,_,_,"C") = extdecl &
+  rule	let DAE.EXTERNALDECL(_,_,_,"C",_) = extdecl &
 	generate_alloc_outvar(var,rv,tnr) => (cfn1,tnr1) &
 	generate_alloc_outvars_ext(r,rv,tnr1,extdecl) => (cfn2,tnr2) &
 	c_merge_fn(cfn1,cfn2) => cfn
@@ -1368,7 +1368,7 @@ relation generate_alloc_outvars_ext : (DAE.Element list, string,int, DAE.Externa
 				rv,tnr,extdecl)
 	  => (cfn,tnr2)
 
-  rule	let DAE.EXTERNALDECL(_,_,_,"FORTRAN 77") = extdecl &
+  rule	let DAE.EXTERNALDECL(_,_,_,"FORTRAN 77",_) = extdecl &
 	generate_alloc_outvar_f77(var,rv,tnr) => (cfn1,tnr1) &
 	generate_alloc_outvars_ext(r,rv,tnr1,extdecl) => (cfn2,tnr2) &
 	c_merge_fn(cfn1,cfn2) => cfn
@@ -3436,7 +3436,7 @@ end
 	c_add_cleanups(cfn', ["return out;"]) => cfn
 	------------------------------------------------------
 	generate_external_wrapper_call(fnname,outvars,retstr,invars,
-				       extdecl as DAE.EXTERNALDECL(extfnname,extargs,extretarg,lang),bivars,(Types.T_FUNCTION(args,restype),_)) => cfn
+				       extdecl as DAE.EXTERNALDECL(extfnname,extargs,extretarg,lang,ann),bivars,(Types.T_FUNCTION(args,restype),_)) => cfn
 
   rule	Print.print_buf "#-- generate_external_wrapper_call failed\n"
 	----------------------------------------------------------------
@@ -3542,7 +3542,7 @@ relation generate_ext_call : (DAE.Element list, DAE.ExternalDecl, int) => (CFunc
 	generate_extcall_varcopy (outbiarglist, retarg, lang, tnr') => (argcopies,tnr'') &
 	c_merge_fns([argdecls,fcall,argcopies]) => extcall
 	-------------------------------------------------------------
-	generate_ext_call (vars, extdecl as DAE.EXTERNALDECL(n,arglist,retarg,lang), tnr) => (extcall,tnr'')
+	generate_ext_call (vars, extdecl as DAE.EXTERNALDECL(n,arglist,retarg,lang,ann), tnr) => (extcall,tnr'')
 
   rule	Print.print_buf "#-- generate_ext_call failed\n"
 	------------------------------------------------

Compiler/DAE.rml

@@ -151,7 +151,8 @@ module DAE:
   datatype ExternalDecl = EXTERNALDECL of Ident * (* external function name *)
 					  ExtArg list * (* parameters *)
 					  ExtArg * (* return type *)
-					  string (* language *)
+					  string * (* language *)
+					  Absyn.Annotation option (*e.g. Library *)	
 
 (** A DAElist is a list of Elements. Variables, equations, functions, 
  ** algorithms, etc. are all found in this list.
@@ -384,7 +385,7 @@ relation dump_ext_decl_str : ExternalDecl => string =
 	Util.string_append_list(["EXTERNALDECL(",id,", (",extargsstr,"), ",
 				 rettystr,", \"",lang,"\")"]) => str
 	-----------------------------------------------------------------------
-	dump_ext_decl_str EXTERNALDECL(id,extargs,retty,lang) => str
+	dump_ext_decl_str EXTERNALDECL(id,extargs,retty,lang,ann) => str
 end
 
 (** relation: dump_ext_arg_str
@@ -2660,7 +2661,7 @@ relation get_all_exps_element : Element => Exp.Exp list =
 	Util.list_flatten(expslist) => exps 
 	------------------------------------
 	get_all_exps_element EXTFUNCTION(path, DAE(elements), ty,
-					 EXTERNALDECL(fname, args, retarg, lang)) => exps
+					 EXTERNALDECL(fname, args, retarg, lang,ann)) => exps
 
   axiom	get_all_exps_element ASSERT(exp) => [exp]
 

Compiler/Inst.rml

@@ -3665,7 +3665,8 @@ relation inst_ext_decl: (Env.Env, Ident, SCode.ClassDef, bool (*impl*) ) => DAE.
 	inst_ext_get_fargs (env, extdecl,impl) => fargs &
 	inst_ext_get_rettype (env, extdecl,impl) => rettype &
 	inst_ext_get_lang (extdecl) => lang &
-	let daeextdecl = DAE.EXTERNALDECL(fname,fargs,rettype,lang)
+	inst_ext_get_annotation(extdecl) => ann &
+	let daeextdecl = DAE.EXTERNALDECL(fname,fargs,rettype,lang,ann)
 	-------------------------------------
 	inst_ext_decl (env, n, SCode.PARTS(_,_,_,_,_,SOME(extdecl)),impl) => daeextdecl
 
@@ -3675,7 +3676,8 @@ relation inst_ext_decl: (Env.Env, Ident, SCode.ClassDef, bool (*impl*) ) => DAE.
 	inst_ext_get_fargs (env, extdecl,impl) => fargs &
 	inst_ext_get_rettype (env, extdecl, impl) => rettype &
 	inst_ext_get_lang (extdecl) => lang &
-	let daeextdecl = DAE.EXTERNALDECL(fname,fargs,rettype,lang)
+	inst_ext_get_annotation(orgextdecl) => ann &
+	let daeextdecl = DAE.EXTERNALDECL(fname,fargs,rettype,lang,ann)
 	-------------------------------------
 	inst_ext_decl (env, n, SCode.PARTS(els,_,_,_,_,SOME(orgextdecl)),impl) => daeextdecl
 
@@ -3825,6 +3827,19 @@ relation inst_ext_get_fname : (Absyn.ExternalDecl, Ident) => Ident =
 
 end
 
+(** relation: inst_ext_get_annotation
+ ** author: PA
+ **
+ ** Return the annotation associated with an external function declaration.
+ **)
+
+relation inst_ext_get_annotation: Absyn.ExternalDecl 
+	  => Absyn.Annotation option =
+
+  axiom	inst_ext_get_annotation(Absyn.EXTERNALDECL(_,_,_,_,ann)) => ann
+
+end
+
 
 (** relation: inst_ext_get_lang
  **