Move QC annotations and add vdmj.annotations resource

nickbattle · Dec 11, 2023 · 917704e · 917704e
1 parent b86dba9
commit 917704e
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 8 deletions.
diff --git a/quickcheck/src/main/java/quickcheck/QuickCheck.java b/quickcheck/src/main/java/quickcheck/QuickCheck.java
@@ -68,8 +68,8 @@
 import com.fujitsu.vdmj.values.Value;
 import com.fujitsu.vdmj.values.ValueList;
 
-import annotations.IterableContext;
-import annotations.po.POQuickCheckAnnotation;
+import quickcheck.annotations.po.POQuickCheckAnnotation;
+import quickcheck.annotations.IterableContext;
 import quickcheck.strategies.QCStrategy;
 import quickcheck.strategies.StrategyResults;
 import quickcheck.visitors.FixedRangeCreator;

diff --git a/...ain/java/annotations/IterableContext.java → ...ickcheck/annotations/IterableContext.java b/...ain/java/annotations/IterableContext.java → ...ickcheck/annotations/IterableContext.java
@@ -22,7 +22,7 @@
  *
  ******************************************************************************/
 
-package annotations;
+package quickcheck.annotations;
 
 import java.util.HashMap;
 import java.util.List;

diff --git a/...otations/ast/ASTQuickCheckAnnotation.java → ...otations/ast/ASTQuickCheckAnnotation.java b/...otations/ast/ASTQuickCheckAnnotation.java → ...otations/ast/ASTQuickCheckAnnotation.java
@@ -22,7 +22,7 @@
  *
  ******************************************************************************/
 
-package annotations.ast;
+package quickcheck.annotations.ast;
 
 import com.fujitsu.vdmj.ast.annotations.ASTAnnotation;
 import com.fujitsu.vdmj.ast.lex.LexIdentifierToken;

diff --git a/...nnotations/po/POQuickCheckAnnotation.java → ...nnotations/po/POQuickCheckAnnotation.java b/...nnotations/po/POQuickCheckAnnotation.java → ...nnotations/po/POQuickCheckAnnotation.java
@@ -22,7 +22,7 @@
  *
  ******************************************************************************/
 
-package annotations.po;
+package quickcheck.annotations.po;
 
 import com.fujitsu.vdmj.po.annotations.POAnnotation;
 import com.fujitsu.vdmj.tc.lex.TCIdentifierToken;

diff --git a/...nnotations/tc/TCQuickCheckAnnotation.java → ...nnotations/tc/TCQuickCheckAnnotation.java b/...nnotations/tc/TCQuickCheckAnnotation.java → ...nnotations/tc/TCQuickCheckAnnotation.java
@@ -22,7 +22,7 @@
  *
  ******************************************************************************/
 
-package annotations.tc;
+package quickcheck.annotations.tc;
 
 import com.fujitsu.vdmj.tc.annotations.TCAnnotation;
 import com.fujitsu.vdmj.tc.definitions.TCClassDefinition;

diff --git a/quickcheck/src/main/resources/ast-tc.mappings b/quickcheck/src/main/resources/ast-tc.mappings
@@ -3,5 +3,5 @@
 ##########################################################################################
 
 # annotations
-package annotations.ast to annotations.tc;
+package quickcheck.annotations.ast to quickcheck.annotations.tc;
 map ASTQuickCheckAnnotation{name, qcParam, qcTypes} to TCQuickCheckAnnotation(name, qcParam, qcTypes);
diff --git a/quickcheck/src/main/resources/tc-po.mappings b/quickcheck/src/main/resources/tc-po.mappings
@@ -3,6 +3,6 @@
 ##########################################################################################
 
 # annotations
-package annotations.tc to annotations.po;
+package quickcheck.annotations.tc to quickcheck.annotations.po;
 map TCQuickCheckAnnotation{name, qcParam, qcTypes} to POQuickCheckAnnotation(name, qcParam, qcTypes);
 
diff --git a/quickcheck/src/main/resources/vdmj.annotations b/quickcheck/src/main/resources/vdmj.annotations
@@ -0,0 +1 @@
+quickcheck.annotations.ast.ASTQuickCheckAnnotation
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		quickcheck.annotations.ast.ASTQuickCheckAnnotation