Skip to content

Commit a6108ec

Browse files
author
owen-jones-diffblue
authored
Merge pull request diffblue#2941 from owen-jones-diffblue/update-package-for-overlay-class-and-overlay-methods
Change package to org.cprover for three classes
2 parents 8863b9c + cb4cd2a commit a6108ec

13 files changed

+12
-12
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.diffblue;
1+
package org.cprover;
22

33
public @interface OverlayClassImplementation {
44
}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.diffblue;
1+
package org.cprover;
22

33
public @interface OverlayMethodImplementation {
44
}
Binary file not shown.

jbmc/regression/jbmc/overlay-class/correct-overlay/Test.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import com.diffblue.OverlayClassImplementation;
2-
import com.diffblue.OverlayMethodImplementation;
1+
import org.cprover.OverlayClassImplementation;
2+
import org.cprover.OverlayMethodImplementation;
33

44
@OverlayClassImplementation
55
public class Test
Binary file not shown.

jbmc/regression/jbmc/overlay-class/unmarked-overlay/Test.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import com.diffblue.OverlayClassImplementation;
2-
import com.diffblue.OverlayMethodImplementation;
1+
import org.cprover.OverlayClassImplementation;
2+
import org.cprover.OverlayMethodImplementation;
33

44
public class Test
55
{

jbmc/src/java_bytecode/java_bytecode_convert_class.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ class java_bytecode_convert_classt:public messaget
5353
/// \remarks
5454
/// Allows multiple definitions of the same class to appear on the
5555
/// classpath, so long as all but the first definition are marked with the
56-
/// attribute `\@java::com.diffblue.OverlayClassImplementation`.
56+
/// attribute `\@java::org.cprover.OverlayClassImplementation`.
5757
/// Overlay class definitions can contain methods with the same signature
5858
/// as methods in the original class, so long as these are marked with the
59-
/// attribute `\@java::com.diffblue.OverlayMethodImplementation`; such
59+
/// attribute `\@java::org.cprover.OverlayMethodImplementation`; such
6060
/// overlay methods are replaced in the original file with the version
6161
/// found in the last overlay on the classpath. Later definitions can
6262
/// also contain new supporting methods and fields that are merged in.

jbmc/src/java_bytecode/java_class_loader.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ static bool is_overlay_class(const java_bytecode_parse_treet::classt &c)
8888
/// \remarks
8989
/// Allows multiple definitions of the same class to appear on the
9090
/// classpath, so long as all but the first definition are marked with the
91-
/// attribute `\@java::com.diffblue.OverlayClassImplementation`.
91+
/// attribute `\@java::org.cprover.OverlayClassImplementation`.
9292
java_class_loadert::parse_tree_with_overlayst &
9393
java_class_loadert::get_parse_tree(
9494
java_class_loader_limitt &class_loader_limit,

src/util/irep_ids.def

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -668,9 +668,9 @@ IREP_ID_ONE(havoc_object)
668668
IREP_ID_TWO(overflow_shl, overflow-shl)
669669
IREP_ID_TWO(C_no_initialization_required, #no_initialization_required)
670670
IREP_ID_TWO(C_no_nondet_initialization, #no_nondet_initialization)
671-
IREP_ID_TWO(overlay_class, java::com.diffblue.OverlayClassImplementation)
672-
IREP_ID_TWO(overlay_method, java::com.diffblue.OverlayMethodImplementation)
673-
IREP_ID_TWO(ignored_method, java::com.diffblue.IgnoredMethodImplementation)
671+
IREP_ID_TWO(overlay_class, java::org.cprover.OverlayClassImplementation)
672+
IREP_ID_TWO(overlay_method, java::org.cprover.OverlayMethodImplementation)
673+
IREP_ID_TWO(ignored_method, java::org.cprover.IgnoredMethodImplementation)
674674
IREP_ID_ONE(is_annotation)
675675
IREP_ID_TWO(C_annotations, #annotations)
676676
IREP_ID_ONE(final)

0 commit comments

Comments
 (0)