Changeset 13967

Timestamp:

2012-11-19T17:01:04+01:00 (11 years ago)

Author:

perost

Message:

• Removed some dead code from SCodeDependency.
• Updated fluid tests.

Location:

trunk

Files:

• Compiler/FrontEnd/SCodeDependency.mo (modified) (1 diff)
• testsuite/flattening/libraries/msl31/fluid/Modelica.Fluid.Examples.AST_BatchPlant.BaseClasses.TankWithTopPorts.mos (modified) (1 diff)
• testsuite/flattening/libraries/msl31/fluid/Modelica.Fluid.Fittings.MultiPort.mos (modified) (3 diffs)

trunk/Compiler/FrontEnd/SCodeDependency.mo

@@ -888 +888 @@
 end markAsUsedOnRestriction2;
 
-protected function checkNotExtendsDependent
-  "Wrapper function for checkNotExtendsDependent2 which adds the error message
-  count to the function arguments."
-  input Absyn.Path inBaseClass;
-  input Env inEnv;
-  input Absyn.Info inInfo;
-  output Boolean outResult;
-algorithm
-  outResult := checkNotExtendsDependent2(inBaseClass, inEnv, inInfo,
-    Error.getNumErrorMessages());
-end checkNotExtendsDependent;
-
-protected function checkNotExtendsDependent2
-  "The Modelica specification 3.2 says (section 5.6.1): 'The lookup of the names
-  of extended classes should give the same result before and after flattening
-  the extends. One should not find any element used during this flattening by
-  lookup through the extends-clauses.' This means that it's not allowed to have
-  a name in an extends-clause that's inherited from another extends-clause. This
-  function checks this, and returns true if an extends doesn't depend on an
-  extend in the local scope."
-  input Absyn.Path inBaseClass;
-  input Env inEnv;
-  input Absyn.Info inInfo;
-  input Integer inErrorCount;
-  output Boolean outResult;
-algorithm
-  outResult := matchcontinue(inBaseClass, inEnv, inInfo, inErrorCount)
-    local
-      Absyn.Path bc;
-      Absyn.Ident id;
-      String bc_name;
-
-    case (_, _, _, _)
-      equation
-        id = Absyn.pathFirstIdent(inBaseClass);
-        bc :: _ = SCodeLookup.lookupBaseClasses(id, inEnv);
-        bc_name = Absyn.pathString(bc);
-        Error.addSourceMessage(Error.EXTENDS_INHERITED_FROM_LOCAL_EXTENDS,
-          {bc_name, id}, inInfo);
-      then
-        false;
-
-    else
-      equation
-        true = intEq(inErrorCount, Error.getNumErrorMessages());
-      then
-        true;
-
-  end matchcontinue;
-end checkNotExtendsDependent2;
-
 protected function analyseExtends
   "Analyses an extends-clause."

trunk/testsuite/flattening/libraries/msl31/fluid/Modelica.Fluid.Examples.AST_BatchPlant.BaseClasses.TankWithTopPorts.mos

@@ -75 +75 @@
 //   Continuing flattening by only considering the 'outer' component declaration.
 // 
-// Class Modelica.Fluid.Examples.AST_BatchPlant.BaseClasses.TankWithTopPorts has 22 equation(s) and 23 variable(s).
-// 13 of these are trivial equation(s).
+// Class Modelica.Fluid.Examples.AST_BatchPlant.BaseClasses.TankWithTopPorts has 20 equation(s) and 23 variable(s).
+// 11 of these are trivial equation(s).
 // "
 // ""

trunk/testsuite/flattening/libraries/msl31/fluid/Modelica.Fluid.Fittings.MultiPort.mos

@@ -18 +18 @@
 //   output Real y;
 // algorithm
-//   y := max(x, 1e-10);
+//   y := max(x, 0.0000000001);
 // end Modelica.Fluid.Fittings.MultiPort.positiveMax;
 // 
@@ -44 +44 @@
 //   port_a.h_outflow = 1.0;
 //   port_a.m_flow = 0.0;
-//   ports_b[0].m_flow = 0.0;
 // end Modelica.Fluid.Fittings.MultiPort;
 // "
@@ -51 +50 @@
 // 
 // 
-// Class Modelica.Fluid.Fittings.MultiPort has 4 equation(s) and 3 variable(s).
-// 4 of these are trivial equation(s).
+// Class Modelica.Fluid.Fittings.MultiPort has 3 equation(s) and 3 variable(s).
+// 3 of these are trivial equation(s).
 // "
 // ""