From 8e73876ae1e259b041db9a11afc7f8b93c385fa6 Mon Sep 17 00:00:00 2001 From: idhugoid Date: Wed, 11 Aug 2021 10:46:28 +0200 Subject: [PATCH] Changes the template to generate VDMRecord --- .../codegen/ir/declarations/ARecordDeclIR.vm | 2 +- .../LetBeStStmWithRecPattern.vdmpp.result | 2 +- .../CashDispenserPP.vdmpp.result | 2 +- .../CashDispenserPP.vdmpp.result | 2 +- ...ectDesignatorWithRecFieldObj1.vdmpp.result | 2 +- ...ectDesignatorWithRecFieldObj2.vdmpp.result | 6 ++-- ...eUnionArgInExtendedExplicitOp.vdmpp.result | 2 +- .../EmptyRecords.vdmpp.result | 2 +- .../FieldDesignatorOfRecObj.vdmpp.result | 2 +- ...esignatorOfRecObjChainOfThree.vdmpp.result | 6 ++-- ...dDesignatorOfRecObjChainOfTwo.vdmpp.result | 4 +-- ...StateDesignatorChangeRecField.vdmpp.result | 2 +- .../MapSeqStateDesignatorNesting.vdmpp.result | 2 +- .../NarrowRecordFieldAccess.vdmpp.result | 2 +- ...llyTypedRecordFieldComparison.vdmpp.result | 2 +- .../RecModExpArgToApplyExp.vdmpp.result | 2 +- .../RecModExpForAllExp.vdmpp.result | 2 +- .../RecModExpInRecModExp.vdmpp.result | 4 +-- .../RecModExpSimple1.vdmpp.result | 2 +- .../RecModExpVarExp.vdmpp.result | 2 +- .../RecNoFieldNames.vdmpp.result | 2 +- .../RecordComp.vdmpp.result | 2 +- .../RecordUsageAcrossClass.vdmpp.result | 2 +- .../RecordValue.vdmpp.result | 2 +- .../UnknownTypeArgInNewExp.vdmpp.result | 2 +- .../POP3_LogBased_Test1.vdmpp.result | 32 +++++++++---------- .../is_expressions/IsExp.vdmpp.result | 2 +- .../is_expressions/IsExpPolyType.vdmpp.result | 4 +-- .../RecordUsageAcrossClassSimple.vdmpp.result | 2 +- ...ockWithInterdependentPatterns.vdmpp.result | 2 +- .../pattern_specs/CasesExpRec.vdmpp.result | 2 +- ...rnNamedInvariantUnionTypedExp.vdmpp.result | 4 +-- .../CasesStmOpCallExp.vdmpp.result | 4 +-- .../pattern_specs/CasesStmRec.vdmpp.result | 2 +- ...rnNamedInvariantUnionTypedExp.vdmpp.result | 4 +-- .../LetBeStRecPattern.vdmpp.result | 2 +- .../RecordLastFieldInt.vdmpp.result | 2 +- .../pattern_specs/RecordNoFields.vdmpp.result | 2 +- ...cordPatternIdentifierPatterns.vdmpp.result | 2 +- ...cordPatternWithSimplePatterns.vdmpp.result | 2 +- .../RecordWithFieldOfUnknownType.vdmpp.result | 2 +- .../RecordWithIgnorePattern.vdmpp.result | 2 +- .../RecordWithTuple.vdmpp.result | 2 +- .../TupleWithRecord.vdmpp.result | 2 +- ...xtendedExplicitOpCallPostCond.vdmsl.result | 2 +- .../sl_specs/IdNormalising.vdmsl.result | 2 +- .../sl_specs/ImplicitOperation.vdmsl.result | 2 +- .../sl_specs/InvariantWithLet.vdmsl.result | 2 +- .../sl_specs/ModifyStateExplicit.vdmsl.result | 2 +- .../sl_specs/ModifyStateImplicit.vdmsl.result | 2 +- .../ModifyStateRecFieldExplicit.vdmsl.result | 4 +-- .../ModifyStateRecFieldImplicit.vdmsl.result | 4 +-- .../ModifyUninitialisedState.vdmsl.result | 2 +- .../ModuleNameSameAsStateName.vdmsl.result | 4 +-- .../NormaliseAccessedStateField.vdmsl.result | 2 +- .../sl_specs/ReadStateExplicit.vdmsl.result | 2 +- .../sl_specs/ReadStateImplicit.vdmsl.result | 2 +- ...ReadStateWithRecFieldImplicit.vdmsl.result | 4 +-- ...StateFieldModuleValueSameName.vdmsl.result | 2 +- .../resources/sl_specs/ValueDef.vdmsl.result | 2 +- .../sl_specs/VarShadowingOpFunc.vdmsl.result | 2 +- .../sl_specs/VarShadowingState.vdmsl.result | 2 +- .../specifications/ForAllSeqLoop.vdmpp.result | 2 +- .../specifications/ForAllSetLoop.vdmpp.result | 2 +- .../RecordComparison.vdmpp.result | 2 +- .../RecordCreation.vdmpp.result | 2 +- .../specifications/RecordCycle.vdmpp.result | 4 +-- .../specifications/RecordDecls.vdmpp.result | 4 +-- .../specifications/RecordNesting.vdmpp.result | 6 ++-- .../RecordPrimitiveFields.vdmpp.result | 2 +- .../specifications/RecordUsage.vdmpp.result | 4 +-- .../RecordUsageAcrossClass.vdmpp.result | 4 +-- .../LetBeStRecPattern.vdmpp.result | 2 +- .../ComplexStateSingleModule.vdmsl.result | 4 +-- .../traces_sl_specs/NilRefError.vdmsl.result | 2 +- .../PreCondAccessState.vdmsl.result | 4 +-- .../traces_sl_specs/RecPattern.vdmsl.result | 2 +- .../StateOtherModule.vdmsl.result | 2 +- .../StateSingleModule.vdmsl.result | 2 +- .../traces_sl_specs/TraceVarStm.vdmsl.result | 2 +- .../AssignFieldOfUnionRec.vdmpp.result | 4 +-- .../FieldExpMissingRecField.vdmpp.result | 4 +-- .../FieldExpNotRootOfApplyExp.vdmpp.result | 2 +- .../FieldExpOfRecord.vdmpp.result | 2 +- ...FieldExpOfRecordArgToApplyExp.vdmpp.result | 2 +- .../ForAllUnionTypeField.vdmpp.result | 2 +- .../LetBeStRecElem.vdmpp.result | 2 +- .../NewExpRecord.vdmpp.result | 2 +- ...dUnionOneRecordIsMissingField.vdmpp.result | 4 +-- .../VarExpTypeNarrowedByIsCheck.vdmpp.result | 4 +-- 90 files changed, 131 insertions(+), 131 deletions(-) diff --git a/core/codegen/javagen/src/main/resources/JavaTemplates/org/overture/codegen/ir/declarations/ARecordDeclIR.vm b/core/codegen/javagen/src/main/resources/JavaTemplates/org/overture/codegen/ir/declarations/ARecordDeclIR.vm index 75e813c1a6..0f7860a545 100644 --- a/core/codegen/javagen/src/main/resources/JavaTemplates/org/overture/codegen/ir/declarations/ARecordDeclIR.vm +++ b/core/codegen/javagen/src/main/resources/JavaTemplates/org/overture/codegen/ir/declarations/ARecordDeclIR.vm @@ -1,4 +1,4 @@ -static class $node.getName() implements Record +static class $node.getName() implements VDMRecord { #foreach( $field in $node.getFields() ) $JavaFormat.format($field) diff --git a/core/codegen/javagen/src/test/resources/bind_specs/LetBeStStmWithRecPattern.vdmpp.result b/core/codegen/javagen/src/test/resources/bind_specs/LetBeStStmWithRecPattern.vdmpp.result index dc24e51ffd..9857e1376d 100644 --- a/core/codegen/javagen/src/test/resources/bind_specs/LetBeStStmWithRecPattern.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/bind_specs/LetBeStStmWithRecPattern.vdmpp.result @@ -43,7 +43,7 @@ public class Entry { return "Entry{}"; } - public static class Vec implements Record { + public static class Vec implements VDMRecord { public Number x; public Number y; diff --git a/core/codegen/javagen/src/test/resources/classic_specs/CashDispenserPP.vdmpp.result b/core/codegen/javagen/src/test/resources/classic_specs/CashDispenserPP.vdmpp.result index 121e04a137..ee3647bb71 100644 --- a/core/codegen/javagen/src/test/resources/classic_specs/CashDispenserPP.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/classic_specs/CashDispenserPP.vdmpp.result @@ -219,7 +219,7 @@ public class Account { + "}"; } - public static class Transaction implements Record { + public static class Transaction implements VDMRecord { public VDMSeq date; public Number cardId; public Number amount; diff --git a/core/codegen/javagen/src/test/resources/cloning_specs/CashDispenserPP.vdmpp.result b/core/codegen/javagen/src/test/resources/cloning_specs/CashDispenserPP.vdmpp.result index 6641424ba3..7327c0e19b 100644 --- a/core/codegen/javagen/src/test/resources/cloning_specs/CashDispenserPP.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/cloning_specs/CashDispenserPP.vdmpp.result @@ -214,7 +214,7 @@ public class Account { + "}"; } - public static class Transaction implements Record { + public static class Transaction implements VDMRecord { public VDMSeq date; public Number cardId; public Number amount; diff --git a/core/codegen/javagen/src/test/resources/complex_expressions/ApplyObjectDesignatorWithRecFieldObj1.vdmpp.result b/core/codegen/javagen/src/test/resources/complex_expressions/ApplyObjectDesignatorWithRecFieldObj1.vdmpp.result index 0e5f4a8883..4fd8318e3d 100644 --- a/core/codegen/javagen/src/test/resources/complex_expressions/ApplyObjectDesignatorWithRecFieldObj1.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/complex_expressions/ApplyObjectDesignatorWithRecFieldObj1.vdmpp.result @@ -27,7 +27,7 @@ public class Entry { return "Entry{}"; } - public static class A implements Record { + public static class A implements VDMRecord { public VDMSeq es; public A(final VDMSeq _es) { diff --git a/core/codegen/javagen/src/test/resources/complex_expressions/ApplyObjectDesignatorWithRecFieldObj2.vdmpp.result b/core/codegen/javagen/src/test/resources/complex_expressions/ApplyObjectDesignatorWithRecFieldObj2.vdmpp.result index feca0c9af3..801c4111d3 100644 --- a/core/codegen/javagen/src/test/resources/complex_expressions/ApplyObjectDesignatorWithRecFieldObj2.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/complex_expressions/ApplyObjectDesignatorWithRecFieldObj2.vdmpp.result @@ -27,7 +27,7 @@ public class Entry { return "Entry{}"; } - public static class A implements Record { + public static class A implements VDMRecord { public VDMSeq bs; public A(final VDMSeq _bs) { @@ -62,7 +62,7 @@ public class Entry { } } - public static class B implements Record { + public static class B implements VDMRecord { public C c; public B(final C _c) { @@ -97,7 +97,7 @@ public class Entry { } } - public static class C implements Record { + public static class C implements VDMRecord { public Entry e; public C(final Entry _e) { diff --git a/core/codegen/javagen/src/test/resources/complex_expressions/BracketTypeUnionArgInExtendedExplicitOp.vdmpp.result b/core/codegen/javagen/src/test/resources/complex_expressions/BracketTypeUnionArgInExtendedExplicitOp.vdmpp.result index dc481dd73e..6b3bec71ef 100644 --- a/core/codegen/javagen/src/test/resources/complex_expressions/BracketTypeUnionArgInExtendedExplicitOp.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/complex_expressions/BracketTypeUnionArgInExtendedExplicitOp.vdmpp.result @@ -28,7 +28,7 @@ public class Entry { return "Entry{}"; } - private static class R implements Record { + private static class R implements VDMRecord { public Number x; public R(final Number _x) { diff --git a/core/codegen/javagen/src/test/resources/complex_expressions/EmptyRecords.vdmpp.result b/core/codegen/javagen/src/test/resources/complex_expressions/EmptyRecords.vdmpp.result index 13502b611b..6917d676a6 100644 --- a/core/codegen/javagen/src/test/resources/complex_expressions/EmptyRecords.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/complex_expressions/EmptyRecords.vdmpp.result @@ -19,7 +19,7 @@ public class Entry { return "Entry{}"; } - public static class M implements Record { + public static class M implements VDMRecord { public M() {} diff --git a/core/codegen/javagen/src/test/resources/complex_expressions/FieldDesignatorOfRecObj.vdmpp.result b/core/codegen/javagen/src/test/resources/complex_expressions/FieldDesignatorOfRecObj.vdmpp.result index fa8aa742a7..d21920d50b 100644 --- a/core/codegen/javagen/src/test/resources/complex_expressions/FieldDesignatorOfRecObj.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/complex_expressions/FieldDesignatorOfRecObj.vdmpp.result @@ -26,7 +26,7 @@ public class Entry { return "Entry{}"; } - public static class R implements Record { + public static class R implements VDMRecord { public Entry e; public R(final Entry _e) { diff --git a/core/codegen/javagen/src/test/resources/complex_expressions/FieldDesignatorOfRecObjChainOfThree.vdmpp.result b/core/codegen/javagen/src/test/resources/complex_expressions/FieldDesignatorOfRecObjChainOfThree.vdmpp.result index 06fdbc60f3..b6024988d2 100644 --- a/core/codegen/javagen/src/test/resources/complex_expressions/FieldDesignatorOfRecObjChainOfThree.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/complex_expressions/FieldDesignatorOfRecObjChainOfThree.vdmpp.result @@ -26,7 +26,7 @@ public class Entry { return "Entry{}"; } - public static class R1 implements Record { + public static class R1 implements VDMRecord { public R2 r2; public R1(final R2 _r2) { @@ -61,7 +61,7 @@ public class Entry { } } - public static class R2 implements Record { + public static class R2 implements VDMRecord { public R3 r3; public R2(final R3 _r3) { @@ -96,7 +96,7 @@ public class Entry { } } - public static class R3 implements Record { + public static class R3 implements VDMRecord { public Entry e; public R3(final Entry _e) { diff --git a/core/codegen/javagen/src/test/resources/complex_expressions/FieldDesignatorOfRecObjChainOfTwo.vdmpp.result b/core/codegen/javagen/src/test/resources/complex_expressions/FieldDesignatorOfRecObjChainOfTwo.vdmpp.result index 405fba7f45..ef6a5125cb 100644 --- a/core/codegen/javagen/src/test/resources/complex_expressions/FieldDesignatorOfRecObjChainOfTwo.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/complex_expressions/FieldDesignatorOfRecObjChainOfTwo.vdmpp.result @@ -26,7 +26,7 @@ public class Entry { return "Entry{}"; } - public static class R1 implements Record { + public static class R1 implements VDMRecord { public R2 r2; public R1(final R2 _r2) { @@ -61,7 +61,7 @@ public class Entry { } } - public static class R2 implements Record { + public static class R2 implements VDMRecord { public Entry e; public R2(final Entry _e) { diff --git a/core/codegen/javagen/src/test/resources/complex_expressions/MapSeqStateDesignatorChangeRecField.vdmpp.result b/core/codegen/javagen/src/test/resources/complex_expressions/MapSeqStateDesignatorChangeRecField.vdmpp.result index 24fcaec246..81a7483f47 100644 --- a/core/codegen/javagen/src/test/resources/complex_expressions/MapSeqStateDesignatorChangeRecField.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/complex_expressions/MapSeqStateDesignatorChangeRecField.vdmpp.result @@ -32,7 +32,7 @@ public class Entry { return "Entry{" + "m := " + Utils.toString(m) + "}"; } - private static class Rec implements Record { + private static class Rec implements VDMRecord { public Number field; public Rec(final Number _field) { diff --git a/core/codegen/javagen/src/test/resources/complex_expressions/MapSeqStateDesignatorNesting.vdmpp.result b/core/codegen/javagen/src/test/resources/complex_expressions/MapSeqStateDesignatorNesting.vdmpp.result index 034d68f322..f488ff9c31 100644 --- a/core/codegen/javagen/src/test/resources/complex_expressions/MapSeqStateDesignatorNesting.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/complex_expressions/MapSeqStateDesignatorNesting.vdmpp.result @@ -18,7 +18,7 @@ public class Entry { return "Entry{}"; } - public static class A implements Record { + public static class A implements VDMRecord { public VDMMap x; public A(final VDMMap _x) { diff --git a/core/codegen/javagen/src/test/resources/complex_expressions/NarrowRecordFieldAccess.vdmpp.result b/core/codegen/javagen/src/test/resources/complex_expressions/NarrowRecordFieldAccess.vdmpp.result index e1420129c8..603eadf7b5 100644 --- a/core/codegen/javagen/src/test/resources/complex_expressions/NarrowRecordFieldAccess.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/complex_expressions/NarrowRecordFieldAccess.vdmpp.result @@ -17,7 +17,7 @@ public class Entry { return "Entry{}"; } - private static class R implements Record { + private static class R implements VDMRecord { public Number x; public R(final Number _x) { diff --git a/core/codegen/javagen/src/test/resources/complex_expressions/OptionallyTypedRecordFieldComparison.vdmpp.result b/core/codegen/javagen/src/test/resources/complex_expressions/OptionallyTypedRecordFieldComparison.vdmpp.result index 586deaaf50..4e5ab806a5 100644 --- a/core/codegen/javagen/src/test/resources/complex_expressions/OptionallyTypedRecordFieldComparison.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/complex_expressions/OptionallyTypedRecordFieldComparison.vdmpp.result @@ -36,7 +36,7 @@ public class Entry { return "Entry{}"; } - private static class NatList implements Record { + private static class NatList implements VDMRecord { public Number e; public NatList t; diff --git a/core/codegen/javagen/src/test/resources/complex_expressions/RecModExpArgToApplyExp.vdmpp.result b/core/codegen/javagen/src/test/resources/complex_expressions/RecModExpArgToApplyExp.vdmpp.result index 14061ab0aa..11f9f91b42 100644 --- a/core/codegen/javagen/src/test/resources/complex_expressions/RecModExpArgToApplyExp.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/complex_expressions/RecModExpArgToApplyExp.vdmpp.result @@ -31,7 +31,7 @@ public class Entry { return "Entry{}"; } - public static class Rec implements Record { + public static class Rec implements VDMRecord { public Number a; public Boolean b; diff --git a/core/codegen/javagen/src/test/resources/complex_expressions/RecModExpForAllExp.vdmpp.result b/core/codegen/javagen/src/test/resources/complex_expressions/RecModExpForAllExp.vdmpp.result index 01873d7986..d1ccb1a90f 100644 --- a/core/codegen/javagen/src/test/resources/complex_expressions/RecModExpForAllExp.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/complex_expressions/RecModExpForAllExp.vdmpp.result @@ -35,7 +35,7 @@ public class Entry { return "Entry{}"; } - public static class Rec implements Record { + public static class Rec implements VDMRecord { public Number x; public Boolean b; diff --git a/core/codegen/javagen/src/test/resources/complex_expressions/RecModExpInRecModExp.vdmpp.result b/core/codegen/javagen/src/test/resources/complex_expressions/RecModExpInRecModExp.vdmpp.result index be9bd3034e..9cc7b26a36 100644 --- a/core/codegen/javagen/src/test/resources/complex_expressions/RecModExpInRecModExp.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/complex_expressions/RecModExpInRecModExp.vdmpp.result @@ -30,7 +30,7 @@ public class Entry { return "Entry{}"; } - public static class Rec1 implements Record { + public static class Rec1 implements VDMRecord { public Number a; public Rec2 b; @@ -67,7 +67,7 @@ public class Entry { } } - public static class Rec2 implements Record { + public static class Rec2 implements VDMRecord { public Number c; public Rec1 d; diff --git a/core/codegen/javagen/src/test/resources/complex_expressions/RecModExpSimple1.vdmpp.result b/core/codegen/javagen/src/test/resources/complex_expressions/RecModExpSimple1.vdmpp.result index a1561da164..a7949df208 100644 --- a/core/codegen/javagen/src/test/resources/complex_expressions/RecModExpSimple1.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/complex_expressions/RecModExpSimple1.vdmpp.result @@ -23,7 +23,7 @@ public class Entry { return "Entry{}"; } - public static class Rec implements Record { + public static class Rec implements VDMRecord { public Number x; public Boolean b; diff --git a/core/codegen/javagen/src/test/resources/complex_expressions/RecModExpVarExp.vdmpp.result b/core/codegen/javagen/src/test/resources/complex_expressions/RecModExpVarExp.vdmpp.result index 74c1fd9538..5bb380347e 100644 --- a/core/codegen/javagen/src/test/resources/complex_expressions/RecModExpVarExp.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/complex_expressions/RecModExpVarExp.vdmpp.result @@ -25,7 +25,7 @@ public class Entry { return "Entry{}"; } - public static class Rec implements Record { + public static class Rec implements VDMRecord { public Number x; public Boolean b; diff --git a/core/codegen/javagen/src/test/resources/complex_expressions/RecNoFieldNames.vdmpp.result b/core/codegen/javagen/src/test/resources/complex_expressions/RecNoFieldNames.vdmpp.result index 0a46aaac06..3708691c34 100644 --- a/core/codegen/javagen/src/test/resources/complex_expressions/RecNoFieldNames.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/complex_expressions/RecNoFieldNames.vdmpp.result @@ -28,7 +28,7 @@ public class Entry { return "Entry{}"; } - public static class A implements Record { + public static class A implements VDMRecord { public Number _X_; public Number _X__1; diff --git a/core/codegen/javagen/src/test/resources/complex_expressions/RecordComp.vdmpp.result b/core/codegen/javagen/src/test/resources/complex_expressions/RecordComp.vdmpp.result index 1b6c0fb242..102f115dc4 100644 --- a/core/codegen/javagen/src/test/resources/complex_expressions/RecordComp.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/complex_expressions/RecordComp.vdmpp.result @@ -19,7 +19,7 @@ public class A { return "A{}"; } - public static class Vector2D implements Record { + public static class Vector2D implements VDMRecord { public Number x; public Number y; diff --git a/core/codegen/javagen/src/test/resources/complex_expressions/RecordUsageAcrossClass.vdmpp.result b/core/codegen/javagen/src/test/resources/complex_expressions/RecordUsageAcrossClass.vdmpp.result index f5c6a06b94..cbefe2a870 100644 --- a/core/codegen/javagen/src/test/resources/complex_expressions/RecordUsageAcrossClass.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/complex_expressions/RecordUsageAcrossClass.vdmpp.result @@ -11,7 +11,7 @@ public class A { return "A{}"; } - public static class Rec implements Record { + public static class Rec implements VDMRecord { public Rec() {} diff --git a/core/codegen/javagen/src/test/resources/complex_expressions/RecordValue.vdmpp.result b/core/codegen/javagen/src/test/resources/complex_expressions/RecordValue.vdmpp.result index 25c1ab1cf6..4eae4c39db 100644 --- a/core/codegen/javagen/src/test/resources/complex_expressions/RecordValue.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/complex_expressions/RecordValue.vdmpp.result @@ -16,7 +16,7 @@ public class A { return "A{}"; } - public static class Node implements Record { + public static class Node implements VDMRecord { public Number e; public Node r; diff --git a/core/codegen/javagen/src/test/resources/complex_expressions/UnknownTypeArgInNewExp.vdmpp.result b/core/codegen/javagen/src/test/resources/complex_expressions/UnknownTypeArgInNewExp.vdmpp.result index d2c22aff36..95498268e1 100644 --- a/core/codegen/javagen/src/test/resources/complex_expressions/UnknownTypeArgInNewExp.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/complex_expressions/UnknownTypeArgInNewExp.vdmpp.result @@ -23,7 +23,7 @@ public class Entry { return "Entry{}"; } - private static class R implements Record { + private static class R implements VDMRecord { public Number x; public R(final Number _x) { diff --git a/core/codegen/javagen/src/test/resources/concurrency_classics_specs/POP3_LogBased_Test1.vdmpp.result b/core/codegen/javagen/src/test/resources/concurrency_classics_specs/POP3_LogBased_Test1.vdmpp.result index c7c031a06a..04e6d95470 100644 --- a/core/codegen/javagen/src/test/resources/concurrency_classics_specs/POP3_LogBased_Test1.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/concurrency_classics_specs/POP3_LogBased_Test1.vdmpp.result @@ -2239,7 +2239,7 @@ public class POP3Server extends VDMThread implements EvaluatePP { } } - public static class MessageInfo implements Record { + public static class MessageInfo implements VDMRecord { public Number index; public Number size; @@ -2276,7 +2276,7 @@ public class POP3Server extends VDMThread implements EvaluatePP { } } - public static class MailBox implements Record { + public static class MailBox implements VDMRecord { public VDMSeq msgs; public Boolean locked; @@ -2917,7 +2917,7 @@ public class POP3Types implements EvaluatePP { } } - public static class QUIT implements Record { + public static class QUIT implements VDMRecord { public QUIT() {} @@ -2942,7 +2942,7 @@ public class POP3Types implements EvaluatePP { } } - public static class STAT implements Record { + public static class STAT implements VDMRecord { public STAT() {} @@ -2967,7 +2967,7 @@ public class POP3Types implements EvaluatePP { } } - public static class LIST implements Record { + public static class LIST implements VDMRecord { public Number messageNumber; public LIST(final Number _messageNumber) { @@ -3002,7 +3002,7 @@ public class POP3Types implements EvaluatePP { } } - public static class RETR implements Record { + public static class RETR implements VDMRecord { public Number messageNumber; public RETR(final Number _messageNumber) { @@ -3037,7 +3037,7 @@ public class POP3Types implements EvaluatePP { } } - public static class DELE implements Record { + public static class DELE implements VDMRecord { public Number messageNumber; public DELE(final Number _messageNumber) { @@ -3072,7 +3072,7 @@ public class POP3Types implements EvaluatePP { } } - public static class NOOP implements Record { + public static class NOOP implements VDMRecord { public NOOP() {} @@ -3097,7 +3097,7 @@ public class POP3Types implements EvaluatePP { } } - public static class RSET implements Record { + public static class RSET implements VDMRecord { public RSET() {} @@ -3122,7 +3122,7 @@ public class POP3Types implements EvaluatePP { } } - public static class TOP implements Record { + public static class TOP implements VDMRecord { public Number messageNumber; public Number numLines; @@ -3160,7 +3160,7 @@ public class POP3Types implements EvaluatePP { } } - public static class UIDL implements Record { + public static class UIDL implements VDMRecord { public Number messageNumber; public UIDL(final Number _messageNumber) { @@ -3195,7 +3195,7 @@ public class POP3Types implements EvaluatePP { } } - public static class USER implements Record { + public static class USER implements VDMRecord { public String name; public USER(final String _name) { @@ -3230,7 +3230,7 @@ public class POP3Types implements EvaluatePP { } } - public static class PASS implements Record { + public static class PASS implements VDMRecord { public String string; public PASS(final String _string) { @@ -3265,7 +3265,7 @@ public class POP3Types implements EvaluatePP { } } - public static class APOP implements Record { + public static class APOP implements VDMRecord { public String name; public String digest; @@ -3302,7 +3302,7 @@ public class POP3Types implements EvaluatePP { } } - public static class OkResponse implements Record { + public static class OkResponse implements VDMRecord { public String data; public OkResponse(final String _data) { @@ -3337,7 +3337,7 @@ public class POP3Types implements EvaluatePP { } } - public static class ErrResponse implements Record { + public static class ErrResponse implements VDMRecord { public String data; public ErrResponse(final String _data) { diff --git a/core/codegen/javagen/src/test/resources/is_expressions/IsExp.vdmpp.result b/core/codegen/javagen/src/test/resources/is_expressions/IsExp.vdmpp.result index 3d4a5af9b2..f5fec087e0 100644 --- a/core/codegen/javagen/src/test/resources/is_expressions/IsExp.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/is_expressions/IsExp.vdmpp.result @@ -37,7 +37,7 @@ public class Entry { return "Entry{}"; } - private static class Rec implements Record { + private static class Rec implements VDMRecord { public Number x; public Number y; diff --git a/core/codegen/javagen/src/test/resources/is_expressions/IsExpPolyType.vdmpp.result b/core/codegen/javagen/src/test/resources/is_expressions/IsExpPolyType.vdmpp.result index bf93c315b2..b37928b08e 100644 --- a/core/codegen/javagen/src/test/resources/is_expressions/IsExpPolyType.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/is_expressions/IsExpPolyType.vdmpp.result @@ -69,7 +69,7 @@ public class Entry { return "Entry{}"; } - private static class RecA implements Record { + private static class RecA implements VDMRecord { public Number a; public Number b; @@ -106,7 +106,7 @@ public class Entry { } } - private static class RecB implements Record { + private static class RecB implements VDMRecord { public Boolean c; public RecB(final Boolean _c) { diff --git a/core/codegen/javagen/src/test/resources/package_specs/RecordUsageAcrossClassSimple.vdmpp.result b/core/codegen/javagen/src/test/resources/package_specs/RecordUsageAcrossClassSimple.vdmpp.result index 2f184a0a74..a5ce2a7e71 100644 --- a/core/codegen/javagen/src/test/resources/package_specs/RecordUsageAcrossClassSimple.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/package_specs/RecordUsageAcrossClassSimple.vdmpp.result @@ -12,7 +12,7 @@ public class A { return "A{}"; } - public static class Rec implements Record { + public static class Rec implements VDMRecord { public Number n; public Rec(final Number _n) { diff --git a/core/codegen/javagen/src/test/resources/pattern_specs/BlockWithInterdependentPatterns.vdmpp.result b/core/codegen/javagen/src/test/resources/pattern_specs/BlockWithInterdependentPatterns.vdmpp.result index 8b899335fc..8ca5ae6a2c 100644 --- a/core/codegen/javagen/src/test/resources/pattern_specs/BlockWithInterdependentPatterns.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/pattern_specs/BlockWithInterdependentPatterns.vdmpp.result @@ -70,7 +70,7 @@ public class Entry { return "Entry{}"; } - private static class Rec implements Record { + private static class Rec implements VDMRecord { public Number f1; public Number f2; diff --git a/core/codegen/javagen/src/test/resources/pattern_specs/CasesExpRec.vdmpp.result b/core/codegen/javagen/src/test/resources/pattern_specs/CasesExpRec.vdmpp.result index da8b06e7e8..ecf2186b3d 100644 --- a/core/codegen/javagen/src/test/resources/pattern_specs/CasesExpRec.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/pattern_specs/CasesExpRec.vdmpp.result @@ -95,7 +95,7 @@ public class Entry { return "Entry{}"; } - public static class Rec implements Record { + public static class Rec implements VDMRecord { public Number a; public Number b; public Number c; diff --git a/core/codegen/javagen/src/test/resources/pattern_specs/CasesExpRecordPatternNamedInvariantUnionTypedExp.vdmpp.result b/core/codegen/javagen/src/test/resources/pattern_specs/CasesExpRecordPatternNamedInvariantUnionTypedExp.vdmpp.result index 09b08e0d85..26c40ede8b 100644 --- a/core/codegen/javagen/src/test/resources/pattern_specs/CasesExpRecordPatternNamedInvariantUnionTypedExp.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/pattern_specs/CasesExpRecordPatternNamedInvariantUnionTypedExp.vdmpp.result @@ -64,7 +64,7 @@ public class Entry { return "Entry{}"; } - public static class R1 implements Record { + public static class R1 implements VDMRecord { public Number a; public Number b; @@ -101,7 +101,7 @@ public class Entry { } } - public static class R2 implements Record { + public static class R2 implements VDMRecord { public Boolean c; public Character d; diff --git a/core/codegen/javagen/src/test/resources/pattern_specs/CasesStmOpCallExp.vdmpp.result b/core/codegen/javagen/src/test/resources/pattern_specs/CasesStmOpCallExp.vdmpp.result index 1e2626ef51..4a8f191936 100644 --- a/core/codegen/javagen/src/test/resources/pattern_specs/CasesStmOpCallExp.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/pattern_specs/CasesStmOpCallExp.vdmpp.result @@ -66,7 +66,7 @@ public class Entry { return "Entry{}"; } - public static class A implements Record { + public static class A implements VDMRecord { public Number a; public A(final Number _a) { @@ -101,7 +101,7 @@ public class Entry { } } - public static class B implements Record { + public static class B implements VDMRecord { public Number b; public B(final Number _b) { diff --git a/core/codegen/javagen/src/test/resources/pattern_specs/CasesStmRec.vdmpp.result b/core/codegen/javagen/src/test/resources/pattern_specs/CasesStmRec.vdmpp.result index ca446708f1..ae1703bc3a 100644 --- a/core/codegen/javagen/src/test/resources/pattern_specs/CasesStmRec.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/pattern_specs/CasesStmRec.vdmpp.result @@ -92,7 +92,7 @@ public class Entry { return "Entry{}"; } - public static class Rec implements Record { + public static class Rec implements VDMRecord { public Number a; public Number b; public Number c; diff --git a/core/codegen/javagen/src/test/resources/pattern_specs/CasesStmRecordPatternNamedInvariantUnionTypedExp.vdmpp.result b/core/codegen/javagen/src/test/resources/pattern_specs/CasesStmRecordPatternNamedInvariantUnionTypedExp.vdmpp.result index 26e9272d05..c0fdcbf32e 100644 --- a/core/codegen/javagen/src/test/resources/pattern_specs/CasesStmRecordPatternNamedInvariantUnionTypedExp.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/pattern_specs/CasesStmRecordPatternNamedInvariantUnionTypedExp.vdmpp.result @@ -61,7 +61,7 @@ public class Entry { return "Entry{}"; } - public static class R1 implements Record { + public static class R1 implements VDMRecord { public Number a; public Number b; @@ -98,7 +98,7 @@ public class Entry { } } - public static class R2 implements Record { + public static class R2 implements VDMRecord { public Boolean c; public Character d; diff --git a/core/codegen/javagen/src/test/resources/pattern_specs/LetBeStRecPattern.vdmpp.result b/core/codegen/javagen/src/test/resources/pattern_specs/LetBeStRecPattern.vdmpp.result index 8962d34825..ee025d0b0c 100644 --- a/core/codegen/javagen/src/test/resources/pattern_specs/LetBeStRecPattern.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/pattern_specs/LetBeStRecPattern.vdmpp.result @@ -42,7 +42,7 @@ public class Entry { return "Entry{" + "xs = " + Utils.toString(xs) + "}"; } - private static class A implements Record { + private static class A implements VDMRecord { public Number a; public A(final Number _a) { diff --git a/core/codegen/javagen/src/test/resources/pattern_specs/RecordLastFieldInt.vdmpp.result b/core/codegen/javagen/src/test/resources/pattern_specs/RecordLastFieldInt.vdmpp.result index ad9c0781e3..c6f7b16648 100644 --- a/core/codegen/javagen/src/test/resources/pattern_specs/RecordLastFieldInt.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/pattern_specs/RecordLastFieldInt.vdmpp.result @@ -27,7 +27,7 @@ public class A { return "A{}"; } - public static class Rec implements Record { + public static class Rec implements VDMRecord { public Number n1; public Number n2; diff --git a/core/codegen/javagen/src/test/resources/pattern_specs/RecordNoFields.vdmpp.result b/core/codegen/javagen/src/test/resources/pattern_specs/RecordNoFields.vdmpp.result index 6d8408e998..1fdc242f71 100644 --- a/core/codegen/javagen/src/test/resources/pattern_specs/RecordNoFields.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/pattern_specs/RecordNoFields.vdmpp.result @@ -22,7 +22,7 @@ public class A { return "A{}"; } - public static class Rec implements Record { + public static class Rec implements VDMRecord { public Rec() {} diff --git a/core/codegen/javagen/src/test/resources/pattern_specs/RecordPatternIdentifierPatterns.vdmpp.result b/core/codegen/javagen/src/test/resources/pattern_specs/RecordPatternIdentifierPatterns.vdmpp.result index cc76510d22..6c0740cdfa 100644 --- a/core/codegen/javagen/src/test/resources/pattern_specs/RecordPatternIdentifierPatterns.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/pattern_specs/RecordPatternIdentifierPatterns.vdmpp.result @@ -86,7 +86,7 @@ public class Entry { return "Entry{}"; } - public static class Rec implements Record { + public static class Rec implements VDMRecord { public Number n; public Boolean b; public Character c; diff --git a/core/codegen/javagen/src/test/resources/pattern_specs/RecordPatternWithSimplePatterns.vdmpp.result b/core/codegen/javagen/src/test/resources/pattern_specs/RecordPatternWithSimplePatterns.vdmpp.result index 30b554f9fe..e9b2012777 100644 --- a/core/codegen/javagen/src/test/resources/pattern_specs/RecordPatternWithSimplePatterns.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/pattern_specs/RecordPatternWithSimplePatterns.vdmpp.result @@ -50,7 +50,7 @@ public class A { return "A{}"; } - public static class Rec implements Record { + public static class Rec implements VDMRecord { public Number n; public Boolean b; public Character c; diff --git a/core/codegen/javagen/src/test/resources/pattern_specs/RecordWithFieldOfUnknownType.vdmpp.result b/core/codegen/javagen/src/test/resources/pattern_specs/RecordWithFieldOfUnknownType.vdmpp.result index 597507f0fa..f634b14b18 100644 --- a/core/codegen/javagen/src/test/resources/pattern_specs/RecordWithFieldOfUnknownType.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/pattern_specs/RecordWithFieldOfUnknownType.vdmpp.result @@ -35,7 +35,7 @@ public class Entry { return "Entry{}"; } - private static class R implements Record { + private static class R implements VDMRecord { public Object f; public R(final Object _f) { diff --git a/core/codegen/javagen/src/test/resources/pattern_specs/RecordWithIgnorePattern.vdmpp.result b/core/codegen/javagen/src/test/resources/pattern_specs/RecordWithIgnorePattern.vdmpp.result index 24ce2499d3..b213b56922 100644 --- a/core/codegen/javagen/src/test/resources/pattern_specs/RecordWithIgnorePattern.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/pattern_specs/RecordWithIgnorePattern.vdmpp.result @@ -31,7 +31,7 @@ public class A { return "A{}"; } - public static class Rec implements Record { + public static class Rec implements VDMRecord { public Number n; public Rec next; diff --git a/core/codegen/javagen/src/test/resources/pattern_specs/RecordWithTuple.vdmpp.result b/core/codegen/javagen/src/test/resources/pattern_specs/RecordWithTuple.vdmpp.result index 9262817131..60443ddb21 100644 --- a/core/codegen/javagen/src/test/resources/pattern_specs/RecordWithTuple.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/pattern_specs/RecordWithTuple.vdmpp.result @@ -39,7 +39,7 @@ public class A { return "A{}"; } - public static class Rec implements Record { + public static class Rec implements VDMRecord { public Tuple t; public Rec(final Tuple _t) { diff --git a/core/codegen/javagen/src/test/resources/pattern_specs/TupleWithRecord.vdmpp.result b/core/codegen/javagen/src/test/resources/pattern_specs/TupleWithRecord.vdmpp.result index d2e643d684..ad940de055 100644 --- a/core/codegen/javagen/src/test/resources/pattern_specs/TupleWithRecord.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/pattern_specs/TupleWithRecord.vdmpp.result @@ -46,7 +46,7 @@ public class A { return "A{}"; } - public static class Rec implements Record { + public static class Rec implements VDMRecord { public Tuple t; public Rec(final Tuple _t) { diff --git a/core/codegen/javagen/src/test/resources/sl_specs/ExtendedExplicitOpCallPostCond.vdmsl.result b/core/codegen/javagen/src/test/resources/sl_specs/ExtendedExplicitOpCallPostCond.vdmsl.result index c93826e0a3..caa79637d3 100644 --- a/core/codegen/javagen/src/test/resources/sl_specs/ExtendedExplicitOpCallPostCond.vdmsl.result +++ b/core/codegen/javagen/src/test/resources/sl_specs/ExtendedExplicitOpCallPostCond.vdmsl.result @@ -40,7 +40,7 @@ final public class Entry { return "Entry{" + "St := " + Utils.toString(St) + "}"; } - public static class St implements Record { + public static class St implements VDMRecord { public Number x; public St(final Number _x) { diff --git a/core/codegen/javagen/src/test/resources/sl_specs/IdNormalising.vdmsl.result b/core/codegen/javagen/src/test/resources/sl_specs/IdNormalising.vdmsl.result index bc0e1f5e94..e32b99f559 100644 --- a/core/codegen/javagen/src/test/resources/sl_specs/IdNormalising.vdmsl.result +++ b/core/codegen/javagen/src/test/resources/sl_specs/IdNormalising.vdmsl.result @@ -24,7 +24,7 @@ final public class Entry { return "Entry{" + "St := " + Utils.toString(St) + "}"; } - public static class St implements Record { + public static class St implements VDMRecord { public Number x_X_; public St(final Number _x_X_) { diff --git a/core/codegen/javagen/src/test/resources/sl_specs/ImplicitOperation.vdmsl.result b/core/codegen/javagen/src/test/resources/sl_specs/ImplicitOperation.vdmsl.result index 9a0797a396..f4f9c0e304 100644 --- a/core/codegen/javagen/src/test/resources/sl_specs/ImplicitOperation.vdmsl.result +++ b/core/codegen/javagen/src/test/resources/sl_specs/ImplicitOperation.vdmsl.result @@ -24,7 +24,7 @@ final public class Entry { return "Entry{" + "St := " + Utils.toString(St) + "}"; } - public static class St implements Record { + public static class St implements VDMRecord { public Number id; public St(final Number _id) { diff --git a/core/codegen/javagen/src/test/resources/sl_specs/InvariantWithLet.vdmsl.result b/core/codegen/javagen/src/test/resources/sl_specs/InvariantWithLet.vdmsl.result index 614382b243..563b1621a9 100644 --- a/core/codegen/javagen/src/test/resources/sl_specs/InvariantWithLet.vdmsl.result +++ b/core/codegen/javagen/src/test/resources/sl_specs/InvariantWithLet.vdmsl.result @@ -30,7 +30,7 @@ final public class Entry { return "Entry{" + "St := " + Utils.toString(St) + "}"; } - public static class St implements Record { + public static class St implements VDMRecord { public Number field; public St(final Number _field) { diff --git a/core/codegen/javagen/src/test/resources/sl_specs/ModifyStateExplicit.vdmsl.result b/core/codegen/javagen/src/test/resources/sl_specs/ModifyStateExplicit.vdmsl.result index 80deec987c..98ef1826f0 100644 --- a/core/codegen/javagen/src/test/resources/sl_specs/ModifyStateExplicit.vdmsl.result +++ b/core/codegen/javagen/src/test/resources/sl_specs/ModifyStateExplicit.vdmsl.result @@ -19,7 +19,7 @@ final public class Entry { return "Entry{" + "St := " + Utils.toString(St) + "}"; } - public static class St implements Record { + public static class St implements VDMRecord { public Number x; public St(final Number _x) { diff --git a/core/codegen/javagen/src/test/resources/sl_specs/ModifyStateImplicit.vdmsl.result b/core/codegen/javagen/src/test/resources/sl_specs/ModifyStateImplicit.vdmsl.result index 6aaf97c653..979f51763b 100644 --- a/core/codegen/javagen/src/test/resources/sl_specs/ModifyStateImplicit.vdmsl.result +++ b/core/codegen/javagen/src/test/resources/sl_specs/ModifyStateImplicit.vdmsl.result @@ -19,7 +19,7 @@ final public class Entry { return "Entry{" + "St := " + Utils.toString(St) + "}"; } - public static class St implements Record { + public static class St implements VDMRecord { public Number x; public St(final Number _x) { diff --git a/core/codegen/javagen/src/test/resources/sl_specs/ModifyStateRecFieldExplicit.vdmsl.result b/core/codegen/javagen/src/test/resources/sl_specs/ModifyStateRecFieldExplicit.vdmsl.result index 9daf4833cb..5d6cd9bbd8 100644 --- a/core/codegen/javagen/src/test/resources/sl_specs/ModifyStateRecFieldExplicit.vdmsl.result +++ b/core/codegen/javagen/src/test/resources/sl_specs/ModifyStateRecFieldExplicit.vdmsl.result @@ -19,7 +19,7 @@ final public class Entry { return "Entry{" + "St := " + Utils.toString(St) + "}"; } - public static class R implements Record { + public static class R implements VDMRecord { public Number r; public R(final Number _r) { @@ -54,7 +54,7 @@ final public class Entry { } } - public static class St implements Record { + public static class St implements VDMRecord { public R x; public St(final R _x) { diff --git a/core/codegen/javagen/src/test/resources/sl_specs/ModifyStateRecFieldImplicit.vdmsl.result b/core/codegen/javagen/src/test/resources/sl_specs/ModifyStateRecFieldImplicit.vdmsl.result index 6b2e48c944..bc14f2bd07 100644 --- a/core/codegen/javagen/src/test/resources/sl_specs/ModifyStateRecFieldImplicit.vdmsl.result +++ b/core/codegen/javagen/src/test/resources/sl_specs/ModifyStateRecFieldImplicit.vdmsl.result @@ -19,7 +19,7 @@ final public class Entry { return "Entry{" + "St := " + Utils.toString(St) + "}"; } - public static class R implements Record { + public static class R implements VDMRecord { public Number r; public R(final Number _r) { @@ -54,7 +54,7 @@ final public class Entry { } } - public static class St implements Record { + public static class St implements VDMRecord { public R x; public St(final R _x) { diff --git a/core/codegen/javagen/src/test/resources/sl_specs/ModifyUninitialisedState.vdmsl.result b/core/codegen/javagen/src/test/resources/sl_specs/ModifyUninitialisedState.vdmsl.result index 8ff319a9f1..8d40e1a165 100644 --- a/core/codegen/javagen/src/test/resources/sl_specs/ModifyUninitialisedState.vdmsl.result +++ b/core/codegen/javagen/src/test/resources/sl_specs/ModifyUninitialisedState.vdmsl.result @@ -19,7 +19,7 @@ final public class Entry { return "Entry{" + "St := " + Utils.toString(St) + "}"; } - public static class St implements Record { + public static class St implements VDMRecord { public Number x; public St(final Number _x) { diff --git a/core/codegen/javagen/src/test/resources/sl_specs/ModuleNameSameAsStateName.vdmsl.result b/core/codegen/javagen/src/test/resources/sl_specs/ModuleNameSameAsStateName.vdmsl.result index 809e2475ce..587cd8970c 100644 --- a/core/codegen/javagen/src/test/resources/sl_specs/ModuleNameSameAsStateName.vdmsl.result +++ b/core/codegen/javagen/src/test/resources/sl_specs/ModuleNameSameAsStateName.vdmsl.result @@ -54,7 +54,7 @@ final public class A_Module { return "A_Module{" + "A := " + Utils.toString(A) + "}"; } - public static class A implements Record { + public static class A implements VDMRecord { public Number id; public A(final Number _id) { @@ -104,7 +104,7 @@ final public class X_Module { return "X_Module{}"; } - public static class X implements Record { + public static class X implements VDMRecord { public Number x; public X(final Number _x) { diff --git a/core/codegen/javagen/src/test/resources/sl_specs/NormaliseAccessedStateField.vdmsl.result b/core/codegen/javagen/src/test/resources/sl_specs/NormaliseAccessedStateField.vdmsl.result index 0fec79900a..d24c997d24 100644 --- a/core/codegen/javagen/src/test/resources/sl_specs/NormaliseAccessedStateField.vdmsl.result +++ b/core/codegen/javagen/src/test/resources/sl_specs/NormaliseAccessedStateField.vdmsl.result @@ -24,7 +24,7 @@ final public class Entry { return "Entry{" + "St_X_ := " + Utils.toString(St_X_) + "}"; } - public static class St_X_ implements Record { + public static class St_X_ implements VDMRecord { public Number x_X_; public St_X_(final Number _x_X_) { diff --git a/core/codegen/javagen/src/test/resources/sl_specs/ReadStateExplicit.vdmsl.result b/core/codegen/javagen/src/test/resources/sl_specs/ReadStateExplicit.vdmsl.result index de163c5e7b..1ade113160 100644 --- a/core/codegen/javagen/src/test/resources/sl_specs/ReadStateExplicit.vdmsl.result +++ b/core/codegen/javagen/src/test/resources/sl_specs/ReadStateExplicit.vdmsl.result @@ -18,7 +18,7 @@ final public class Entry { return "Entry{" + "St := " + Utils.toString(St) + "}"; } - public static class St implements Record { + public static class St implements VDMRecord { public Number x; public St(final Number _x) { diff --git a/core/codegen/javagen/src/test/resources/sl_specs/ReadStateImplicit.vdmsl.result b/core/codegen/javagen/src/test/resources/sl_specs/ReadStateImplicit.vdmsl.result index 0865ade0f4..b2558ed5a6 100644 --- a/core/codegen/javagen/src/test/resources/sl_specs/ReadStateImplicit.vdmsl.result +++ b/core/codegen/javagen/src/test/resources/sl_specs/ReadStateImplicit.vdmsl.result @@ -18,7 +18,7 @@ final public class Entry { return "Entry{" + "St := " + Utils.toString(St) + "}"; } - public static class St implements Record { + public static class St implements VDMRecord { public Number x; public St(final Number _x) { diff --git a/core/codegen/javagen/src/test/resources/sl_specs/ReadStateWithRecFieldImplicit.vdmsl.result b/core/codegen/javagen/src/test/resources/sl_specs/ReadStateWithRecFieldImplicit.vdmsl.result index 2e3d5d4cfa..235caf51ba 100644 --- a/core/codegen/javagen/src/test/resources/sl_specs/ReadStateWithRecFieldImplicit.vdmsl.result +++ b/core/codegen/javagen/src/test/resources/sl_specs/ReadStateWithRecFieldImplicit.vdmsl.result @@ -18,7 +18,7 @@ final public class Entry { return "Entry{" + "St := " + Utils.toString(St) + "}"; } - public static class R implements Record { + public static class R implements VDMRecord { public Number r; public R(final Number _r) { @@ -53,7 +53,7 @@ final public class Entry { } } - public static class St implements Record { + public static class St implements VDMRecord { public R x; public St(final R _x) { diff --git a/core/codegen/javagen/src/test/resources/sl_specs/StateFieldModuleValueSameName.vdmsl.result b/core/codegen/javagen/src/test/resources/sl_specs/StateFieldModuleValueSameName.vdmsl.result index e1a5a5214a..83dd81fde7 100644 --- a/core/codegen/javagen/src/test/resources/sl_specs/StateFieldModuleValueSameName.vdmsl.result +++ b/core/codegen/javagen/src/test/resources/sl_specs/StateFieldModuleValueSameName.vdmsl.result @@ -18,7 +18,7 @@ final public class Entry { return "Entry{" + "Other := " + Utils.toString(Other) + "}"; } - public static class Other implements Record { + public static class Other implements VDMRecord { public Number x; public Other(final Number _x) { diff --git a/core/codegen/javagen/src/test/resources/sl_specs/ValueDef.vdmsl.result b/core/codegen/javagen/src/test/resources/sl_specs/ValueDef.vdmsl.result index 42cddfdfa4..ec2a054fb5 100644 --- a/core/codegen/javagen/src/test/resources/sl_specs/ValueDef.vdmsl.result +++ b/core/codegen/javagen/src/test/resources/sl_specs/ValueDef.vdmsl.result @@ -19,7 +19,7 @@ final public class Entry { return "Entry{" + "x = " + Utils.toString(x) + ", St := " + Utils.toString(St) + "}"; } - public static class St implements Record { + public static class St implements VDMRecord { public Number p; public St(final Number _p) { diff --git a/core/codegen/javagen/src/test/resources/sl_specs/VarShadowingOpFunc.vdmsl.result b/core/codegen/javagen/src/test/resources/sl_specs/VarShadowingOpFunc.vdmsl.result index dae90435f5..c975354fdb 100644 --- a/core/codegen/javagen/src/test/resources/sl_specs/VarShadowingOpFunc.vdmsl.result +++ b/core/codegen/javagen/src/test/resources/sl_specs/VarShadowingOpFunc.vdmsl.result @@ -27,7 +27,7 @@ final public class Entry { return "Entry{" + "St := " + Utils.toString(St) + "}"; } - public static class St implements Record { + public static class St implements VDMRecord { public Number x; public St(final Number _x) { diff --git a/core/codegen/javagen/src/test/resources/sl_specs/VarShadowingState.vdmsl.result b/core/codegen/javagen/src/test/resources/sl_specs/VarShadowingState.vdmsl.result index 05116497d0..adc46c1734 100644 --- a/core/codegen/javagen/src/test/resources/sl_specs/VarShadowingState.vdmsl.result +++ b/core/codegen/javagen/src/test/resources/sl_specs/VarShadowingState.vdmsl.result @@ -19,7 +19,7 @@ final public class Entry { return "Entry{" + "St := " + Utils.toString(St) + "}"; } - public static class St implements Record { + public static class St implements VDMRecord { public Number x; public St(final Number _x) { diff --git a/core/codegen/javagen/src/test/resources/specifications/ForAllSeqLoop.vdmpp.result b/core/codegen/javagen/src/test/resources/specifications/ForAllSeqLoop.vdmpp.result index 5abe58f0e9..b6067622d8 100644 --- a/core/codegen/javagen/src/test/resources/specifications/ForAllSeqLoop.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/specifications/ForAllSeqLoop.vdmpp.result @@ -63,7 +63,7 @@ public class A { return "A{}"; } - private static class Rec implements Record { + private static class Rec implements VDMRecord { public Number x; public Rec(final Number _x) { diff --git a/core/codegen/javagen/src/test/resources/specifications/ForAllSetLoop.vdmpp.result b/core/codegen/javagen/src/test/resources/specifications/ForAllSetLoop.vdmpp.result index 9ad4b172e8..2a16dade6a 100644 --- a/core/codegen/javagen/src/test/resources/specifications/ForAllSetLoop.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/specifications/ForAllSetLoop.vdmpp.result @@ -52,7 +52,7 @@ public class A { return "A{}"; } - private static class Rec implements Record { + private static class Rec implements VDMRecord { public Number x; public Rec(final Number _x) { diff --git a/core/codegen/javagen/src/test/resources/specifications/RecordComparison.vdmpp.result b/core/codegen/javagen/src/test/resources/specifications/RecordComparison.vdmpp.result index 8eb9601cad..d3a8ac8a26 100644 --- a/core/codegen/javagen/src/test/resources/specifications/RecordComparison.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/specifications/RecordComparison.vdmpp.result @@ -14,7 +14,7 @@ public class A { return "A{" + "a = " + Utils.toString(a) + ", b = " + Utils.toString(b) + "}"; } - public static class R implements Record { + public static class R implements VDMRecord { public Number x; public R(final Number _x) { diff --git a/core/codegen/javagen/src/test/resources/specifications/RecordCreation.vdmpp.result b/core/codegen/javagen/src/test/resources/specifications/RecordCreation.vdmpp.result index 2c380e756b..1df35f9411 100644 --- a/core/codegen/javagen/src/test/resources/specifications/RecordCreation.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/specifications/RecordCreation.vdmpp.result @@ -18,7 +18,7 @@ public class Records { return "Records{" + "v := " + Utils.toString(v) + "}"; } - public static class Vector2D implements Record { + public static class Vector2D implements VDMRecord { public Number x; public Number y; diff --git a/core/codegen/javagen/src/test/resources/specifications/RecordCycle.vdmpp.result b/core/codegen/javagen/src/test/resources/specifications/RecordCycle.vdmpp.result index 752243b784..94a9da3058 100644 --- a/core/codegen/javagen/src/test/resources/specifications/RecordCycle.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/specifications/RecordCycle.vdmpp.result @@ -11,7 +11,7 @@ public class A { return "A{}"; } - public static class RecA implements Record { + public static class RecA implements VDMRecord { public B.RecB b; public RecA(final B.RecB _b) { @@ -61,7 +61,7 @@ public class B { return "B{}"; } - public static class RecB implements Record { + public static class RecB implements VDMRecord { public A.RecA a; public RecB(final A.RecA _a) { diff --git a/core/codegen/javagen/src/test/resources/specifications/RecordDecls.vdmpp.result b/core/codegen/javagen/src/test/resources/specifications/RecordDecls.vdmpp.result index 4d00d624ab..a04c2b051f 100644 --- a/core/codegen/javagen/src/test/resources/specifications/RecordDecls.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/specifications/RecordDecls.vdmpp.result @@ -11,7 +11,7 @@ public class A { return "A{}"; } - private static class Vector2D implements Record { + private static class Vector2D implements VDMRecord { public Number x; public Number y; @@ -48,7 +48,7 @@ public class A { } } - public static class Real implements Record { + public static class Real implements VDMRecord { public Number r; public Real(final Number _r) { diff --git a/core/codegen/javagen/src/test/resources/specifications/RecordNesting.vdmpp.result b/core/codegen/javagen/src/test/resources/specifications/RecordNesting.vdmpp.result index 1f2f3bf8cf..5e32e3ad58 100644 --- a/core/codegen/javagen/src/test/resources/specifications/RecordNesting.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/specifications/RecordNesting.vdmpp.result @@ -14,7 +14,7 @@ public class A { return "A{" + "x = " + Utils.toString(x) + ", y = " + Utils.toString(y) + "}"; } - public static class R1 implements Record { + public static class R1 implements VDMRecord { public Number x; public R1(final Number _x) { @@ -49,7 +49,7 @@ public class A { } } - public static class R2 implements Record { + public static class R2 implements VDMRecord { public R1 r; public R2(final R1 _r) { @@ -84,7 +84,7 @@ public class A { } } - public static class R3 implements Record { + public static class R3 implements VDMRecord { public Number x; public R2 r; diff --git a/core/codegen/javagen/src/test/resources/specifications/RecordPrimitiveFields.vdmpp.result b/core/codegen/javagen/src/test/resources/specifications/RecordPrimitiveFields.vdmpp.result index ac8222ba07..a883ca5b3e 100644 --- a/core/codegen/javagen/src/test/resources/specifications/RecordPrimitiveFields.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/specifications/RecordPrimitiveFields.vdmpp.result @@ -11,7 +11,7 @@ public class A { return "A{}"; } - public static class RecA implements Record { + public static class RecA implements VDMRecord { public Number i; public Character c; public Number r; diff --git a/core/codegen/javagen/src/test/resources/specifications/RecordUsage.vdmpp.result b/core/codegen/javagen/src/test/resources/specifications/RecordUsage.vdmpp.result index 11273aef45..e54747a01a 100644 --- a/core/codegen/javagen/src/test/resources/specifications/RecordUsage.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/specifications/RecordUsage.vdmpp.result @@ -60,7 +60,7 @@ public class A { + "}"; } - public static class R1 implements Record { + public static class R1 implements VDMRecord { public Number x; public R1(final Number _x) { @@ -95,7 +95,7 @@ public class A { } } - public static class R2 implements Record { + public static class R2 implements VDMRecord { public R1 r1; public Number x; diff --git a/core/codegen/javagen/src/test/resources/specifications/RecordUsageAcrossClass.vdmpp.result b/core/codegen/javagen/src/test/resources/specifications/RecordUsageAcrossClass.vdmpp.result index 1ad23a4d40..e5b9021866 100644 --- a/core/codegen/javagen/src/test/resources/specifications/RecordUsageAcrossClass.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/specifications/RecordUsageAcrossClass.vdmpp.result @@ -14,7 +14,7 @@ public class A { return "A{" + "x = " + Utils.toString(x) + ", y = " + Utils.toString(y) + "}"; } - public static class RecA implements Record { + public static class RecA implements VDMRecord { public B.RecB b; public RecA(final B.RecB _b) { @@ -64,7 +64,7 @@ public class B { return "B{}"; } - public static class RecB implements Record { + public static class RecB implements VDMRecord { public Number b; public RecB(final Number _b) { diff --git a/core/codegen/javagen/src/test/resources/traces_expansion_specs/LetBeStRecPattern.vdmpp.result b/core/codegen/javagen/src/test/resources/traces_expansion_specs/LetBeStRecPattern.vdmpp.result index 490429a861..00aec2a0a2 100644 --- a/core/codegen/javagen/src/test/resources/traces_expansion_specs/LetBeStRecPattern.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/traces_expansion_specs/LetBeStRecPattern.vdmpp.result @@ -71,7 +71,7 @@ public class Entry implements java.io.Serializable { return "Entry{" + "xs = " + Utils.toString(xs) + "}"; } - private static class A implements Record { + private static class A implements VDMRecord { public Number a; public A(final Number _a) { diff --git a/core/codegen/javagen/src/test/resources/traces_sl_specs/ComplexStateSingleModule.vdmsl.result b/core/codegen/javagen/src/test/resources/traces_sl_specs/ComplexStateSingleModule.vdmsl.result index b067bdb2e9..e99f8ead67 100644 --- a/core/codegen/javagen/src/test/resources/traces_sl_specs/ComplexStateSingleModule.vdmsl.result +++ b/core/codegen/javagen/src/test/resources/traces_sl_specs/ComplexStateSingleModule.vdmsl.result @@ -51,7 +51,7 @@ final public class Entry implements java.io.Serializable { return "Entry{" + "St := " + Utils.toString(St) + "}"; } - public static class R implements Record { + public static class R implements VDMRecord { public Number x; public R(final Number _x) { @@ -86,7 +86,7 @@ final public class Entry implements java.io.Serializable { } } - public static class St implements Record { + public static class St implements VDMRecord { public R r; public St(final R _r) { diff --git a/core/codegen/javagen/src/test/resources/traces_sl_specs/NilRefError.vdmsl.result b/core/codegen/javagen/src/test/resources/traces_sl_specs/NilRefError.vdmsl.result index d52b838651..8d88d615b0 100644 --- a/core/codegen/javagen/src/test/resources/traces_sl_specs/NilRefError.vdmsl.result +++ b/core/codegen/javagen/src/test/resources/traces_sl_specs/NilRefError.vdmsl.result @@ -72,7 +72,7 @@ final public class Entry implements java.io.Serializable { return "Entry{" + "St := " + Utils.toString(St) + "}"; } - public static class St implements Record { + public static class St implements VDMRecord { public Number x; public St(final Number _x) { diff --git a/core/codegen/javagen/src/test/resources/traces_sl_specs/PreCondAccessState.vdmsl.result b/core/codegen/javagen/src/test/resources/traces_sl_specs/PreCondAccessState.vdmsl.result index 3dcf2c0bc6..cefdec21a8 100644 --- a/core/codegen/javagen/src/test/resources/traces_sl_specs/PreCondAccessState.vdmsl.result +++ b/core/codegen/javagen/src/test/resources/traces_sl_specs/PreCondAccessState.vdmsl.result @@ -65,7 +65,7 @@ final public class Entry implements java.io.Serializable { return "Entry{" + "St := " + Utils.toString(St) + "}"; } - public static class R implements Record { + public static class R implements VDMRecord { public Number x; public R(final Number _x) { @@ -100,7 +100,7 @@ final public class Entry implements java.io.Serializable { } } - public static class St implements Record { + public static class St implements VDMRecord { public R r; public St(final R _r) { diff --git a/core/codegen/javagen/src/test/resources/traces_sl_specs/RecPattern.vdmsl.result b/core/codegen/javagen/src/test/resources/traces_sl_specs/RecPattern.vdmsl.result index 29fd96a3df..091438de8e 100644 --- a/core/codegen/javagen/src/test/resources/traces_sl_specs/RecPattern.vdmsl.result +++ b/core/codegen/javagen/src/test/resources/traces_sl_specs/RecPattern.vdmsl.result @@ -80,7 +80,7 @@ final public class Entry implements java.io.Serializable { return "Entry{}"; } - public static class R implements Record { + public static class R implements VDMRecord { public Number x; public Number y; diff --git a/core/codegen/javagen/src/test/resources/traces_sl_specs/StateOtherModule.vdmsl.result b/core/codegen/javagen/src/test/resources/traces_sl_specs/StateOtherModule.vdmsl.result index 81fdb05cac..f039aff470 100644 --- a/core/codegen/javagen/src/test/resources/traces_sl_specs/StateOtherModule.vdmsl.result +++ b/core/codegen/javagen/src/test/resources/traces_sl_specs/StateOtherModule.vdmsl.result @@ -82,7 +82,7 @@ final public class Other implements java.io.Serializable { return "Other{" + "St := " + Utils.toString(St) + "}"; } - public static class St implements Record { + public static class St implements VDMRecord { public Number x; public St(final Number _x) { diff --git a/core/codegen/javagen/src/test/resources/traces_sl_specs/StateSingleModule.vdmsl.result b/core/codegen/javagen/src/test/resources/traces_sl_specs/StateSingleModule.vdmsl.result index a3215e7ce1..1cacee304b 100644 --- a/core/codegen/javagen/src/test/resources/traces_sl_specs/StateSingleModule.vdmsl.result +++ b/core/codegen/javagen/src/test/resources/traces_sl_specs/StateSingleModule.vdmsl.result @@ -114,7 +114,7 @@ final public class Entry implements java.io.Serializable { return "Entry{" + "St := " + Utils.toString(St) + "}"; } - public static class St implements Record { + public static class St implements VDMRecord { public Number x; public St(final Number _x) { diff --git a/core/codegen/javagen/src/test/resources/traces_sl_specs/TraceVarStm.vdmsl.result b/core/codegen/javagen/src/test/resources/traces_sl_specs/TraceVarStm.vdmsl.result index 0d0d4d8340..495ad50507 100644 --- a/core/codegen/javagen/src/test/resources/traces_sl_specs/TraceVarStm.vdmsl.result +++ b/core/codegen/javagen/src/test/resources/traces_sl_specs/TraceVarStm.vdmsl.result @@ -98,7 +98,7 @@ final public class Entry implements java.io.Serializable { return "Entry{" + "St := " + Utils.toString(St) + "}"; } - public static class St implements Record { + public static class St implements VDMRecord { public Number x; public St(final Number _x) { diff --git a/core/codegen/javagen/src/test/resources/union_type_specs/AssignFieldOfUnionRec.vdmpp.result b/core/codegen/javagen/src/test/resources/union_type_specs/AssignFieldOfUnionRec.vdmpp.result index 535bf04646..9fb597da3c 100644 --- a/core/codegen/javagen/src/test/resources/union_type_specs/AssignFieldOfUnionRec.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/union_type_specs/AssignFieldOfUnionRec.vdmpp.result @@ -47,7 +47,7 @@ public class Entry { return "Entry{}"; } - private static class R1 implements Record { + private static class R1 implements VDMRecord { public Number x; public R1(final Number _x) { @@ -82,7 +82,7 @@ public class Entry { } } - private static class R2 implements Record { + private static class R2 implements VDMRecord { public Number x; public R2(final Number _x) { diff --git a/core/codegen/javagen/src/test/resources/union_type_specs/FieldExpMissingRecField.vdmpp.result b/core/codegen/javagen/src/test/resources/union_type_specs/FieldExpMissingRecField.vdmpp.result index c96c5ec945..36dc7a4b0c 100644 --- a/core/codegen/javagen/src/test/resources/union_type_specs/FieldExpMissingRecField.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/union_type_specs/FieldExpMissingRecField.vdmpp.result @@ -33,7 +33,7 @@ public class Entry { return "Entry{}"; } - private static class R1 implements Record { + private static class R1 implements VDMRecord { public Number x; public R1(final Number _x) { @@ -68,7 +68,7 @@ public class Entry { } } - private static class R2 implements Record { + private static class R2 implements VDMRecord { public Number y; public R2(final Number _y) { diff --git a/core/codegen/javagen/src/test/resources/union_type_specs/FieldExpNotRootOfApplyExp.vdmpp.result b/core/codegen/javagen/src/test/resources/union_type_specs/FieldExpNotRootOfApplyExp.vdmpp.result index be26c7a2c6..e5594d7a97 100644 --- a/core/codegen/javagen/src/test/resources/union_type_specs/FieldExpNotRootOfApplyExp.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/union_type_specs/FieldExpNotRootOfApplyExp.vdmpp.result @@ -62,7 +62,7 @@ public class Entry { return "Entry{" + "x := " + Utils.toString(x) + "}"; } - public static class Rec implements Record { + public static class Rec implements VDMRecord { public Number x; public Rec(final Number _x) { diff --git a/core/codegen/javagen/src/test/resources/union_type_specs/FieldExpOfRecord.vdmpp.result b/core/codegen/javagen/src/test/resources/union_type_specs/FieldExpOfRecord.vdmpp.result index b7eaa4c854..5a6f4fc523 100644 --- a/core/codegen/javagen/src/test/resources/union_type_specs/FieldExpOfRecord.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/union_type_specs/FieldExpOfRecord.vdmpp.result @@ -39,7 +39,7 @@ public class Entry { return "Entry{}"; } - public static class Rec implements Record { + public static class Rec implements VDMRecord { public Number x; public Rec(final Number _x) { diff --git a/core/codegen/javagen/src/test/resources/union_type_specs/FieldExpOfRecordArgToApplyExp.vdmpp.result b/core/codegen/javagen/src/test/resources/union_type_specs/FieldExpOfRecordArgToApplyExp.vdmpp.result index 4dd31b8748..1e283bc916 100644 --- a/core/codegen/javagen/src/test/resources/union_type_specs/FieldExpOfRecordArgToApplyExp.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/union_type_specs/FieldExpOfRecordArgToApplyExp.vdmpp.result @@ -29,7 +29,7 @@ public class Entry { return "Entry{}"; } - private static class Rec implements Record { + private static class Rec implements VDMRecord { public Number x; public Rec(final Number _x) { diff --git a/core/codegen/javagen/src/test/resources/union_type_specs/ForAllUnionTypeField.vdmpp.result b/core/codegen/javagen/src/test/resources/union_type_specs/ForAllUnionTypeField.vdmpp.result index b9dff2a86e..fac4736132 100644 --- a/core/codegen/javagen/src/test/resources/union_type_specs/ForAllUnionTypeField.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/union_type_specs/ForAllUnionTypeField.vdmpp.result @@ -28,7 +28,7 @@ public class Entry { return "Entry{}"; } - private static class R implements Record { + private static class R implements VDMRecord { public Object x; public R(final Object _x) { diff --git a/core/codegen/javagen/src/test/resources/union_type_specs/LetBeStRecElem.vdmpp.result b/core/codegen/javagen/src/test/resources/union_type_specs/LetBeStRecElem.vdmpp.result index f3a1fb55d8..1374d99f9f 100644 --- a/core/codegen/javagen/src/test/resources/union_type_specs/LetBeStRecElem.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/union_type_specs/LetBeStRecElem.vdmpp.result @@ -43,7 +43,7 @@ public class Entry { return "Entry{" + "xs = " + Utils.toString(xs) + "}"; } - private static class A implements Record { + private static class A implements VDMRecord { public Number a; public A(final Number _a) { diff --git a/core/codegen/javagen/src/test/resources/union_type_specs/NewExpRecord.vdmpp.result b/core/codegen/javagen/src/test/resources/union_type_specs/NewExpRecord.vdmpp.result index 37825e05c7..ced55b348e 100644 --- a/core/codegen/javagen/src/test/resources/union_type_specs/NewExpRecord.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/union_type_specs/NewExpRecord.vdmpp.result @@ -63,7 +63,7 @@ public class Entry { return "Entry{}"; } - public static class Rec implements Record { + public static class Rec implements VDMRecord { public Number x; public Character y; diff --git a/core/codegen/javagen/src/test/resources/union_type_specs/RecordModUnionOneRecordIsMissingField.vdmpp.result b/core/codegen/javagen/src/test/resources/union_type_specs/RecordModUnionOneRecordIsMissingField.vdmpp.result index d79f22d062..c3d0e03f2e 100644 --- a/core/codegen/javagen/src/test/resources/union_type_specs/RecordModUnionOneRecordIsMissingField.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/union_type_specs/RecordModUnionOneRecordIsMissingField.vdmpp.result @@ -45,7 +45,7 @@ public class Entry { return "Entry{}"; } - private static class R1 implements Record { + private static class R1 implements VDMRecord { public R1() {} @@ -70,7 +70,7 @@ public class Entry { } } - private static class R2 implements Record { + private static class R2 implements VDMRecord { public Number f; public R2(final Number _f) { diff --git a/core/codegen/javagen/src/test/resources/union_type_specs/VarExpTypeNarrowedByIsCheck.vdmpp.result b/core/codegen/javagen/src/test/resources/union_type_specs/VarExpTypeNarrowedByIsCheck.vdmpp.result index f2488bb691..8b1d09afa5 100644 --- a/core/codegen/javagen/src/test/resources/union_type_specs/VarExpTypeNarrowedByIsCheck.vdmpp.result +++ b/core/codegen/javagen/src/test/resources/union_type_specs/VarExpTypeNarrowedByIsCheck.vdmpp.result @@ -33,7 +33,7 @@ public class Entry { return "Entry{}"; } - private static class R1 implements Record { + private static class R1 implements VDMRecord { public Number x; public R1(final Number _x) { @@ -68,7 +68,7 @@ public class Entry { } } - private static class R2 implements Record { + private static class R2 implements VDMRecord { public Number x; public R2(final Number _x) {