Merge pull request #814 from soot-oss/revert/dollarSignFlood

Revert/dollar sign flood
soot-oss · Jan 15, 2024 · f471853 · f471853
2 parents cdd5e0a + a20cf3a
commit f471853
Show file tree

Hide file tree

Showing 565 changed files with 17,376 additions and 17,443 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -52,6 +52,37 @@ jobs:
       - name: Build with JDK8
         run: mvn -B compile -Dfmt.skip -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
 
+  Style:
+    needs: Compilation
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: get cached compilation
+        id: cache-compilation
+        uses: actions/cache@v3
+        with:
+          path: |
+            **/target/
+          key: cache-compilation-${{ github.sha }}
+
+      - name: cache maven dependencies
+        uses: actions/cache@v3
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+
+      - name: Set up JDK 8
+        uses: actions/setup-java@v3
+        with:
+          java-version: '8'
+          distribution: 'zulu'
+
+      - name: Check Format
+        run: mvn -B com.coveo:fmt-maven-plugin:check -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+
   JDK8:
     needs: Compilation
     runs-on: ubuntu-latest
@@ -143,11 +174,6 @@ jobs:
           path: |
             */target/surefire-reports
 
-      # style check is not clean here but does not consume additional time as the other parallel running tests take (way) longer
-      - name: Check Format
-        run: mvn -B com.coveo:fmt-maven-plugin:check -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
-
-
     # takes a long time to run - so just run them when PR is not draft anymore
   IntegrationTest:
     if: ${{ !github.event.pull_request.draft }}
@@ -194,8 +220,6 @@ jobs:
           path: |
             */target/surefire-reports
 
-
-
   CoverageReport:
     runs-on: ubuntu-latest
     needs: [ JDK9, JDK8, IntegrationTest]

diff --git a/docs/jimple.md b/docs/jimple.md
@@ -28,11 +28,11 @@ It might help to visualize how the Jimple version of a Java code looks like. Hav
       public static void main(java.lang.String[])
       {
         java.lang.String[] r0;
-        java.io.PrintStream $r1;
+        java.io.PrintStream r1;
             
         r0 := @parameter0: java.lang.String[];
-        $r1 = <java.lang.System: java.io.PrintStream out>;
-        virtualinvoke $r1.<java.io.PrintStream: 
+        r1 = <java.lang.System: java.io.PrintStream out>;
+        virtualinvoke r1.<java.io.PrintStream: 
         void println(java.lang.String)>("Hello world!");
         return;
       }
@@ -2123,7 +2123,7 @@ NullType
       boolean check;
       target.exercise1.DemoClass this;
       int i;
-      null_type $r0;
+      null_type r0;
       java.lang.NullPointerException soot0;
       this := @this: target.exercise1.DemoClass;
       check := @parameter0: boolean;
@@ -2133,11 +2133,11 @@ NullType
       label1:
         if i >= 5 goto label3;
           if check == 0 goto label2;
-          $r0 = (null_type) i;
+          r0 = (null_type) i;
           soot0 = new java.lang.NullPointerException;
           specialinvoke soot0.<java.lang.NullPointerException: 
             void <init>(java.lang.String)>
-              ("This statement would have triggered an Exception: a[i#1] = $r0");
+              ("This statement would have triggered an Exception: a[i#1] = r0");
           throw soot0;
 
       label2:
@@ -2157,7 +2157,7 @@ NullType
     }
     /*
       The JimpleLocal b is of ArrayType,
-        and JimpleLocal $r0 is of NullType.
+        and JimpleLocal r0 is of NullType.
     */
     ```
 
@@ -2289,7 +2289,7 @@ NullType
 
 #### Local
 ```jimple
-$i0 
+i0 
 ```
 A Local is a variable and its scope is inside its method i.e. no referencing from outside a method.
 Values can be assigned to Locals via JIdentityStmt or JAssignStmt.  
@@ -2434,7 +2434,7 @@ referencing a position inside an array.
 ```jimple
 <SomePackage.ExampleClass: fieldname>
 // or
-$r1.<SomePackage.ExampleClass: fieldname>
+r1.<SomePackage.ExampleClass: fieldname>
 ```
 referencing a Field via its FieldSignature and if necessary (i.e. with JInstanceFieldRef) the corresponding Local instance that points to the object instance.
 
@@ -2455,8 +2455,8 @@ represents the value of the thrown exception (caught by this exceptionhandler).
 
 ##### JParameterRef
 ```jimple
-$i0 := @parameter0
-$i1 := @parameter1 
+i0 := @parameter0
+i1 := @parameter1 
 ```
 represents a parameter of a method, identified by its index.
 
diff --git a/shared-test-resources/bugfixes/Issue739_Aggregator.class b/shared-test-resources/bugfixes/Issue739_Aggregator.class
diff --git a/shared-test-resources/wala-test-jimple/AnonymousClass$1.jimple b/shared-test-resources/wala-test-jimple/AnonymousClass$1.jimple
@@ -24,31 +24,31 @@ final class AnonymousClass$1 extends java.lang.Object implements AnonymousClass$
     public int getValue()
     {
         AnonymousClass$1 r0;
-        int $i0;
+        int i0;
 
         r0 := @this: AnonymousClass$1;
 
-        $i0 = r0.<AnonymousClass$1: int value>;
+        i0 = r0.<AnonymousClass$1: int value>;
 
-        return $i0;
+        return i0;
     }
 
     public int getValueBase()
     {
         AnonymousClass$1 r0;
-        java.lang.Integer $r1;
-        int $i0, $i1, $i2;
+        java.lang.Integer r1;
+        int i0, i1, i2;
 
         r0 := @this: AnonymousClass$1;
 
-        $i0 = r0.<AnonymousClass$1: int value>;
+        i0 = r0.<AnonymousClass$1: int value>;
 
-        $r1 = r0.<AnonymousClass$1: java.lang.Integer val$base>;
+        r1 = r0.<AnonymousClass$1: java.lang.Integer val$base>;
 
-        $i1 = virtualinvoke $r1.<java.lang.Integer: int intValue()>();
+        i1 = virtualinvoke r1.<java.lang.Integer: int intValue()>();
 
-        $i2 = $i0 - $i1;
+        i2 = i0 - i1;
 
-        return $i2;
+        return i2;
     }
 }
diff --git a/shared-test-resources/wala-test-jimple/AnonymousClass$1FooImpl.jimple b/shared-test-resources/wala-test-jimple/AnonymousClass$1FooImpl.jimple
@@ -35,23 +35,23 @@ abstract class AnonymousClass$1FooImpl extends java.lang.Object implements Anony
     public int getValueBase()
     {
         AnonymousClass$1FooImpl r0;
-        int $i0, $i1, $i2, $i3, $i4;
-        java.lang.Integer $r1;
+        int i0, i1, i2, i3, i4;
+        java.lang.Integer r1;
 
         r0 := @this: AnonymousClass$1FooImpl;
 
-        $i0 = r0.<AnonymousClass$1FooImpl: int y>;
+        i0 = r0.<AnonymousClass$1FooImpl: int y>;
 
-        $i1 = virtualinvoke r0.<AnonymousClass$1FooImpl: int getValue()>();
+        i1 = virtualinvoke r0.<AnonymousClass$1FooImpl: int getValue()>();
 
-        $i2 = $i0 + $i1;
+        i2 = i0 + i1;
 
-        $r1 = r0.<AnonymousClass$1FooImpl: java.lang.Integer val$base>;
+        r1 = r0.<AnonymousClass$1FooImpl: java.lang.Integer val$base>;
 
-        $i3 = virtualinvoke $r1.<java.lang.Integer: int intValue()>();
+        i3 = virtualinvoke r1.<java.lang.Integer: int intValue()>();
 
-        $i4 = $i2 - $i3;
+        i4 = i2 - i3;
 
-        return $i4;
+        return i4;
     }
 }
diff --git a/shared-test-resources/wala-test-jimple/AnonymousClass.jimple b/shared-test-resources/wala-test-jimple/AnonymousClass.jimple
@@ -16,36 +16,36 @@ public class AnonymousClass extends java.lang.Object
     {
         java.lang.String[] r0;
         java.lang.Integer r1;
-        AnonymousClass$1 $r3;
-        java.io.PrintStream $r4, $r5;
-        int $i0, $i1;
-        AnonymousClass $r6;
+        AnonymousClass$1 r3;
+        java.io.PrintStream r4, r5;
+        int i0, i1;
+        AnonymousClass r6;
 
         r0 := @parameter0: java.lang.String[];
 
         r1 = staticinvoke <java.lang.Integer: java.lang.Integer valueOf(int)>(6);
 
-        $r3 = new AnonymousClass$1;
+        r3 = new AnonymousClass$1;
 
-        specialinvoke $r3.<AnonymousClass$1: void <init>(java.lang.Integer)>(r1);
+        specialinvoke r3.<AnonymousClass$1: void <init>(java.lang.Integer)>(r1);
 
-        $r4 = <java.lang.System: java.io.PrintStream out>;
+        r4 = <java.lang.System: java.io.PrintStream out>;
 
-        $i0 = interfaceinvoke $r3.<AnonymousClass$Foo: int getValue()>();
+        i0 = interfaceinvoke r3.<AnonymousClass$Foo: int getValue()>();
 
-        virtualinvoke $r4.<java.io.PrintStream: void println(int)>($i0);
+        virtualinvoke r4.<java.io.PrintStream: void println(int)>(i0);
 
-        $r5 = <java.lang.System: java.io.PrintStream out>;
+        r5 = <java.lang.System: java.io.PrintStream out>;
 
-        $i1 = interfaceinvoke $r3.<AnonymousClass$Foo: int getValueBase()>();
+        i1 = interfaceinvoke r3.<AnonymousClass$Foo: int getValueBase()>();
 
-        virtualinvoke $r5.<java.io.PrintStream: void println(int)>($i1);
+        virtualinvoke r5.<java.io.PrintStream: void println(int)>(i1);
 
-        $r6 = new AnonymousClass;
+        r6 = new AnonymousClass;
 
-        specialinvoke $r6.<AnonymousClass: void <init>()>();
+        specialinvoke r6.<AnonymousClass: void <init>()>();
 
-        virtualinvoke $r6.<AnonymousClass: void method()>();
+        virtualinvoke r6.<AnonymousClass: void method()>();
 
         return;
     }
@@ -54,29 +54,29 @@ public class AnonymousClass extends java.lang.Object
     {
         AnonymousClass r0;
         java.lang.Integer r1;
-        AnonymousClass$2 $r3;
-        java.io.PrintStream $r4, $r5;
-        int $i0, $i1;
+        AnonymousClass$2 r3;
+        java.io.PrintStream r4, r5;
+        int i0, i1;
 
         r0 := @this: AnonymousClass;
 
         r1 = staticinvoke <java.lang.Integer: java.lang.Integer valueOf(int)>(7);
 
-        $r3 = new AnonymousClass$2;
+        r3 = new AnonymousClass$2;
 
-        specialinvoke $r3.<AnonymousClass$2: void <init>(AnonymousClass,int,java.lang.Integer)>(r0, -4, r1);
+        specialinvoke r3.<AnonymousClass$2: void <init>(AnonymousClass,int,java.lang.Integer)>(r0, -4, r1);
 
-        $r4 = <java.lang.System: java.io.PrintStream out>;
+        r4 = <java.lang.System: java.io.PrintStream out>;
 
-        $i0 = interfaceinvoke $r3.<AnonymousClass$Foo: int getValue()>();
+        i0 = interfaceinvoke r3.<AnonymousClass$Foo: int getValue()>();
 
-        virtualinvoke $r4.<java.io.PrintStream: void println(int)>($i0);
+        virtualinvoke r4.<java.io.PrintStream: void println(int)>(i0);
 
-        $r5 = <java.lang.System: java.io.PrintStream out>;
+        r5 = <java.lang.System: java.io.PrintStream out>;
 
-        $i1 = interfaceinvoke $r3.<AnonymousClass$Foo: int getValueBase()>();
+        i1 = interfaceinvoke r3.<AnonymousClass$Foo: int getValueBase()>();
 
-        virtualinvoke $r5.<java.io.PrintStream: void println(int)>($i1);
+        virtualinvoke r5.<java.io.PrintStream: void println(int)>(i1);
 
         return;
     }

diff --git a/shared-test-resources/wala-test-jimple/Array1.jimple b/shared-test-resources/wala-test-jimple/Array1.jimple
@@ -15,15 +15,15 @@ public class Array1 extends java.lang.Object
     public static void main(java.lang.String[])
     {
         java.lang.String[] r0;
-        Array1 $r2;
+        Array1 r2;
 
         r0 := @parameter0: java.lang.String[];
 
-        $r2 = new Array1;
+        r2 = new Array1;
 
-        specialinvoke $r2.<Array1: void <init>()>();
+        specialinvoke r2.<Array1: void <init>()>();
 
-        virtualinvoke $r2.<Array1: void foo()>();
+        virtualinvoke r2.<Array1: void foo()>();
 
         return;
     }
@@ -32,7 +32,7 @@ public class Array1 extends java.lang.Object
     {
         Array1 r0;
         int[] r1;
-        int $i0, $i1, $i2, i3, i5;
+        int i0, i1, i2, i3, i5;
 
         r0 := @this: Array1;
 
@@ -41,9 +41,9 @@ public class Array1 extends java.lang.Object
         i3 = 0;
 
      label1:
-        $i0 = lengthof r1;
+        i0 = lengthof r1;
 
-        if i3 >= $i0 goto label2;
+        if i3 >= i0 goto label2;
 
         r1[i3] = i3;
 
@@ -55,11 +55,11 @@ public class Array1 extends java.lang.Object
         i5 = 0;
 
      label3:
-        $i1 = lengthof r1;
+        i1 = lengthof r1;
 
-        if i5 >= $i1 goto label4;
+        if i5 >= i1 goto label4;
 
-        $i2 = r1[i5];
+        i2 = r1[i5];
 
         i5 = i5 + 1;