Added a few utility functions:

- crefPrefixOf
- isNone
- isSome


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

Author: Daniel Hedberg

Compiler/Absyn.mo

@@ -2065,23 +2065,51 @@ algorithm outPaths := matchcontinue(path)
 end matchcontinue;
 end pathToStringList;
 
-public function pathPrefixOf "returns true if prefix_path is a prefix of path"
-	input Path prefix_path;
+public function pathPrefixOf
+"
+  funcion: pathPrefixOf
+  Alternative names: isPrefixOf, pathIsPrefixOf, prefixOf 
+  
+  Returns true if prefixPath is a prefix of path, false otherwise.
+"
+	input Path prefixPath;
 	input Path path;
-	output Boolean res;
+	output Boolean out;
 algorithm
-  res := matchcontinue(prefix_path,path)
-  local Path p;
-    case(prefix_path,path)
+  out := matchcontinue(prefixPath, path)
+    case(prefixPath, path) 
       equation
-      true = ModUtil.pathEqual(prefix_path,path);
+        true = ModUtil.pathEqual(prefixPath, path);
       then true;
-    case(prefix_path,path)
-      then pathPrefixOf(prefix_path,stripLast(path));
-    case(_,_) then false;
+    case(prefixPath, path) 
+      then pathPrefixOf(prefixPath, stripLast(path));
+    case(_, _) then false;
   end matchcontinue;
 end pathPrefixOf;
 
+public function crefPrefixOf
+"
+  function: crefPrefixOf
+  Alternative names: crefIsPrefixOf, isPrefixOf, prefixOf
+  Author: DH 2010-03
+
+  Returns true if prefixCr is a prefix of cr, i.e., false otherwise.
+  Subscripts are NOT checked.
+"
+	input ComponentRef prefixCr;
+	input ComponentRef cr;
+	output Boolean out;
+algorithm
+  out := matchcontinue(prefixCr, cr)
+    case(prefixCr, cr) 
+      equation
+        true = crefEqualNoSubs(prefixCr, cr);
+      then true;
+    case(prefixCr, cr)
+      then crefPrefixOf(prefixCr, crefStripLast(cr));
+    case(_, _) then false;
+  end matchcontinue;
+end crefPrefixOf;
 
 public function removePrefix "removes the prefix_path from path, and returns the rest of path"
 	input Path prefix_path;
@@ -2101,6 +2129,38 @@ algorithm
   end matchcontinue;
 end removePrefix;
 
+public function crefRemovePrefix
+"
+  function: crefRemovePrefix
+  Alternative names: removePrefix
+  Author: DH 2010-03
+
+  If prefixCr is a prefix of cr, removes prefixCr from cr and returns the remaining reference,
+  otherwise fails. Subscripts are NOT checked.
+"
+	input ComponentRef prefixCr;
+	input ComponentRef cr;
+	output ComponentRef out;
+algorithm
+  out := matchcontinue(prefixCr, cr)
+    local
+      Ident prefixIdent, ident;
+      ComponentRef prefixRestCr, restCr;
+    case(CREF_QUAL(name = prefixIdent, componentRef = prefixRestCr), CREF_QUAL(name = ident, componentRef = restCr)) 
+      equation
+        equality(prefixIdent = ident);
+      then crefRemovePrefix(prefixRestCr, restCr);
+    case(CREF_IDENT(name = prefixIdent), CREF_QUAL(name = ident, componentRef = restCr)) 
+      equation
+        equality(prefixIdent = ident);
+      then restCr;
+    case(CREF_IDENT(name = prefixIdent), CREF_IDENT(name = ident)) 
+      equation
+        equality(prefixIdent = ident);
+      then CREF_IDENT("", {});
+  end matchcontinue;
+end crefRemovePrefix;
+
 public function pathContains "
 Author BZ,
 checks if one Absyn.IDENT(..) is contained in path.

Compiler/Util.mo

@@ -1,9 +1,9 @@
 /*
  * This file is part of OpenModelica.
  *
- * Copyright (c) 1998-CurrentYear, Linköping University,
+ * Copyright (c) 1998-CurrentYear, Linköping University,
  * Department of Computer and Information Science,
- * SE-58183 Linköping, Sweden.
+ * SE-58183 Linköping, Sweden.
  *
  * All rights reserved.
  *
@@ -14,7 +14,7 @@
  *
  * The OpenModelica software and the Open Source Modelica
  * Consortium (OSMC) Public License (OSMC-PL) are obtained
- * from Linköping University, either from the above address,
+ * from Linköping University, either from the above address,
  * from the URLs: http://www.ida.liu.se/projects/OpenModelica or  
  * http://www.openmodelica.org, and in the OpenModelica distribution. 
  * GNU version 3 is obtained from: http://www.gnu.org/copyleft/gpl.html.
@@ -255,7 +255,24 @@ algorithm isequal := matchcontinue(input1,input2,equalLength)
   end matchcontinue;
 end isListEqual;
 
-public function isListNotEmpty
+public function isListEmpty
+"
+  function: isListEmpty
+  Author: DH 2010-03
+  
+  Returns true if the given list is empty, false otherwise.
+" 
+  input list<Type_a> inList;
+  output Boolean out;
+  replaceable type Type_a subtypeof Any;
+algorithm
+  out := matchcontinue(inList)
+  case({}) then true; 
+  case(_) then false;
+  end matchcontinue;
+end isListEmpty;
+
+public function isListNotEmpty 
   input list<Type_a> input1;
   output Boolean isempty;
   replaceable type Type_a subtypeof Any;
@@ -4986,6 +5003,36 @@ algorithm unOption := matchcontinue (inOption)
   end matchcontinue;
 end genericOption;
 
+public function isNone
+"
+  function: isNone
+  Author: DH, 2010-03
+"
+  input Option<Type_a> inOption;
+  output Boolean out;
+  replaceable type Type_a subtypeof Any;
+algorithm out := matchcontinue (inOption)
+    local Type_a item;
+    case (NONE) then true;
+    case (_) then false;
+  end matchcontinue;
+end isNone;
+
+public function isSome
+"
+  function: isSome
+  Author: DH, 2010-03
+"
+  input Option<Type_a> inOption;
+  output Boolean out;
+  replaceable type Type_a subtypeof Any;
+algorithm out := matchcontinue (inOption)
+    local Type_a item;
+    case (NONE) then false;
+    case (_) then true;
+  end matchcontinue;
+end isSome;
+
 public function makeOptIfNonEmptyList "function: stringOption
   author: BZ
   Construct a Option<Type_a> if the list contains one and only one element. If more, error. On empty=>NONE"