Changeset 993bd3a in OpenModelica

Timestamp:

2016-02-01T20:24:23+01:00 (8 years ago)

Author:

hkiel <henning.kiel@…>

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:

530076c

Parents:

e2d5aa8

Message:

change some matchcontinue to match

File:

• Compiler/Script/Binding.mo (modified) (14 diffs)

Compiler/Script/Binding.mo

@@ -79 +79 @@
 //output String bindingExpression;
  algorithm
-  isBindingPossible := matchcontinue(client_list)
+  isBindingPossible := match(client_list)
    local
      Client_e ce;
@@ -85 +85 @@
     case {} then true;
     case ce::rest
-      equation
-       // inferBindingClient(ce);
+      //guard inferBindingClient(ce)
         then inferBindingClientList(rest, vmodel, env);
-   end matchcontinue;
+   end match;
 end inferBindingClientList;
 
@@ -149 +148 @@
 output Boolean isM;
   algorithm
- isM := matchcontinue(clients)
+ isM := match(clients)
    local
      String className;
@@ -156 +155 @@
     case {} then {};
     case CLIENT(className, instance)::rest
-      equation
-       className = name;
+      guard
+       stringEq(className, name)
         then true;
     case _::rest
         then specifiesBindingFor(name, rest);
-   end matchcontinue;
+   end match;
 end getProviders; */
 
@@ -232 +231 @@
 output List<Mediator> m;
 algorithm
-  (isClient, m) := matchcontinue(mediators)
+  (isClient, m) := match(mediators)
    local
      String name;
@@ -242 +241 @@
     case {} then (false, {});
     case MEDIATOR(name, mType, template, clients, providers)::rest
+      guard
+        isClientInMediator(ci_name, clients)
       equation
-        true = isClientInMediator(ci_name, clients);
         print("... found client : "+ ci_name +"\n");
         then (true, {MEDIATOR(name, mType, template, clients, providers)});
     case _::rest
         then isClient(ci_name, rest);
-   end matchcontinue;
+   end match;
 end isClient;
 
@@ -257 +257 @@
 algorithm
 
-  isClient := matchcontinue(clients)
+  isClient := match(clients)
    local
       list<Absyn.Class> parents;
@@ -265 +265 @@
     case {} then (false);
     case CLIENT(name, _)::rest
-      equation
-        true = (name == ci_name);
+      guard stringEq(name, ci_name)
         then true;
     case _::rest
         then isClientInMediator(ci_name, rest);
-   end matchcontinue;
+   end match;
 end isClientInMediator;
 
@@ -280 +279 @@
 output Boolean isM;
   algorithm
- isM := matchcontinue(clients)
+ isM := match(clients)
    local
      String className;
@@ -287 +286 @@
     case {} then false;
     case CLIENT(className, instance)::rest
-      equation
-       className = name;
+      guard
+       stringEq(className, name)
         then true;
     case _::rest
         then specifiesBindingFor(name, rest);
-   end matchcontinue;
+   end match;
 end specifiesBindingFor;
 
@@ -409 +408 @@
 output  String val;
   algorithm
-  val := matchcontinue(argNames)
+  val := match(argNames)
    local
     String str, nname;
@@ -416 +415 @@
         then "";
     case Absyn.NAMEDARG(nname, Absyn.STRING(str))::rest
-        equation
-           nname = name;
+        guard
+           stringEq(nname, name)
         then str;
     case _::rest
         then getArg(rest, name);
-   end matchcontinue;
+   end match;
 end getArg;
 
@@ -430 +429 @@
 output Option<SCode.Mod> mods;
   algorithm
-  (result, mods) := matchcontinue(elems)
+  (result, mods) := match(elems)
    local
      list<SCode.Element> rest;
@@ -442 +441 @@
     case el::rest
         then isMediator(rest);
-   end matchcontinue;
+   end match;
 end isMediator;