Changeset 89f929f in OpenModelica

Timestamp:

2012-11-21T13:11:44+01:00 (11 years ago)

Author:

Per Östlund <per.ostlund@…>

Branches:

Added-citation-metadata, maintenance/v1.14, maintenance/v1.15, maintenance/v1.16, maintenance/v1.17, maintenance/v1.18, maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master, omlib-staging

Children:

991b036

Parents:

bcd287c

Message:

• Some code cleanup.

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

File:

• Compiler/FrontEnd/SCodeInst.mo (modified) (2 diffs)

Compiler/FrontEnd/SCodeInst.mo

@@ -2845 +2845 @@
       Element el;
       list<Element> rest_el;
-      list<Element> inputs, outputs, locals, els;
-
-    case ({}, _, _, _) 
-      then (listReverse(inAccumInputs), listReverse(inAccumOutputs), listReverse(inAccumLocals));
-
-    // ignore packages! Modelica.Media.IdealGases.Common.SingleGasNasa.T_h contains package Internal.
-    case ((el as InstTypes.ELEMENT(component = InstTypes.PACKAGE(name = name))) :: rest_el,
-        inputs, outputs, locals)
-      equation
-        (inputs, outputs, locals) = getFunctionParameters2(rest_el, inputs, outputs, locals);
-      then
-        (inputs, outputs, locals);
+      list<Element> inputs, outputs, locals;
 
     case ((el as InstTypes.ELEMENT(component = InstTypes.UNTYPED_COMPONENT(
@@ -2869 +2858 @@
         (inputs, outputs, locals);
 
-    // ignore CONDITIONAL components
-    case ((el as InstTypes.CONDITIONAL_ELEMENT(component = _)) :: rest_el, inputs, outputs, locals)
+    // Ignore any elements which are not untyped components.
+    case (_ :: rest_el, inputs, outputs, locals)
       equation
         (inputs, outputs, locals) = getFunctionParameters2(rest_el, inputs, outputs, locals);
       then
         (inputs, outputs, locals);
+
+    case ({}, _, _, _) 
+      then (listReverse(inAccumInputs), listReverse(inAccumOutputs), listReverse(inAccumLocals));
+
   end match;
 end getFunctionParameters2;