- Started removing pattern inputs that are never used (OMC dead code):

case (1,_) ... case (2,_) => case 1 ... case 2 - We have a lot of these because of RML forces us to put all inputs of the function as the inputs of a match-expression - This makes more match-expressions simplify into if-expressions - Made all packages encapsulated (and fixed Susan so it outputs encapsulated packages) - This should make dependency analysis on OMC work better git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@7671 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Jan 10, 2011 · a81dd74 · a81dd74
1 parent d8d188b
commit a81dd74
Show file tree

Hide file tree

Showing 102 changed files with 404 additions and 1,787 deletions.
diff --git a/Compiler/BackEnd/BackendDAE.mo b/Compiler/BackEnd/BackendDAE.mo
@@ -29,7 +29,7 @@
  *
  */
 
-package BackendDAE
+encapsulated package BackendDAE
 " file:         BackendDAE.mo
   package:     BackendDAE
   description: BackendDAE contains the datatypes used by the backend.

diff --git a/Compiler/BackEnd/BackendDAECreate.mo b/Compiler/BackEnd/BackendDAECreate.mo
@@ -29,7 +29,7 @@
  *
  */
 
-package BackendDAECreate
+encapsulated package BackendDAECreate
 " file:         BackendDAECreate.mo
   package:     BackendDAECreate
   description:  This file contains all functions for transforming the DAE structure 

diff --git a/Compiler/BackEnd/BackendDAEEXT.mo b/Compiler/BackEnd/BackendDAEEXT.mo
@@ -29,7 +29,7 @@
  *
  */
 
-package BackendDAEEXT
+encapsulated package BackendDAEEXT
 " file:        BackendDAEEXT.mo
   package:     BackendDAEEXT
   description: The BackendDAEEXT module is an externally implemented module (in file 

diff --git a/Compiler/BackEnd/BackendDAEOptimize.mo b/Compiler/BackEnd/BackendDAEOptimize.mo
@@ -29,7 +29,7 @@
  *
  */
 
-package BackendDAEOptimize
+encapsulated package BackendDAEOptimize
 " file:         BackendDAEOptimize.mo
   package:     BackendDAEOptimize
   description: BackendDAEOPtimize contains functions that do some kind of

diff --git a/Compiler/BackEnd/BackendDAETransform.mo b/Compiler/BackEnd/BackendDAETransform.mo
@@ -29,7 +29,7 @@
  *
  */
 
-package BackendDAETransform
+encapsulated package BackendDAETransform
 " file:         BackendDAETransform.mo
   package:     BackendDAETransform
   description: BackendDAETransform contains functions that are needed to perform 

diff --git a/Compiler/BackEnd/BackendDAEUtil.mo b/Compiler/BackEnd/BackendDAEUtil.mo
@@ -29,7 +29,7 @@
  *
  */
 
-package BackendDAEUtil
+encapsulated package BackendDAEUtil
 " file:         BackendDAEUtil.mo
   package:     BackendDAEUtil 
   description: BackendDAEUtil comprised functions for BackendDAE data types.

diff --git a/Compiler/BackEnd/BackendDump.mo b/Compiler/BackEnd/BackendDump.mo
@@ -29,7 +29,7 @@
  *
  */
 
-package BackendDump
+encapsulated package BackendDump
 " file:        BackendDump.mo
   package:     BackendDump
   description: Unparsing the BackendDAE structure

diff --git a/Compiler/BackEnd/BackendEquation.mo b/Compiler/BackEnd/BackendEquation.mo
@@ -29,7 +29,7 @@
  *
  */
 
-package BackendEquation
+encapsulated package BackendEquation
 " file:         BackendEquation.mo
   package:     BackendEquation
   description: BackendEquation contains functions that do something with

diff --git a/Compiler/BackEnd/BackendVarTransform.mo b/Compiler/BackEnd/BackendVarTransform.mo
@@ -29,7 +29,7 @@
  *
  */
 
-package BackendVarTransform
+encapsulated package BackendVarTransform
 " file:         BackendVarTransform.mo
   package:     BackendVarTransform
   description: BackendVarTransform contains a Binary Tree representation of variable replacements.

diff --git a/Compiler/BackEnd/BackendVariable.mo b/Compiler/BackEnd/BackendVariable.mo
@@ -29,7 +29,7 @@
  *
  */
 
-package BackendVariable
+encapsulated package BackendVariable
 " file:         mo
   package:     BackendVariable
   description: BackendVariables contains the function that deals with the datytypes

diff --git a/Compiler/BackEnd/DAEQuery.mo b/Compiler/BackEnd/DAEQuery.mo
@@ -29,7 +29,7 @@
  *
  */
 
-package DAEQuery
+encapsulated package DAEQuery
 " file:         DAEQuery.mo
   package:     DAEQuery
   description: DAEQuery contains functionality for query of Incidence Matrix.

diff --git a/Compiler/BackEnd/Derive.mo b/Compiler/BackEnd/Derive.mo
@@ -29,7 +29,7 @@
  *
  */
 
-package Derive
+encapsulated package Derive
 " file:        Derive.mo
   package:     Derive
   description: Differentiation of equations from BackendDAE.BackendDAE

diff --git a/Compiler/BackEnd/ExpressionSolve.mo b/Compiler/BackEnd/ExpressionSolve.mo
@@ -29,7 +29,7 @@
  *
  */
 
-package ExpressionSolve
+encapsulated package ExpressionSolve
 "
   file:         ExpressionSolve.mo
   package:     ExpressionSolve

diff --git a/Compiler/BackEnd/PartFn.mo b/Compiler/BackEnd/PartFn.mo
@@ -29,7 +29,7 @@
  *
  */
 
-package PartFn
+encapsulated package PartFn
 " file:         PartFn.mo
   package:     PartFn
   description: partially evaluated functions

diff --git a/Compiler/BackEnd/SimCode.mo b/Compiler/BackEnd/SimCode.mo
@@ -29,8 +29,7 @@
  *
  */
 
-
-package SimCode
+encapsulated package SimCode
 " file:         SimCode.mo
   package:     SimCode
   description: Code generation using Susan templates

diff --git a/Compiler/BackEnd/TaskGraph.mo b/Compiler/BackEnd/TaskGraph.mo
@@ -29,7 +29,7 @@
  *
  */
 
-package TaskGraph
+encapsulated package TaskGraph
 " file:         TaskGraph.mo
   package:     TaskGraph
   description: Building of task graphs from expressions, and equation systems.

diff --git a/Compiler/BackEnd/TaskGraphExt.mo b/Compiler/BackEnd/TaskGraphExt.mo
@@ -28,7 +28,7 @@
  * See the full OSMC Public License conditions for more details.
  *
  */
-package TaskGraphExt
+encapsulated package TaskGraphExt
 " file:         TaskGraphExt.mo
   package:     TaskGraphExt
   description: The external representation of a task graph, using Boost Graph Library in C++.

diff --git a/Compiler/BackEnd/XMLDump.mo b/Compiler/BackEnd/XMLDump.mo
@@ -71,7 +71,7 @@ within the equation element.
 */
 
 
-package XMLDump
+encapsulated package XMLDump
 " file:         XMLDump.mo
   package:     XMLDump
   description: Dumping of DAE as XML

diff --git a/Compiler/FrontEnd/Absyn.mo b/Compiler/FrontEnd/Absyn.mo
@@ -29,7 +29,7 @@
  *
  */
 
-package Absyn
+encapsulated package Absyn
 "
   file:        Absyn.mo
   package:     Absyn

diff --git a/Compiler/FrontEnd/AbsynDep.mo b/Compiler/FrontEnd/AbsynDep.mo
@@ -29,7 +29,7 @@
  *
  */
 
-package AbsynDep 
+encapsulated package AbsynDep 
 " 
   file:        AbsynDep.mo
   package:     AbsynDep

diff --git a/Compiler/FrontEnd/Algorithm.mo b/Compiler/FrontEnd/Algorithm.mo
@@ -29,7 +29,7 @@
  *
  */
 
-package Algorithm
+encapsulated package Algorithm
 "
   file:         Algorithm.mo
   package:     Algorithm

diff --git a/Compiler/FrontEnd/Builtin.mo b/Compiler/FrontEnd/Builtin.mo
@@ -29,7 +29,7 @@
  *
  */
 
-package Builtin
+encapsulated package Builtin
 " file:         Builtin.mo
   package:     Builtin
   description: Builting tyepes and variables

diff --git a/Compiler/FrontEnd/Ceval.mo b/Compiler/FrontEnd/Ceval.mo
@@ -29,7 +29,7 @@
  *
  */
 
-package Ceval
+encapsulated package Ceval
 " file:         Ceval.mo
   package:     Ceval
   description: Constant propagation of expressions

diff --git a/Compiler/FrontEnd/CevalFunction.mo b/Compiler/FrontEnd/CevalFunction.mo
@@ -29,7 +29,7 @@
  *
  */
 
-package CevalFunction
+encapsulated package CevalFunction
 " file:         CevalFunction.mo
   package:      CevalFunction
   description:  This module constant evaluates DAE.Function objects, i.e.

diff --git a/Compiler/FrontEnd/ClassInf.mo b/Compiler/FrontEnd/ClassInf.mo
@@ -29,7 +29,7 @@
  *
  */
 
-package ClassInf
+encapsulated package ClassInf
 " file:   ClassInf.mo
   package:      ClassInf
   description: Class restrictions

diff --git a/Compiler/FrontEnd/ClassLoader.mo b/Compiler/FrontEnd/ClassLoader.mo
@@ -29,7 +29,7 @@
  *
  */
 
-package ClassLoader
+encapsulated package ClassLoader
 " file:   ClassLoader.mo
   package:      ClassLoader
   description: Loading of classes from $OPENMODELICALIBRARY.

diff --git a/Compiler/FrontEnd/ComponentReference.mo b/Compiler/FrontEnd/ComponentReference.mo
@@ -29,7 +29,7 @@
  *
  */
 
-package ComponentReference
+encapsulated package ComponentReference
 "
   file:         ComponentReference.mo
   package:     ComponentReference

diff --git a/Compiler/FrontEnd/Connect.mo b/Compiler/FrontEnd/Connect.mo
@@ -29,7 +29,7 @@
  *
  */
 
-package Connect
+encapsulated package Connect
 " file:        Connect.mo
   package:     Connect
   description: Connection set management

diff --git a/Compiler/FrontEnd/ConnectUtil.mo b/Compiler/FrontEnd/ConnectUtil.mo
@@ -29,7 +29,7 @@
  *
  */
 
-package ConnectUtil
+encapsulated package ConnectUtil
 " file:        ConnectUtil.mo
   package:     ConnectUtil
   description: Connection set management

diff --git a/Compiler/FrontEnd/ConnectionGraph.mo b/Compiler/FrontEnd/ConnectionGraph.mo
@@ -29,7 +29,7 @@
  *
  */
 
-package ConnectionGraph
+encapsulated package ConnectionGraph
 " file:        ConnectionGraph.mo
   package:     ConnectionGraph
   description: Constant propagation of expressions

diff --git a/Compiler/FrontEnd/Constants.mo b/Compiler/FrontEnd/Constants.mo
@@ -29,7 +29,7 @@
  *
  */
 
-package Constants
+encapsulated package Constants
 " file:         Constants.mo
   package:     Constants
   description: definition of a set of constants

diff --git a/Compiler/FrontEnd/DAE.mo b/Compiler/FrontEnd/DAE.mo
@@ -29,7 +29,7 @@
  *
  */
 
-package DAE
+encapsulated package DAE
 " file:        DAE.mo
   package:     DAE
   description: DAE management and output

diff --git a/Compiler/FrontEnd/DAEDump.mo b/Compiler/FrontEnd/DAEDump.mo
@@ -29,7 +29,7 @@
  *
  */
 
-package DAEDump
+encapsulated package DAEDump
 " file:        DAEDump.mo
   package:     DAEDump
   description: DAEDump output

diff --git a/Compiler/FrontEnd/DAEUtil.mo b/Compiler/FrontEnd/DAEUtil.mo
@@ -29,7 +29,7 @@
  *
  */
 
-package DAEUtil
+encapsulated package DAEUtil
 " file:        DAEUtil.mo
   package:     DAE
   description: DAE management and output

diff --git a/Compiler/FrontEnd/Dependency.mo b/Compiler/FrontEnd/Dependency.mo
@@ -29,7 +29,7 @@
  *
  */
 
-package Dependency
+encapsulated package Dependency
 " file:        Dependency.mo
   package:     Dependency
   description: This module contains functionality for dependency

diff --git a/Compiler/FrontEnd/Dump.mo b/Compiler/FrontEnd/Dump.mo
@@ -29,7 +29,7 @@
  *
  */
 
-package Dump
+encapsulated package Dump
 "
   file:         Dump.mo
   package:     Dump

diff --git a/Compiler/FrontEnd/DumpGraphviz.mo b/Compiler/FrontEnd/DumpGraphviz.mo
@@ -29,7 +29,7 @@
  *
  */
 
-package DumpGraphviz
+encapsulated package DumpGraphviz
 "
   file:         DumpGraphviz.mo
   package:     DumpGraphviz

diff --git a/Compiler/FrontEnd/Env.mo b/Compiler/FrontEnd/Env.mo
@@ -29,7 +29,7 @@
  *
  */
 
-package Env
+encapsulated package Env
 "
   file:         Env.mo
   package:     Env

diff --git a/Compiler/FrontEnd/ExpandableConnectors.mo b/Compiler/FrontEnd/ExpandableConnectors.mo
@@ -29,7 +29,7 @@
  *
  */
 
-package ExpandableConnectors
+encapsulated package ExpandableConnectors
 " file:         ExpandableConnectors.mo
   package:     ExpandableConnectors
   description: ExpandableConnectors translates Absyn to SCode intermediate form

diff --git a/Compiler/FrontEnd/Expression.mo b/Compiler/FrontEnd/Expression.mo
@@ -29,7 +29,7 @@
  *
  */
 
-package Expression
+encapsulated package Expression
 "
   file:         Expression.mo
   package:     Expression
@@ -6186,5 +6186,19 @@ algorithm
   end matchcontinue;
 end subscriptContain2;
 
+public function hasNoSideEffects
+  "Returns true if the expression is free from side-effects. Use with traverseExp."
+  input tuple<DAE.Exp,Boolean> itpl;
+  output tuple<DAE.Exp,Boolean> otpl;
+algorithm
+  otpl := match itpl
+    local
+      DAE.Exp e;
+    case ((e as DAE.CALL(path=_),_)) then ((e,false));
+    case ((e as DAE.MATCHEXPRESSION(matchType=_),_)) then ((e,false));
+    else itpl;
+  end match;
+end hasNoSideEffects;
+
 end Expression;
 
diff --git a/Compiler/FrontEnd/ExpressionDump.mo b/Compiler/FrontEnd/ExpressionDump.mo
@@ -29,7 +29,7 @@
  *
  */
 
-package ExpressionDump
+encapsulated package ExpressionDump
 "
   file:         ExpressionDump.mo
   package:     ExpressionDump