- Some cleanup of SCode.

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@20170 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Apr 16, 2014 · 63b588b · 63b588b
1 parent 876732a
commit 63b588b
Show file tree

Hide file tree

Showing 4 changed files with 243 additions and 301 deletions.
diff --git a/Compiler/BackEnd/BackendVariable.mo b/Compiler/BackEnd/BackendVariable.mo
@@ -1718,7 +1718,7 @@ algorithm
       SCode.Annotation anno;
     // Parameter with evaluate=true
     case BackendDAE.VAR(comment=SOME(SCode.COMMENT(annotation_=SOME(anno))))
-      then SCode.hasBooleanNamedAnnotation({anno},"Evaluate");
+      then SCode.hasBooleanNamedAnnotation(anno,"Evaluate");
     else then false;
   end match;
 end hasVarEvaluateAnnotation;

diff --git a/Compiler/FrontEnd/DAEUtil.mo b/Compiler/FrontEnd/DAEUtil.mo
@@ -3158,7 +3158,7 @@ algorithm
     case ((ht,_),DAE.VAR(componentRef = cr,kind=DAE.PARAM(),binding=SOME(e),absynCommentOption=SOME(comment)),pv)
       equation
         SCode.COMMENT(annotation_=SOME(anno)) = comment;
-        true = SCode.hasBooleanNamedAnnotation({anno},"Evaluate");
+        true = SCode.hasBooleanNamedAnnotation(anno,"Evaluate");
         e1 = evaluateParameter(e,pv);
         ht1 = BaseHashTable.add((cr,e1),ht);
       then

diff --git a/Compiler/FrontEnd/Inline.mo b/Compiler/FrontEnd/Inline.mo
@@ -1556,7 +1556,7 @@ algorithm
       list<SCode.Annotation> annos;
     case (SOME(SCode.COMMENT(annotation_=SOME(anno))))
       then
-        SCode.hasBooleanNamedAnnotation({anno},"GenerateEvents");
+        SCode.hasBooleanNamedAnnotation(anno,"GenerateEvents");
     else then false;
   end match;
 end hasGenerateEventsAnnotation;