Changeset 9aa66d0 in OpenModelica

Timestamp:

2022-05-17T14:08:54+02:00 (2 years ago)

Author:

GitHub <noreply@…>

Branches:

maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master

Children:

d1015711

Parents:

b7b3c97

git-author:

perost <perost86@…> (05/17/22 14:08:54)

git-committer:

GitHub <noreply@…> (05/17/22 14:08:54)

Message:

Remove Call.getLastPathName (#8971)

• Remove Call.getLastPathName since it's just a copy of AbsynUtil.pathLastIdent and doesn't really belong in Call.

Location:

OMCompiler/Compiler

Files:

• NBackEnd/Modules/2_Pre/NBEvents.mo (modified) (3 diffs)
• NBackEnd/Util/NBDifferentiate.mo (modified) (1 diff)
• NFFrontEnd/NFCall.mo (modified) (3 diffs)

OMCompiler/Compiler/NBackEnd/Modules/2_Pre/NBEvents.mo

@@ -48 +48 @@
   import Expression = NFExpression;
   import NFFlatten.FunctionTreeImpl;
-  import NFFunction.Function;
   import Operator = NFOperator;
   import Prefixes = NFPrefixes;
@@ -729 +728 @@
       local
         Bucket bucket;
-        Function fn;
 
       // logical binarys: e.g. (a and b)
@@ -745 +743 @@
 
       // sample functions
-      case Expression.CALL(call = Call.TYPED_CALL(fn = fn)) guard(Call.getLastPathName(fn.path) == "sample") algorithm
+      case Expression.CALL() guard(Call.isNamed(exp.call, "sample")) algorithm
         (exp, bucket) := collectEventsCondition(exp, Pointer.access(bucket_ptr), eqn_ptr);
         Pointer.update(bucket_ptr, bucket);

OMCompiler/Compiler/NBackEnd/Util/NBDifferentiate.mo

@@ -903 +903 @@
       // try some simple known cases
       case (Expression.CALL()) algorithm
-        ret := match Call.getLastPathName(Call.functionName(exp.call))
+        ret := match Call.functionNameLast(exp.call)
           case "sample" then Expression.BOOLEAN(false);
           else fail();

OMCompiler/Compiler/NFFrontEnd/NFCall.mo

@@ -589 +589 @@
   end functionName;
 
+  function functionNameLast
+    input Call call;
+    output String ident = AbsynUtil.pathLastIdent(functionName(call));
+  end functionNameLast;
+
+  function functionNameFirst
+    input Call call;
+    output String ident = AbsynUtil.pathFirstIdent(functionName(call));
+  end functionNameFirst;
+
   function isNamed
     input Call call;
@@ -1917 +1927 @@
 
       case Call.UNTYPED_CALL(arguments = args)
-      then (ComponentRef.firstName(call.ref), args);
+        then (ComponentRef.firstName(call.ref), args);
 
       case Call.TYPED_CALL(fn = fn, arguments = args)
-      then (getLastPathName(fn.path), args);
+        then (AbsynUtil.pathLastIdent(fn.path), args);
 
       else algorithm
@@ -1927 +1937 @@
     end match;
   end getNameAndArgs;
-
-  function getLastPathName
-    input Absyn.Path path;
-    output String name;
-  algorithm
-    name := match path
-      case Absyn.IDENT()          then path.name;
-      case Absyn.QUALIFIED()      then getLastPathName(path.path);
-      case Absyn.FULLYQUALIFIED() then getLastPathName(path.path);
-      else algorithm
-        Error.assertion(false, getInstanceName() + " failed.", sourceInfo());
-      then fail();
-    end match;
-  end getLastPathName;
 
 protected