From 917704e4c6dd1a5ea4eb8d0dc440b4c6ffea0951 Mon Sep 17 00:00:00 2001 From: Nick Battle Date: Mon, 11 Dec 2023 12:02:15 +0000 Subject: [PATCH] Move QC annotations and add vdmj.annotations resource --- quickcheck/src/main/java/quickcheck/QuickCheck.java | 4 ++-- .../java/{ => quickcheck}/annotations/IterableContext.java | 2 +- .../annotations/ast/ASTQuickCheckAnnotation.java | 2 +- .../annotations/po/POQuickCheckAnnotation.java | 2 +- .../annotations/tc/TCQuickCheckAnnotation.java | 2 +- quickcheck/src/main/resources/ast-tc.mappings | 2 +- quickcheck/src/main/resources/tc-po.mappings | 2 +- quickcheck/src/main/resources/vdmj.annotations | 1 + 8 files changed, 9 insertions(+), 8 deletions(-) rename quickcheck/src/main/java/{ => quickcheck}/annotations/IterableContext.java (98%) rename quickcheck/src/main/java/{ => quickcheck}/annotations/ast/ASTQuickCheckAnnotation.java (98%) rename quickcheck/src/main/java/{ => quickcheck}/annotations/po/POQuickCheckAnnotation.java (97%) rename quickcheck/src/main/java/{ => quickcheck}/annotations/tc/TCQuickCheckAnnotation.java (99%) create mode 100644 quickcheck/src/main/resources/vdmj.annotations diff --git a/quickcheck/src/main/java/quickcheck/QuickCheck.java b/quickcheck/src/main/java/quickcheck/QuickCheck.java index 67385510d..91833dc5e 100644 --- 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/quickcheck/src/main/java/annotations/IterableContext.java b/quickcheck/src/main/java/quickcheck/annotations/IterableContext.java similarity index 98% rename from quickcheck/src/main/java/annotations/IterableContext.java rename to quickcheck/src/main/java/quickcheck/annotations/IterableContext.java index d815b11c2..0b9b02389 100644 --- a/quickcheck/src/main/java/annotations/IterableContext.java +++ b/quickcheck/src/main/java/quickcheck/annotations/IterableContext.java @@ -22,7 +22,7 @@ * ******************************************************************************/ -package annotations; +package quickcheck.annotations; import java.util.HashMap; import java.util.List; diff --git a/quickcheck/src/main/java/annotations/ast/ASTQuickCheckAnnotation.java b/quickcheck/src/main/java/quickcheck/annotations/ast/ASTQuickCheckAnnotation.java similarity index 98% rename from quickcheck/src/main/java/annotations/ast/ASTQuickCheckAnnotation.java rename to quickcheck/src/main/java/quickcheck/annotations/ast/ASTQuickCheckAnnotation.java index 8c97cb7b5..5fa61aaed 100644 --- a/quickcheck/src/main/java/annotations/ast/ASTQuickCheckAnnotation.java +++ b/quickcheck/src/main/java/quickcheck/annotations/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/quickcheck/src/main/java/annotations/po/POQuickCheckAnnotation.java b/quickcheck/src/main/java/quickcheck/annotations/po/POQuickCheckAnnotation.java similarity index 97% rename from quickcheck/src/main/java/annotations/po/POQuickCheckAnnotation.java rename to quickcheck/src/main/java/quickcheck/annotations/po/POQuickCheckAnnotation.java index 001f4f850..b9a7497a3 100644 --- a/quickcheck/src/main/java/annotations/po/POQuickCheckAnnotation.java +++ b/quickcheck/src/main/java/quickcheck/annotations/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/quickcheck/src/main/java/annotations/tc/TCQuickCheckAnnotation.java b/quickcheck/src/main/java/quickcheck/annotations/tc/TCQuickCheckAnnotation.java similarity index 99% rename from quickcheck/src/main/java/annotations/tc/TCQuickCheckAnnotation.java rename to quickcheck/src/main/java/quickcheck/annotations/tc/TCQuickCheckAnnotation.java index e4fa5e7c9..bddaf55aa 100644 --- a/quickcheck/src/main/java/annotations/tc/TCQuickCheckAnnotation.java +++ b/quickcheck/src/main/java/quickcheck/annotations/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 index e54d50b74..018dc5293 100644 --- 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 index c5d73e738..7fd3ac775 100644 --- 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 new file mode 100644 index 000000000..102662bc9 --- /dev/null +++ b/quickcheck/src/main/resources/vdmj.annotations @@ -0,0 +1 @@ +quickcheck.annotations.ast.ASTQuickCheckAnnotation \ No newline at end of file