Work on match

core/com.ibm.wala.cast.python.test/data/match1.py

@@ -26,20 +26,25 @@ def sunday():
     print("Sunday")
 
 
-day = 4
-
-match day:
-    case 1:
-        monday()
-    case 2:
-        tuesday()
-    case 3:
-        wednesday()
-    case 4:
-        thursday()
-    case 5:
-        friday()
-    case 6:
-        saturday()
-    case 7:
-        sunday()
+def otherDay():
+    print("other day??")
+
+
+for day in [1, 2, 3, 4, 5, 6, 7, otherDay]:
+    match day:
+        case 1:
+            monday()
+        case 2:
+            tuesday()
+        case 3:
+            wednesday()
+        case 4:
+            thursday()
+        case 5:
+            friday()
+        case 6:
+            saturday()
+        case 7:
+            sunday()
+        case x:
+            x()

core/com.ibm.wala.cast.python.test/data/match2.py

@@ -0,0 +1,55 @@
+def monday():
+    print("Monday")
+
+
+def tuesday():
+    print("Tuesday")
+
+
+def wednesday():
+    print("Wednesday")
+
+
+def thursday():
+    print("Thursday")
+
+
+def friday():
+    print("Friday")
+
+
+def saturday():
+    print("Saturday")
+
+
+def sunday():
+    print("Sunday")
+
+
+def otherDay():
+    print("other day??")
+
+
+def doit(month):
+    for day in [1, 2, 3, 4, 5, 6, 7, otherDay]:
+        match day:
+            case 1 if 1 <= month <= 12:
+                monday()
+            case 2 if 1 <= month <= 12:
+                tuesday()
+            case 3 if 1 <= month <= 12:
+                wednesday()
+            case 4 if 1 <= month <= 12:
+                thursday()
+            case 5 if 1 <= month <= 12:
+                friday()
+            case 6 if 1 <= month <= 12:
+                saturday()
+            case 7 if 1 <= month <= 12:
+                sunday()
+            case x if callable(x):
+                x()
+
+
+doit(4)
+doit(0)

core/com.ibm.wala.cast.python.test/data/match3.py

@@ -0,0 +1,31 @@
+def weekday(day):
+    print("week day " + str(day))
+
+
+def weekend(day):
+    print("week end " + str(day))
+
+
+def otherDay():
+    print("other day??")
+
+
+def somethingElse():
+    print("something else")
+
+
+def doit(month):
+    for day in [1, 2, 3, 4, 5, 6, 7, otherDay]:
+        match day:
+            case 1 | 2 | 3 | 4 | 5 as day if 1 <= month <= 12:
+                weekday(day)
+            case 6 | 7 as day if 1 <= month <= 12:
+                weekend(day)
+            case x if callable(x):
+                x()
+            case _:
+                somethingElse()
+
+
+doit(4)
+doit(0)

core/com.ibm.wala.cast.python.test/data/match4.py

@@ -0,0 +1,41 @@
+def weekday(day):
+    print("week day " + str(day))
+
+
+def weekend(day):
+    print("week end " + str(day))
+
+
+def otherDay():
+    print("other day??")
+
+
+def somethingElse():
+    print("something else")
+
+
+def mten():
+    return 10
+
+
+def mseven():
+    return 10
+
+
+def doit(dmf):
+    match dmf:
+        case [1 | 2 | 3 | 4 | 5 as day, month] if 1 <= month() <= 12:
+            weekday(day)
+        case [6 | 7 as day, month] if 1 <= month() <= 12:
+            weekend(day)
+        case x if callable(x):
+            x()
+        case _:
+            somethingElse()
+
+
+doit((3, mseven))
+doit([7, mten])
+doit([8, mten])
+doit(otherDay)
+doit(0)

core/com.ibm.wala.cast.python.test/data/match5.py

@@ -0,0 +1,37 @@
+class Nothing:
+    def act(self):
+        print("Nothing")
+
+
+def id(x):
+    return x
+
+
+class Something:
+    a = 0
+    b = 0
+
+    def __init__(self, a, b):
+        self.a = id(a)
+        self.b = id(b)
+
+    def act(self):
+        print(self.a + self.b)
+
+
+def doit(x):
+    match x:
+        case Nothing():
+            x.act()
+        case Something(a=5, b=7):
+            x.act()
+        case Something():
+            print("unexpected something")
+        case _:
+            print("unexpected value")
+
+
+doit(Nothing())
+doit(Something(5, 7))
+doit(Something(3, 4))
+doit(10)

core/com.ibm.wala.cast.python.test/source/com/ibm/wala/cast/python/test/TestPythonCallGraphShape.java

@@ -24,6 +24,7 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Set;
@@ -130,4 +131,12 @@ StringBuffer dump(CallGraph CG) {
     }
     return sb;
   }
+
+  protected void verifyGraphAssertions(CallGraph CG, Object[][] data) {
+    List<GraphAssertion> asserts = new ArrayList<>();
+    for (int i = 0; i < data.length; i++) {
+      asserts.add(new GraphAssertion(data[i][0], (String[]) data[i][1]));
+    }
+    verifyGraphAssertions(CG, asserts);
+  }
 }

core/com.ibm.wala.cast.python/source/com/ibm/wala/cast/python/ir/PythonCAstToIRTranslator.java

@@ -20,6 +20,7 @@
 import com.ibm.wala.cast.ir.ssa.AstGlobalRead;
 import com.ibm.wala.cast.ir.ssa.AstInstructionFactory;
 import com.ibm.wala.cast.ir.translator.AstTranslator;
+import com.ibm.wala.cast.ir.translator.AstTranslator.WalkContext;
 import com.ibm.wala.cast.loader.AstMethod.DebuggingInformation;
 import com.ibm.wala.cast.loader.DynamicCallSiteReference;
 import com.ibm.wala.cast.python.loader.DynamicAnnotatableEntity;
@@ -1232,4 +1233,28 @@ protected void leaveBlockStmt(CAstNode n, WalkContext c, CAstVisitor<WalkContext
     // TODO Auto-generated method stub
     super.leaveBlockStmt(n, c, visitor);
   }
+
+  @Override
+  protected boolean visitInstanceOf(
+      CAstNode n, WalkContext context, CAstVisitor<WalkContext> visitor) {
+    int result = context.currentScope().allocateTempValue();
+    context.setValue(n, result);
+    return false;
+  }
+
+  @Override
+  protected void leaveInstanceOf(
+      CAstNode n, WalkContext context, CAstVisitor<WalkContext> visitor) {
+    int result = context.getValue(n);
+    TypeReference ref = (TypeReference) n.getChild(0).getValue();
+
+    context
+        .cfg()
+        .addInstruction(
+            insts.InstanceofInstruction(
+                context.cfg().getCurrentInstruction(),
+                result,
+                context.getValue(n.getChild(1)),
+                ref));
+  }
 }

core/com.ibm.wala.cast.python/source/com/ibm/wala/cast/python/loader/PythonLoader.java

@@ -228,14 +228,16 @@ protected TranslatorToIR initTranslator(Set<Pair<CAstEntity, ModuleEntry>> topLe
           PythonTypes.comprehension.getName(), PythonTypes.CodeBody.getName(), this, null);
   final CoreClass object =
       new CoreClass(PythonTypes.object.getName(), PythonTypes.rootTypeName, this, null);
+  final CoreClass sequence =
+      new CoreClass(PythonTypes.sequence.getName(), PythonTypes.Root.getName(), this, null);
   final CoreClass list =
-      new CoreClass(PythonTypes.list.getName(), PythonTypes.Root.getName(), this, null);
+      new CoreClass(PythonTypes.list.getName(), PythonTypes.sequence.getName(), this, null);
   final CoreClass set =
       new CoreClass(PythonTypes.set.getName(), PythonTypes.Root.getName(), this, null);
   final CoreClass dict =
       new CoreClass(PythonTypes.dict.getName(), PythonTypes.Root.getName(), this, null);
   final CoreClass tuple =
-      new CoreClass(PythonTypes.tuple.getName(), PythonTypes.Root.getName(), this, null);
+      new CoreClass(PythonTypes.tuple.getName(), PythonTypes.sequence.getName(), this, null);
   final CoreClass string =
       new CoreClass(PythonTypes.string.getName(), PythonTypes.Root.getName(), this, null);
   final CoreClass trampoline =

core/com.ibm.wala.cast.python/source/com/ibm/wala/cast/python/types/PythonTypes.java

@@ -103,6 +103,9 @@ public class PythonTypes extends AstTypeReference {
   public static final TypeReference coroutine =
       TypeReference.findOrCreate(pythonLoader, TypeName.findOrCreate("Lcoroutine"));
 
+  public static final TypeReference sequence =
+      TypeReference.findOrCreate(pythonLoader, TypeName.findOrCreate("Lsequence"));
+
   /** https://docs.python.org/3/library/stdtypes.html#typeiter. */
   public static final TypeReference iterator =
       TypeReference.findOrCreate(pythonLoader, TypeName.findOrCreate("Literator"));

jep/com.ibm.wala.cast.python.cpython/.launchers/PassingSuite.launch

@@ -7,6 +7,7 @@
     <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
         <listEntry value="1"/>
     </listAttribute>
+    <mapAttribute key="org.eclipse.debug.core.environmentVariables"/>
     <mapAttribute key="org.eclipse.debug.core.preferred_launchers">
         <mapEntry key="[run]" value="org.eclipse.jdt.junit.launchconfig"/>
     </mapAttribute>
@@ -31,5 +32,5 @@
     <listAttribute key="org.eclipse.jdt.launching.MODULEPATH"/>
     <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.ibm.wala.cast.python.cpython"/>
     <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
-    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea -Djava.library.path=/Users/dolby/miniforge3/envs/walajep/lib/python3.13/site-packages/jep"/>
+    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea&#10;--enable-native-access=ALL-UNNAMED -Djava.library.path=${sitePackages}/jep/&#10;-Djava.util.logging.config.file=./logging.properties"/>
 </launchConfiguration>