diff --git a/inca-translation/solutions/RecordTypes_Checker/classes_gen/RecordTypes_Checker/model/trace.info b/inca-translation/solutions/RecordTypes_Checker/classes_gen/RecordTypes_Checker/model/trace.info
index ec8101e5685e1d3b0fb673a6ba4c6ec994db92ad..10645e12f1c09f4720bac44ff7a5e0ed4dd45b82 100644
--- a/inca-translation/solutions/RecordTypes_Checker/classes_gen/RecordTypes_Checker/model/trace.info
+++ b/inca-translation/solutions/RecordTypes_Checker/classes_gen/RecordTypes_Checker/model/trace.info
@@ -855,9 +855,9 @@
-
-
-
+
+
+
@@ -878,16 +878,16 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -922,13 +922,13 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -1058,7 +1058,7 @@
-
+
@@ -1067,7 +1067,7 @@
-
+
@@ -1079,7 +1079,7 @@
-
+
@@ -1128,10 +1128,10 @@
-
-
-
-
+
+
+
+
@@ -1177,9 +1177,9 @@
-
-
-
+
+
+
@@ -1324,7 +1324,7 @@
-
+
@@ -1332,7 +1332,7 @@
-
+
@@ -1451,8 +1451,8 @@
-
-
+
+
@@ -1496,13 +1496,13 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -1542,16 +1542,16 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
+
+
@@ -1587,14 +1587,14 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -1701,8 +1701,8 @@
-
-
+
+
@@ -1716,9 +1716,9 @@
-
+
-
+
@@ -1736,8 +1736,8 @@
-
-
+
+
@@ -1837,9 +1837,9 @@
-
-
-
+
+
+
@@ -1898,11 +1898,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -1973,9 +1973,9 @@
-
-
-
+
+
+
@@ -2102,21 +2102,21 @@
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -2154,11 +2154,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -2218,10 +2218,10 @@
-
-
-
-
+
+
+
+
@@ -2411,7 +2411,7 @@
-
+
@@ -2420,7 +2420,7 @@
-
+
@@ -2448,7 +2448,7 @@
-
+
@@ -2460,7 +2460,7 @@
-
+
@@ -2475,7 +2475,7 @@
-
+
@@ -2490,7 +2490,7 @@
-
+
@@ -2507,8 +2507,8 @@
-
-
+
+
@@ -2642,8 +2642,8 @@
-
-
+
+
@@ -3179,15 +3179,15 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -3714,7 +3714,7 @@
-
+
@@ -3768,16 +3768,16 @@
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
@@ -3813,18 +3813,18 @@
-
-
-
-
+
+
+
+
-
-
+
+
-
-
+
+
@@ -3934,10 +3934,10 @@
-
-
-
-
+
+
+
+
@@ -3952,10 +3952,10 @@
-
-
-
-
+
+
+
+
@@ -4005,18 +4005,18 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
+
+
@@ -4052,17 +4052,17 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -4172,10 +4172,10 @@
-
-
-
-
+
+
+
+
@@ -4190,10 +4190,10 @@
-
-
-
-
+
+
+
+
@@ -4325,9 +4325,9 @@
-
-
-
+
+
+
@@ -4375,7 +4375,7 @@
-
+
@@ -4416,12 +4416,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -4488,8 +4488,8 @@
-
-
+
+
@@ -4537,11 +4537,11 @@
-
-
+
+
-
-
+
+
@@ -4570,13 +4570,13 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -4607,14 +4607,14 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -4650,11 +4650,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -4689,16 +4689,16 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -4808,18 +4808,18 @@
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
@@ -4857,15 +4857,15 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -5149,7 +5149,7 @@
-
+
@@ -5163,7 +5163,7 @@
-
+
@@ -5179,7 +5179,7 @@
-
+
@@ -5196,7 +5196,7 @@
-
+
@@ -5213,7 +5213,7 @@
-
+
@@ -5230,7 +5230,7 @@
-
+
@@ -5247,7 +5247,7 @@
-
+
@@ -5267,7 +5267,7 @@
-
+
diff --git a/inca-translation/solutions/RecordTypes_Checker/models/model.mps b/inca-translation/solutions/RecordTypes_Checker/models/model.mps
index b0c8f03658b7f6ca42cad79b236a0ee6908b93c0..1b903ad3897ddf0cde9f99f45ea40a6e59d7cd8c 100644
--- a/inca-translation/solutions/RecordTypes_Checker/models/model.mps
+++ b/inca-translation/solutions/RecordTypes_Checker/models/model.mps
@@ -2661,11 +2661,11 @@
-
-
+
+
-
+
@@ -2674,8 +2674,8 @@
-
-
+
+
@@ -2706,8 +2706,8 @@
-
-
+
+
@@ -3651,9 +3651,6 @@
-
-
-
@@ -5730,9 +5727,6 @@
-
-
-
diff --git a/inca-translation/solutions/RecordTypes_Checker/source_gen.caches/RecordTypes_Checker/model/generated b/inca-translation/solutions/RecordTypes_Checker/source_gen.caches/RecordTypes_Checker/model/generated
index 3fbc8e3c14fa2c44e9439d621d5ef9b6ae9399de..4b50820c215e466cac21b5689d8c5c0a17710d94 100644
--- a/inca-translation/solutions/RecordTypes_Checker/source_gen.caches/RecordTypes_Checker/model/generated
+++ b/inca-translation/solutions/RecordTypes_Checker/source_gen.caches/RecordTypes_Checker/model/generated
@@ -1,5 +1,5 @@
-
+
diff --git a/inca-translation/solutions/RecordTypes_Checker/source_gen.caches/RecordTypes_Checker/test/ok_rec_empty/dependencies b/inca-translation/solutions/RecordTypes_Checker/source_gen.caches/RecordTypes_Checker/test/ok_rec_empty/dependencies
new file mode 100644
index 0000000000000000000000000000000000000000..71ea00a877b6f313fe41fde890111be8b79bc36b
--- /dev/null
+++ b/inca-translation/solutions/RecordTypes_Checker/source_gen.caches/RecordTypes_Checker/test/ok_rec_empty/dependencies
@@ -0,0 +1,3 @@
+
+
+
diff --git a/inca-translation/solutions/RecordTypes_Checker/source_gen.caches/RecordTypes_Checker/test/ok_rec_empty/generated b/inca-translation/solutions/RecordTypes_Checker/source_gen.caches/RecordTypes_Checker/test/ok_rec_empty/generated
new file mode 100644
index 0000000000000000000000000000000000000000..3d8016f81b5c56a11cc369580de8c1108adb8884
--- /dev/null
+++ b/inca-translation/solutions/RecordTypes_Checker/source_gen.caches/RecordTypes_Checker/test/ok_rec_empty/generated
@@ -0,0 +1,3 @@
+
+
+
diff --git a/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_AsLTypeQuerySpecification.java b/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_AsLTypeQuerySpecification.java
index 326474b85c9ea5bf169d1ea63c923f0b4f1599bc..11862fe65f8f11073a3abb235ab3cbf8f8908eb1 100644
--- a/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_AsLTypeQuerySpecification.java
+++ b/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_AsLTypeQuerySpecification.java
@@ -92,8 +92,8 @@ public final class Typing_AsLTypeQuerySpecification extends MPSQuerySpecificatio
body.setSymbolicParameters(exportedParameters);
PVariable var__tmp_240 = body.getOrCreateVariableByName("tmp_240");
- PVariable var__6395623258575592358 = body.newVirtualVariable();
PVariable var__match_a0a0y = body.getOrCreateVariableByName("match_a0a0y");
+ PVariable var__6395623258577406461 = body.newVirtualVariable();
new TypeConstraint(body, Tuples.flatTupleOf(var_ty), new ConceptKey(MetaAdapterFactory.getInterfaceConcept(0x6b642eaa1043424aL, 0x9e0949eb41607114L, 0x1a4a252762eb938fL, "RecordTypes.structure.Type")));
new PositivePatternCall(body, Tuples.flatTupleOf(), Typing_AsLType_0_switchCommonQuerySpecification.instance().getInternalQueryRepresentation());
@@ -103,7 +103,7 @@ public final class Typing_AsLTypeQuerySpecification extends MPSQuerySpecificatio
@Override
public String getShortDescription() {
- return "6395623258575592358";
+ return "6395623258577406461";
}
@Override
@@ -116,8 +116,8 @@ public final class Typing_AsLTypeQuerySpecification extends MPSQuerySpecificatio
return LType.Nat.create();
}
- }, var__6395623258575592358, false);
- new Equality(body, var__tmp_240, var__6395623258575592358);
+ }, var__6395623258577406461, false);
+ new Equality(body, var__tmp_240, var__6395623258577406461);
new Equality(body, var__tmp_240, var_out_1);
SetSequence.fromSet(bodies).addElement(body);
@@ -132,6 +132,7 @@ public final class Typing_AsLTypeQuerySpecification extends MPSQuerySpecificatio
exportedParameters.add(new ExportedParameter(body, var_out_1, p_out_1));
body.setSymbolicParameters(exportedParameters);
+ PVariable var__6395623258577406520 = body.newVirtualVariable();
PVariable var__lty2 = body.getOrCreateVariableByName("lty2");
PVariable var__match_a0b0a42 = body.getOrCreateVariableByName("match_a0b0a42");
PVariable var__lty1 = body.getOrCreateVariableByName("lty1");
@@ -140,7 +141,6 @@ public final class Typing_AsLTypeQuerySpecification extends MPSQuerySpecificatio
PVariable var__ty1 = body.getOrCreateVariableByName("ty1");
PVariable var__match_a1a0y = body.getOrCreateVariableByName("match_a1a0y");
PVariable var__tmp_245 = body.getOrCreateVariableByName("tmp_245");
- PVariable var__6395623258575592417 = body.newVirtualVariable();
PVariable var__tmp_241 = body.getOrCreateVariableByName("tmp_241");
PVariable var__tmp_242 = body.getOrCreateVariableByName("tmp_242");
PVariable var__tmp_243 = body.getOrCreateVariableByName("tmp_243");
@@ -164,7 +164,7 @@ public final class Typing_AsLTypeQuerySpecification extends MPSQuerySpecificatio
@Override
public String getShortDescription() {
- return "6395623258575592417";
+ return "6395623258577406520";
}
@Override
@@ -177,8 +177,8 @@ public final class Typing_AsLTypeQuerySpecification extends MPSQuerySpecificatio
return LType.Fun.create(((LType.LTypeElement) valueProvider.getValue("lty1")), ((LType.LTypeElement) valueProvider.getValue("lty2")));
}
- }, var__6395623258575592417, false);
- new Equality(body, var__tmp_245, var__6395623258575592417);
+ }, var__6395623258577406520, false);
+ new Equality(body, var__tmp_245, var__6395623258577406520);
new Equality(body, var__tmp_245, var_out_1);
SetSequence.fromSet(bodies).addElement(body);
@@ -193,12 +193,12 @@ public final class Typing_AsLTypeQuerySpecification extends MPSQuerySpecificatio
exportedParameters.add(new ExportedParameter(body, var_out_1, p_out_1));
body.setSymbolicParameters(exportedParameters);
+ PVariable var__6395623258577406554 = body.newVirtualVariable();
PVariable var__match_a2a0y = body.getOrCreateVariableByName("match_a2a0y");
PVariable var__rty = body.getOrCreateVariableByName("rty");
PVariable var__tmp_246 = body.getOrCreateVariableByName("tmp_246");
PVariable var__tmp_247 = body.getOrCreateVariableByName("tmp_247");
PVariable var__lty = body.getOrCreateVariableByName("lty");
- PVariable var__6395623258575592451 = body.newVirtualVariable();
new TypeConstraint(body, Tuples.flatTupleOf(var_ty), new ConceptKey(MetaAdapterFactory.getInterfaceConcept(0x6b642eaa1043424aL, 0x9e0949eb41607114L, 0x1a4a252762eb938fL, "RecordTypes.structure.Type")));
new PositivePatternCall(body, Tuples.flatTupleOf(), Typing_AsLType_0_switchCommonQuerySpecification.instance().getInternalQueryRepresentation());
@@ -211,7 +211,7 @@ public final class Typing_AsLTypeQuerySpecification extends MPSQuerySpecificatio
@Override
public String getShortDescription() {
- return "6395623258575592451";
+ return "6395623258577406554";
}
@Override
@@ -224,8 +224,8 @@ public final class Typing_AsLTypeQuerySpecification extends MPSQuerySpecificatio
return LType.Record.create(((LTypeRecord.LTypeRecordElement) valueProvider.getValue("lty")));
}
- }, var__6395623258575592451, false);
- new Equality(body, var__tmp_247, var__6395623258575592451);
+ }, var__6395623258577406554, false);
+ new Equality(body, var__tmp_247, var__6395623258577406554);
new Equality(body, var__tmp_247, var_out_1);
SetSequence.fromSet(bodies).addElement(body);
diff --git a/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_AsLTypeRecordQuerySpecification.java b/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_AsLTypeRecordQuerySpecification.java
index 8bf4b10dea719dbf7d949148c94ee25f5bfb5bb8..2d7246120cb113b78cac97f944e7aee7bd1d5cd8 100644
--- a/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_AsLTypeRecordQuerySpecification.java
+++ b/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_AsLTypeRecordQuerySpecification.java
@@ -89,14 +89,14 @@ public final class Typing_AsLTypeRecordQuerySpecification extends MPSQuerySpecif
exportedParameters.add(new ExportedParameter(body, var_out_1, p_out_1));
body.setSymbolicParameters(exportedParameters);
- PVariable var__6395623258575569158 = body.getOrCreateVariableByName("6395623258575569158");
- PVariable var__6395623258575569161 = body.getOrCreateVariableByName("6395623258575569161");
- PVariable var__6395623258575569166 = body.newVirtualVariable();
+ PVariable var__6395623258577383611 = body.newVirtualVariable();
+ PVariable var__6395623258577383606 = body.getOrCreateVariableByName("6395623258577383606");
+ PVariable var__6395623258577383603 = body.getOrCreateVariableByName("6395623258577383603");
new TypeConstraint(body, Tuples.flatTupleOf(var_type), new ConceptKey(MetaAdapterFactory.getConcept(0x6b642eaa1043424aL, 0x9e0949eb41607114L, 0x1fd8e2cf9df802c6L, "RecordTypes.structure.RecordType")));
- new PositivePatternCall(body, Tuples.flatTupleOf(var_type, var__6395623258575569158), Typing_AsLTypeRecord_WrappedQuerySpecification.instance().getInternalQueryRepresentation());
- new AggregatorConstraint(new BoundAggregator(LTypeRecord.instance().aggregator_lub, LTypeRecord.LTypeRecordElement.class, LTypeRecord.LTypeRecordElement.class), body, Tuples.flatTupleOf(var_type, var__6395623258575569161), Typing_AsLTypeRecord_WrappedQuerySpecification.instance().getInternalQueryRepresentation(), var__6395623258575569166, 1);
- new Equality(body, var_out_1, var__6395623258575569166);
+ new PositivePatternCall(body, Tuples.flatTupleOf(var_type, var__6395623258577383603), Typing_AsLTypeRecord_WrappedQuerySpecification.instance().getInternalQueryRepresentation());
+ new AggregatorConstraint(new BoundAggregator(LTypeRecord.instance().aggregator_lub, LTypeRecord.LTypeRecordElement.class, LTypeRecord.LTypeRecordElement.class), body, Tuples.flatTupleOf(var_type, var__6395623258577383606), Typing_AsLTypeRecord_WrappedQuerySpecification.instance().getInternalQueryRepresentation(), var__6395623258577383611, 1);
+ new Equality(body, var_out_1, var__6395623258577383611);
SetSequence.fromSet(bodies).addElement(body);
}
diff --git a/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_AsLTypeRecord_WrappedQuerySpecification.java b/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_AsLTypeRecord_WrappedQuerySpecification.java
index 9d22e57f49cb132364d6c7892cefcbaf98b817ba..4ebfaeeb04ab9db5ae59258f62171e6203176a5f 100644
--- a/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_AsLTypeRecord_WrappedQuerySpecification.java
+++ b/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_AsLTypeRecord_WrappedQuerySpecification.java
@@ -95,7 +95,7 @@ public final class Typing_AsLTypeRecord_WrappedQuerySpecification extends MPSQue
PVariable var__tmp_250 = body.getOrCreateVariableByName("tmp_250");
PVariable var__tmp_251 = body.getOrCreateVariableByName("tmp_251");
PVariable var__ty = body.getOrCreateVariableByName("ty");
- PVariable var__6395623258575592524 = body.newVirtualVariable();
+ PVariable var__6395623258577406627 = body.newVirtualVariable();
PVariable var__elem = body.getOrCreateVariableByName("elem");
PVariable var__tmp_252 = body.getOrCreateVariableByName("tmp_252");
PVariable var__l = body.getOrCreateVariableByName("l");
@@ -115,7 +115,7 @@ public final class Typing_AsLTypeRecord_WrappedQuerySpecification extends MPSQue
@Override
public String getShortDescription() {
- return "6395623258575592524";
+ return "6395623258577406627";
}
@Override
@@ -128,8 +128,8 @@ public final class Typing_AsLTypeRecord_WrappedQuerySpecification extends MPSQue
return LTypeRecord.instance().singleton((CodeGenerationHelper.demandWrapString(valueProvider.getValue("l"))), ((LType.LTypeElement) valueProvider.getValue("ty")));
}
- }, var__6395623258575592524, false);
- new Equality(body, var__tmp_254, var__6395623258575592524);
+ }, var__6395623258577406627, false);
+ new Equality(body, var__tmp_254, var__6395623258577406627);
new Equality(body, var__tmp_254, var_out_1);
SetSequence.fromSet(bodies).addElement(body);
@@ -144,7 +144,7 @@ public final class Typing_AsLTypeRecord_WrappedQuerySpecification extends MPSQue
exportedParameters.add(new ExportedParameter(body, var_out_1, p_out_1));
body.setSymbolicParameters(exportedParameters);
- PVariable var__6395623258575592542 = body.newVirtualVariable();
+ PVariable var__6395623258577406645 = body.newVirtualVariable();
PVariable var__tmp_255 = body.getOrCreateVariableByName("tmp_255");
new TypeConstraint(body, Tuples.flatTupleOf(var_type), new ConceptKey(MetaAdapterFactory.getConcept(0x6b642eaa1043424aL, 0x9e0949eb41607114L, 0x1fd8e2cf9df802c6L, "RecordTypes.structure.RecordType")));
@@ -153,7 +153,7 @@ public final class Typing_AsLTypeRecord_WrappedQuerySpecification extends MPSQue
@Override
public String getShortDescription() {
- return "6395623258575592542";
+ return "6395623258577406645";
}
@Override
@@ -166,8 +166,8 @@ public final class Typing_AsLTypeRecord_WrappedQuerySpecification extends MPSQue
return LTypeRecord.instance().empty();
}
- }, var__6395623258575592542, false);
- new Equality(body, var__tmp_255, var__6395623258575592542);
+ }, var__6395623258577406645, false);
+ new Equality(body, var__tmp_255, var__6395623258577406645);
new Equality(body, var__tmp_255, var_out_1);
SetSequence.fromSet(bodies).addElement(body);
diff --git a/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_CheckErrorQuerySpecification.java b/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_CheckErrorQuerySpecification.java
index 1efd9ebcd9522da0d9a5db2d1b0d2336553d1dcc..503c358d07417e06f377c9d079f6888509325e37 100644
--- a/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_CheckErrorQuerySpecification.java
+++ b/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_CheckErrorQuerySpecification.java
@@ -94,9 +94,9 @@ public final class Typing_CheckErrorQuerySpecification extends MPSQuerySpecifica
exportedParameters.add(new ExportedParameter(body, var_out_2, p_out_2));
body.setSymbolicParameters(exportedParameters);
- PVariable var__6395623258575549270 = body.newConstantVariable(Integer.parseInt("0"));
+ PVariable var__6395623258577363713 = body.newConstantVariable(Integer.parseInt("0"));
PVariable var__term = body.getOrCreateVariableByName("term");
- PVariable var__6395623258575589737 = body.newVirtualVariable();
+ PVariable var__6395623258577403840 = body.newVirtualVariable();
PVariable var__tmp_35 = body.getOrCreateVariableByName("tmp_35");
PVariable var__tmp_34 = body.getOrCreateVariableByName("tmp_34");
PVariable var__tmp_36 = body.getOrCreateVariableByName("tmp_36");
@@ -105,12 +105,12 @@ public final class Typing_CheckErrorQuerySpecification extends MPSQuerySpecifica
new TypeConstraint(body, Tuples.flatTupleOf(var__term), new ConceptKey(MetaAdapterFactory.getInterfaceConcept(0x6b642eaa1043424aL, 0x9e0949eb41607114L, 0x1a4a252762eb92d1L, "RecordTypes.structure.Term")));
new PositivePatternCall(body, Tuples.flatTupleOf(var__term, var__tmp_34), Typing_RequiredQuerySpecification.instance().getInternalQueryRepresentation());
new NegativePatternCall(body, Tuples.flatTupleOf(var__term), Typing_CheckQuerySpecification.instance().getInternalQueryRepresentation());
- new Equality(body, var__tmp_35, var__6395623258575549270);
+ new Equality(body, var__tmp_35, var__6395623258577363713);
new ExpressionEvaluation(body, new IExpressionEvaluator() {
@Override
public String getShortDescription() {
- return "6395623258575589737";
+ return "6395623258577403840";
}
@Override
@@ -123,8 +123,8 @@ public final class Typing_CheckErrorQuerySpecification extends MPSQuerySpecifica
return String.format("\"check failed\"");
}
- }, var__6395623258575589737, false);
- new Equality(body, var__tmp_36, var__6395623258575589737);
+ }, var__6395623258577403840, false);
+ new Equality(body, var__tmp_36, var__6395623258577403840);
new Equality(body, var__tmp_35, var_out_0);
new Equality(body, var__term, var_out_1);
new Equality(body, var__tmp_36, var_out_2);
diff --git a/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_CheckQuerySpecification.java b/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_CheckQuerySpecification.java
index 0f1d48d69f6fbfb615fc1951f3de32a17dab4000..84a62eb8d9a1609d3e8a3b805efb216dd16ffda2 100644
--- a/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_CheckQuerySpecification.java
+++ b/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_CheckQuerySpecification.java
@@ -93,14 +93,14 @@ public final class Typing_CheckQuerySpecification extends MPSQuerySpecification
PVariable var__tmp_183 = body.getOrCreateVariableByName("tmp_183");
PVariable var__tmp_184 = body.getOrCreateVariableByName("tmp_184");
PVariable var__tmp_185 = body.getOrCreateVariableByName("tmp_185");
- PVariable var__6395623258575591631 = body.newVirtualVariable();
+ PVariable var__6395623258577405750 = body.newVirtualVariable();
PVariable var__t = body.getOrCreateVariableByName("t");
+ PVariable var__6395623258577405734 = body.newVirtualVariable();
PVariable var__tmp_181 = body.getOrCreateVariableByName("tmp_181");
PVariable var__match_b0a0a0u = body.getOrCreateVariableByName("match_b0a0a0u");
PVariable var__ty2 = body.getOrCreateVariableByName("ty2");
PVariable var__ty1 = body.getOrCreateVariableByName("ty1");
PVariable var__ty = body.getOrCreateVariableByName("ty");
- PVariable var__6395623258575591647 = body.newVirtualVariable();
PVariable var__match_a0a0u = body.getOrCreateVariableByName("match_a0a0u");
PVariable var__match_a0a0a0u = body.getOrCreateVariableByName("match_a0a0a0u");
PVariable var__name = body.getOrCreateVariableByName("name");
@@ -122,7 +122,7 @@ public final class Typing_CheckQuerySpecification extends MPSQuerySpecification
@Override
public String getShortDescription() {
- return "6395623258575591631";
+ return "6395623258577405734";
}
@Override
@@ -135,14 +135,14 @@ public final class Typing_CheckQuerySpecification extends MPSQuerySpecification
return LType.instance().funParamType(((LType.LTypeElement) valueProvider.getValue("ty")));
}
- }, var__6395623258575591631, false);
- new Equality(body, var__tmp_184, var__6395623258575591631);
+ }, var__6395623258577405734, false);
+ new Equality(body, var__tmp_184, var__6395623258577405734);
new Equality(body, var__ty1, var__tmp_184);
new ExpressionEvaluation(body, new IExpressionEvaluator() {
@Override
public String getShortDescription() {
- return "6395623258575591647";
+ return "6395623258577405750";
}
@Override
@@ -155,8 +155,8 @@ public final class Typing_CheckQuerySpecification extends MPSQuerySpecification
return LType.instance().funResultType(((LType.LTypeElement) valueProvider.getValue("ty")));
}
- }, var__6395623258575591647, false);
- new Equality(body, var__tmp_185, var__6395623258575591647);
+ }, var__6395623258577405750, false);
+ new Equality(body, var__tmp_185, var__6395623258577405750);
new Equality(body, var__ty2, var__tmp_185);
new PositivePatternCall(body, Tuples.flatTupleOf(var__t), Typing_CheckQuerySpecification.instance().getInternalQueryRepresentation());
@@ -173,6 +173,7 @@ public final class Typing_CheckQuerySpecification extends MPSQuerySpecification
PVariable var__p = body.getOrCreateVariableByName("p");
PVariable var__tmp_190 = body.getOrCreateVariableByName("tmp_190");
PVariable var__t = body.getOrCreateVariableByName("t");
+ PVariable var__6395623258577405809 = body.newVirtualVariable();
PVariable var__ty = body.getOrCreateVariableByName("ty");
PVariable var__entry = body.getOrCreateVariableByName("entry");
PVariable var__label = body.getOrCreateVariableByName("label");
@@ -181,7 +182,6 @@ public final class Typing_CheckQuerySpecification extends MPSQuerySpecification
PVariable var__tmp_186 = body.getOrCreateVariableByName("tmp_186");
PVariable var__entries = body.getOrCreateVariableByName("entries");
PVariable var__tmp_187 = body.getOrCreateVariableByName("tmp_187");
- PVariable var__6395623258575591706 = body.newVirtualVariable();
PVariable var__lty = body.getOrCreateVariableByName("lty");
PVariable var__tmp_188 = body.getOrCreateVariableByName("tmp_188");
PVariable var__tmp_189 = body.getOrCreateVariableByName("tmp_189");
@@ -203,7 +203,7 @@ public final class Typing_CheckQuerySpecification extends MPSQuerySpecification
@Override
public String getShortDescription() {
- return "6395623258575591706";
+ return "6395623258577405809";
}
@Override
@@ -216,8 +216,8 @@ public final class Typing_CheckQuerySpecification extends MPSQuerySpecification
return LType.instance().recordLookup(((LType.LTypeElement) valueProvider.getValue("ty")), (CodeGenerationHelper.demandWrapString(valueProvider.getValue("label"))));
}
- }, var__6395623258575591706, false);
- new Equality(body, var__tmp_189, var__6395623258575591706);
+ }, var__6395623258577405809, false);
+ new Equality(body, var__tmp_189, var__6395623258577405809);
new Equality(body, var__lty, var__tmp_189);
new TypeConstraint(body, Tuples.staticArityFlatTupleOf(var__entry, var__tmp_190), new ConceptFeatureKey(MetaAdapterFactory.getContainmentLink(0x6b642eaa1043424aL, 0x9e0949eb41607114L, 0x2c4ed3ae43d50d92L, 0x2c4ed3ae43d50da6L, "t")));
new Equality(body, var__t, var__tmp_190);
@@ -235,13 +235,13 @@ public final class Typing_CheckQuerySpecification extends MPSQuerySpecification
PVariable var__tmp_193 = body.getOrCreateVariableByName("tmp_193");
PVariable var__tmp_194 = body.getOrCreateVariableByName("tmp_194");
- PVariable var__6395623258575563439 = body.newConstantVariable(true);
PVariable var__t = body.getOrCreateVariableByName("t");
PVariable var__tmp_191 = body.getOrCreateVariableByName("tmp_191");
PVariable var__tmp_192 = body.getOrCreateVariableByName("tmp_192");
- PVariable var__6395623258575591756 = body.newVirtualVariable();
PVariable var__match_a2a0u = body.getOrCreateVariableByName("match_a2a0u");
+ PVariable var__6395623258577405859 = body.newVirtualVariable();
PVariable var__infty = body.getOrCreateVariableByName("infty");
+ PVariable var__6395623258577377884 = body.newConstantVariable(true);
PVariable var__reqty = body.getOrCreateVariableByName("reqty");
new TypeConstraint(body, Tuples.flatTupleOf(var_term), new ConceptKey(MetaAdapterFactory.getInterfaceConcept(0x6b642eaa1043424aL, 0x9e0949eb41607114L, 0x1a4a252762eb92d1L, "RecordTypes.structure.Term")));
@@ -256,7 +256,7 @@ public final class Typing_CheckQuerySpecification extends MPSQuerySpecification
@Override
public String getShortDescription() {
- return "6395623258575591756";
+ return "6395623258577405859";
}
@Override
@@ -269,9 +269,9 @@ public final class Typing_CheckQuerySpecification extends MPSQuerySpecification
return LType.instance().leq(((LType.LTypeElement) valueProvider.getValue("infty")), ((LType.LTypeElement) valueProvider.getValue("reqty")));
}
- }, var__6395623258575591756, false);
- new Equality(body, var__tmp_193, var__6395623258575591756);
- new Equality(body, var__tmp_194, var__6395623258575563439);
+ }, var__6395623258577405859, false);
+ new Equality(body, var__tmp_193, var__6395623258577405859);
+ new Equality(body, var__tmp_194, var__6395623258577377884);
new Equality(body, var__tmp_193, var__tmp_194);
SetSequence.fromSet(bodies).addElement(body);
diff --git a/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_InferQuerySpecification.java b/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_InferQuerySpecification.java
index 4f58297dd8c2aa21b85d7b4db960a87e875b0bb9..b67a4481935da5310f21da9a5d2ea899cac6e654 100644
--- a/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_InferQuerySpecification.java
+++ b/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_InferQuerySpecification.java
@@ -89,14 +89,14 @@ public final class Typing_InferQuerySpecification extends MPSQuerySpecification
exportedParameters.add(new ExportedParameter(body, var_out_1, p_out_1));
body.setSymbolicParameters(exportedParameters);
- PVariable var__6395623258575569103 = body.getOrCreateVariableByName("6395623258575569103");
- PVariable var__6395623258575569108 = body.newVirtualVariable();
- PVariable var__6395623258575569100 = body.getOrCreateVariableByName("6395623258575569100");
+ PVariable var__6395623258577383545 = body.getOrCreateVariableByName("6395623258577383545");
+ PVariable var__6395623258577383553 = body.newVirtualVariable();
+ PVariable var__6395623258577383548 = body.getOrCreateVariableByName("6395623258577383548");
new TypeConstraint(body, Tuples.flatTupleOf(var_term), new ConceptKey(MetaAdapterFactory.getInterfaceConcept(0x6b642eaa1043424aL, 0x9e0949eb41607114L, 0x1a4a252762eb92d1L, "RecordTypes.structure.Term")));
- new PositivePatternCall(body, Tuples.flatTupleOf(var_term, var__6395623258575569100), Typing_Infer_WrappedQuerySpecification.instance().getInternalQueryRepresentation());
- new AggregatorConstraint(new BoundAggregator(LType.instance().aggregator_glb, LType.LTypeElement.class, LType.LTypeElement.class), body, Tuples.flatTupleOf(var_term, var__6395623258575569103), Typing_Infer_WrappedQuerySpecification.instance().getInternalQueryRepresentation(), var__6395623258575569108, 1);
- new Equality(body, var_out_1, var__6395623258575569108);
+ new PositivePatternCall(body, Tuples.flatTupleOf(var_term, var__6395623258577383545), Typing_Infer_WrappedQuerySpecification.instance().getInternalQueryRepresentation());
+ new AggregatorConstraint(new BoundAggregator(LType.instance().aggregator_glb, LType.LTypeElement.class, LType.LTypeElement.class), body, Tuples.flatTupleOf(var_term, var__6395623258577383548), Typing_Infer_WrappedQuerySpecification.instance().getInternalQueryRepresentation(), var__6395623258577383553, 1);
+ new Equality(body, var_out_1, var__6395623258577383553);
SetSequence.fromSet(bodies).addElement(body);
}
diff --git a/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_Infer_WrappedQuerySpecification.java b/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_Infer_WrappedQuerySpecification.java
index 3044eedc3097e3dc59c010483e15eb4740c86f70..ffc376976a3dea3f2dee0f9236bbf88dc0f6f42b 100644
--- a/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_Infer_WrappedQuerySpecification.java
+++ b/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_Infer_WrappedQuerySpecification.java
@@ -94,7 +94,7 @@ public final class Typing_Infer_WrappedQuerySpecification extends MPSQuerySpecif
PVariable var__tmp_151 = body.getOrCreateVariableByName("tmp_151");
PVariable var__match_a0a0s = body.getOrCreateVariableByName("match_a0a0s");
- PVariable var__6395623258575591161 = body.newVirtualVariable();
+ PVariable var__6395623258577405264 = body.newVirtualVariable();
new TypeConstraint(body, Tuples.flatTupleOf(var_term), new ConceptKey(MetaAdapterFactory.getInterfaceConcept(0x6b642eaa1043424aL, 0x9e0949eb41607114L, 0x1a4a252762eb92d1L, "RecordTypes.structure.Term")));
new PositivePatternCall(body, Tuples.flatTupleOf(), Typing_Infer_0_switchCommonQuerySpecification.instance().getInternalQueryRepresentation());
@@ -104,7 +104,7 @@ public final class Typing_Infer_WrappedQuerySpecification extends MPSQuerySpecif
@Override
public String getShortDescription() {
- return "6395623258575591161";
+ return "6395623258577405264";
}
@Override
@@ -117,8 +117,8 @@ public final class Typing_Infer_WrappedQuerySpecification extends MPSQuerySpecif
return LType.Nat.create();
}
- }, var__6395623258575591161, false);
- new Equality(body, var__tmp_151, var__6395623258575591161);
+ }, var__6395623258577405264, false);
+ new Equality(body, var__tmp_151, var__6395623258577405264);
new Equality(body, var__tmp_151, var_out_1);
SetSequence.fromSet(bodies).addElement(body);
@@ -134,10 +134,10 @@ public final class Typing_Infer_WrappedQuerySpecification extends MPSQuerySpecif
body.setSymbolicParameters(exportedParameters);
PVariable var__tmp_152 = body.getOrCreateVariableByName("tmp_152");
+ PVariable var__6395623258577405299 = body.newVirtualVariable();
PVariable var__match_a0b0a81 = body.getOrCreateVariableByName("match_a0b0a81");
PVariable var__t = body.getOrCreateVariableByName("t");
PVariable var__tmp_153 = body.getOrCreateVariableByName("tmp_153");
- PVariable var__6395623258575591196 = body.newVirtualVariable();
PVariable var__match_a1a0s = body.getOrCreateVariableByName("match_a1a0s");
new TypeConstraint(body, Tuples.flatTupleOf(var_term), new ConceptKey(MetaAdapterFactory.getInterfaceConcept(0x6b642eaa1043424aL, 0x9e0949eb41607114L, 0x1a4a252762eb92d1L, "RecordTypes.structure.Term")));
@@ -152,7 +152,7 @@ public final class Typing_Infer_WrappedQuerySpecification extends MPSQuerySpecif
@Override
public String getShortDescription() {
- return "6395623258575591196";
+ return "6395623258577405299";
}
@Override
@@ -165,8 +165,8 @@ public final class Typing_Infer_WrappedQuerySpecification extends MPSQuerySpecif
return LType.Nat.create();
}
- }, var__6395623258575591196, false);
- new Equality(body, var__tmp_153, var__6395623258575591196);
+ }, var__6395623258577405299, false);
+ new Equality(body, var__tmp_153, var__6395623258577405299);
new Equality(body, var__tmp_153, var_out_1);
SetSequence.fromSet(bodies).addElement(body);
@@ -182,7 +182,7 @@ public final class Typing_Infer_WrappedQuerySpecification extends MPSQuerySpecif
body.setSymbolicParameters(exportedParameters);
PVariable var__match_b0c0a81 = body.getOrCreateVariableByName("match_b0c0a81");
- PVariable var__6395623258575591245 = body.newVirtualVariable();
+ PVariable var__6395623258577405348 = body.newVirtualVariable();
PVariable var__match_a0c0a81 = body.getOrCreateVariableByName("match_a0c0a81");
PVariable var__t1 = body.getOrCreateVariableByName("t1");
PVariable var__tmp_154 = body.getOrCreateVariableByName("tmp_154");
@@ -207,7 +207,7 @@ public final class Typing_Infer_WrappedQuerySpecification extends MPSQuerySpecif
@Override
public String getShortDescription() {
- return "6395623258575591245";
+ return "6395623258577405348";
}
@Override
@@ -220,8 +220,8 @@ public final class Typing_Infer_WrappedQuerySpecification extends MPSQuerySpecif
return LType.Nat.create();
}
- }, var__6395623258575591245, false);
- new Equality(body, var__tmp_156, var__6395623258575591245);
+ }, var__6395623258577405348, false);
+ new Equality(body, var__tmp_156, var__6395623258577405348);
new Equality(body, var__tmp_156, var_out_1);
SetSequence.fromSet(bodies).addElement(body);
@@ -243,8 +243,8 @@ public final class Typing_Infer_WrappedQuerySpecification extends MPSQuerySpecif
PVariable var__match_a0d0a81 = body.getOrCreateVariableByName("match_a0d0a81");
PVariable var__match_a3a0s = body.getOrCreateVariableByName("match_a3a0s");
PVariable var__t1 = body.getOrCreateVariableByName("t1");
+ PVariable var__6395623258577405397 = body.newVirtualVariable();
PVariable var__t2 = body.getOrCreateVariableByName("t2");
- PVariable var__6395623258575591294 = body.newVirtualVariable();
new TypeConstraint(body, Tuples.flatTupleOf(var_term), new ConceptKey(MetaAdapterFactory.getInterfaceConcept(0x6b642eaa1043424aL, 0x9e0949eb41607114L, 0x1a4a252762eb92d1L, "RecordTypes.structure.Term")));
new PositivePatternCall(body, Tuples.flatTupleOf(), Typing_Infer_0_switchCommonQuerySpecification.instance().getInternalQueryRepresentation());
@@ -262,7 +262,7 @@ public final class Typing_Infer_WrappedQuerySpecification extends MPSQuerySpecif
@Override
public String getShortDescription() {
- return "6395623258575591294";
+ return "6395623258577405397";
}
@Override
@@ -275,8 +275,8 @@ public final class Typing_Infer_WrappedQuerySpecification extends MPSQuerySpecif
return LType.Nat.create();
}
- }, var__6395623258575591294, false);
- new Equality(body, var__tmp_159, var__6395623258575591294);
+ }, var__6395623258577405397, false);
+ new Equality(body, var__tmp_159, var__6395623258577405397);
new Equality(body, var__tmp_159, var_out_1);
SetSequence.fromSet(bodies).addElement(body);
@@ -395,11 +395,10 @@ public final class Typing_Infer_WrappedQuerySpecification extends MPSQuerySpecif
body.setSymbolicParameters(exportedParameters);
PVariable var__tmp_171 = body.getOrCreateVariableByName("tmp_171");
- PVariable var__6395623258575591473 = body.newVirtualVariable();
PVariable var__tmp_172 = body.getOrCreateVariableByName("tmp_172");
+ PVariable var__6395623258577405576 = body.newVirtualVariable();
PVariable var__match_a7a0s = body.getOrCreateVariableByName("match_a7a0s");
PVariable var__tmp_173 = body.getOrCreateVariableByName("tmp_173");
- PVariable var__6395623258575591457 = body.newVirtualVariable();
PVariable var__tmp_170 = body.getOrCreateVariableByName("tmp_170");
PVariable var__match_b0h0a81 = body.getOrCreateVariableByName("match_b0h0a81");
PVariable var__ty2 = body.getOrCreateVariableByName("ty2");
@@ -409,6 +408,7 @@ public final class Typing_Infer_WrappedQuerySpecification extends MPSQuerySpecif
PVariable var__match_a0h0a81 = body.getOrCreateVariableByName("match_a0h0a81");
PVariable var__t1 = body.getOrCreateVariableByName("t1");
PVariable var__t2 = body.getOrCreateVariableByName("t2");
+ PVariable var__6395623258577405560 = body.newVirtualVariable();
new TypeConstraint(body, Tuples.flatTupleOf(var_term), new ConceptKey(MetaAdapterFactory.getInterfaceConcept(0x6b642eaa1043424aL, 0x9e0949eb41607114L, 0x1a4a252762eb92d1L, "RecordTypes.structure.Term")));
new PositivePatternCall(body, Tuples.flatTupleOf(), Typing_Infer_0_switchCommonQuerySpecification.instance().getInternalQueryRepresentation());
@@ -426,7 +426,7 @@ public final class Typing_Infer_WrappedQuerySpecification extends MPSQuerySpecif
@Override
public String getShortDescription() {
- return "6395623258575591457";
+ return "6395623258577405560";
}
@Override
@@ -439,14 +439,14 @@ public final class Typing_Infer_WrappedQuerySpecification extends MPSQuerySpecif
return LType.instance().funParamType(((LType.LTypeElement) valueProvider.getValue("ty")));
}
- }, var__6395623258575591457, false);
- new Equality(body, var__tmp_172, var__6395623258575591457);
+ }, var__6395623258577405560, false);
+ new Equality(body, var__tmp_172, var__6395623258577405560);
new Equality(body, var__ty1, var__tmp_172);
new ExpressionEvaluation(body, new IExpressionEvaluator() {
@Override
public String getShortDescription() {
- return "6395623258575591473";
+ return "6395623258577405576";
}
@Override
@@ -459,8 +459,8 @@ public final class Typing_Infer_WrappedQuerySpecification extends MPSQuerySpecif
return LType.instance().funResultType(((LType.LTypeElement) valueProvider.getValue("ty")));
}
- }, var__6395623258575591473, false);
- new Equality(body, var__tmp_173, var__6395623258575591473);
+ }, var__6395623258577405576, false);
+ new Equality(body, var__tmp_173, var__6395623258577405576);
new Equality(body, var__ty2, var__tmp_173);
new PositivePatternCall(body, Tuples.flatTupleOf(var__t2), Typing_CheckQuerySpecification.instance().getInternalQueryRepresentation());
new Equality(body, var__ty2, var_out_1);
@@ -479,10 +479,10 @@ public final class Typing_Infer_WrappedQuerySpecification extends MPSQuerySpecif
PVariable var__match_a8a0s = body.getOrCreateVariableByName("match_a8a0s");
PVariable var__tmp_174 = body.getOrCreateVariableByName("tmp_174");
- PVariable var__6395623258575591531 = body.newVirtualVariable();
PVariable var__ty = body.getOrCreateVariableByName("ty");
PVariable var__t = body.getOrCreateVariableByName("t");
PVariable var__match_b0i0a81 = body.getOrCreateVariableByName("match_b0i0a81");
+ PVariable var__6395623258577405634 = body.newVirtualVariable();
PVariable var__tmp_175 = body.getOrCreateVariableByName("tmp_175");
PVariable var__name = body.getOrCreateVariableByName("name");
PVariable var__tmp_176 = body.getOrCreateVariableByName("tmp_176");
@@ -505,7 +505,7 @@ public final class Typing_Infer_WrappedQuerySpecification extends MPSQuerySpecif
@Override
public String getShortDescription() {
- return "6395623258575591531";
+ return "6395623258577405634";
}
@Override
@@ -518,8 +518,8 @@ public final class Typing_Infer_WrappedQuerySpecification extends MPSQuerySpecif
return LType.instance().recordLookup(((LType.LTypeElement) valueProvider.getValue("ty")), (CodeGenerationHelper.demandWrapString(valueProvider.getValue("name"))));
}
- }, var__6395623258575591531, false);
- new Equality(body, var__tmp_177, var__6395623258575591531);
+ }, var__6395623258577405634, false);
+ new Equality(body, var__tmp_177, var__6395623258577405634);
new Equality(body, var__tmp_177, var_out_1);
SetSequence.fromSet(bodies).addElement(body);
@@ -562,9 +562,9 @@ public final class Typing_Infer_WrappedQuerySpecification extends MPSQuerySpecif
exportedParameters.add(new ExportedParameter(body, var_out_1, p_out_1));
body.setSymbolicParameters(exportedParameters);
- PVariable var__6395623258575591577 = body.newVirtualVariable();
PVariable var__tmp_180 = body.getOrCreateVariableByName("tmp_180");
PVariable var__match_a01a0s = body.getOrCreateVariableByName("match_a01a0s");
+ PVariable var__6395623258577405680 = body.newVirtualVariable();
new TypeConstraint(body, Tuples.flatTupleOf(var_term), new ConceptKey(MetaAdapterFactory.getInterfaceConcept(0x6b642eaa1043424aL, 0x9e0949eb41607114L, 0x1a4a252762eb92d1L, "RecordTypes.structure.Term")));
new PositivePatternCall(body, Tuples.flatTupleOf(), Typing_Infer_0_switchCommonQuerySpecification.instance().getInternalQueryRepresentation());
@@ -573,7 +573,7 @@ public final class Typing_Infer_WrappedQuerySpecification extends MPSQuerySpecif
@Override
public String getShortDescription() {
- return "6395623258575591577";
+ return "6395623258577405680";
}
@Override
@@ -586,8 +586,8 @@ public final class Typing_Infer_WrappedQuerySpecification extends MPSQuerySpecif
return LType.Any.create();
}
- }, var__6395623258575591577, false);
- new Equality(body, var__tmp_180, var__6395623258575591577);
+ }, var__6395623258577405680, false);
+ new Equality(body, var__tmp_180, var__6395623258577405680);
new Equality(body, var__tmp_180, var_out_1);
SetSequence.fromSet(bodies).addElement(body);
diff --git a/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_LookupFailureQuerySpecification.java b/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_LookupFailureQuerySpecification.java
index e2cb70986ee8a67df46c395ab0a2a9ba975e23a3..2ba6399fe77abcd4c0ce8b63e0856e25d81daf3c 100644
--- a/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_LookupFailureQuerySpecification.java
+++ b/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_LookupFailureQuerySpecification.java
@@ -98,10 +98,10 @@ public final class Typing_LookupFailureQuerySpecification extends MPSQuerySpecif
PVariable var__tmp_33 = body.getOrCreateVariableByName("tmp_33");
PVariable var__term = body.getOrCreateVariableByName("term");
PVariable var__tmp_32 = body.getOrCreateVariableByName("tmp_32");
- PVariable var__6395623258575564795 = body.newConstantVariable(Integer.parseInt("0"));
+ PVariable var__6395623258577379240 = body.newConstantVariable(Integer.parseInt("0"));
PVariable var__match_a0a0a0k = body.getOrCreateVariableByName("match_a0a0a0k");
PVariable var__v = body.getOrCreateVariableByName("v");
- PVariable var__6395623258575589710 = body.newVirtualVariable();
+ PVariable var__6395623258577403813 = body.newVirtualVariable();
new TypeConstraint(body, Tuples.flatTupleOf(var_out_1), new ConceptKey(MetaAdapterFactory.getConcept(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL, "jetbrains.mps.lang.core.structure.BaseConcept")));
new PositivePatternCall(body, Tuples.flatTupleOf(var__term), Typing_LookupFailure_0_switchCommonQuerySpecification.instance().getInternalQueryRepresentation());
@@ -109,12 +109,12 @@ public final class Typing_LookupFailureQuerySpecification extends MPSQuerySpecif
new TypeConstraint(body, Tuples.flatTupleOf(var__match_a0a0a0k), new ConceptKey(MetaAdapterFactory.getConcept(0x6b642eaa1043424aL, 0x9e0949eb41607114L, 0x1a4a252762eb92e0L, "RecordTypes.structure.Var")));
new Equality(body, var__v, var__match_a0a0a0k);
new NegativePatternCall(body, Tuples.flatTupleOf(var__term, var__v, var__tmp_31), Typing_LookupQuerySpecification.instance().getInternalQueryRepresentation());
- new Equality(body, var__tmp_32, var__6395623258575564795);
+ new Equality(body, var__tmp_32, var__6395623258577379240);
new ExpressionEvaluation(body, new IExpressionEvaluator() {
@Override
public String getShortDescription() {
- return "6395623258575589710";
+ return "6395623258577403813";
}
@Override
@@ -127,8 +127,8 @@ public final class Typing_LookupFailureQuerySpecification extends MPSQuerySpecif
return String.format("variable not bound");
}
- }, var__6395623258575589710, false);
- new Equality(body, var__tmp_33, var__6395623258575589710);
+ }, var__6395623258577403813, false);
+ new Equality(body, var__tmp_33, var__6395623258577403813);
new Equality(body, var__tmp_32, var_out_0);
new Equality(body, var__v, var_out_1);
new Equality(body, var__tmp_33, var_out_2);
diff --git a/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_LookupQuerySpecification.java b/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_LookupQuerySpecification.java
index 87f85c47281652a5063817606ed876c75cc218d5..0e07cd3bc429be43cd7075bcc47b26f321ec22cf 100644
--- a/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_LookupQuerySpecification.java
+++ b/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_LookupQuerySpecification.java
@@ -610,6 +610,7 @@ public final class Typing_LookupQuerySpecification extends MPSQuerySpecification
PVariable var__match_a0a7c0o = body.getOrCreateVariableByName("match_a0a7c0o");
PVariable var__match_a7c0o = body.getOrCreateVariableByName("match_a7c0o");
PVariable var__t = body.getOrCreateVariableByName("t");
+ PVariable var__6395623258577404529 = body.newVirtualVariable();
PVariable var__tmp_89 = body.getOrCreateVariableByName("tmp_89");
PVariable var__tmp_88 = body.getOrCreateVariableByName("tmp_88");
PVariable var__ty1 = body.getOrCreateVariableByName("ty1");
@@ -617,7 +618,6 @@ public final class Typing_LookupQuerySpecification extends MPSQuerySpecification
PVariable var__ty = body.getOrCreateVariableByName("ty");
PVariable var__tmp_92 = body.getOrCreateVariableByName("tmp_92");
PVariable var__match_b0a7c0o = body.getOrCreateVariableByName("match_b0a7c0o");
- PVariable var__6395623258575590426 = body.newVirtualVariable();
PVariable var__tmp_91 = body.getOrCreateVariableByName("tmp_91");
PVariable var__tmp_90 = body.getOrCreateVariableByName("tmp_90");
PVariable var__name = body.getOrCreateVariableByName("name");
@@ -644,7 +644,7 @@ public final class Typing_LookupQuerySpecification extends MPSQuerySpecification
@Override
public String getShortDescription() {
- return "6395623258575590426";
+ return "6395623258577404529";
}
@Override
@@ -657,8 +657,8 @@ public final class Typing_LookupQuerySpecification extends MPSQuerySpecification
return LType.instance().funParamType(((LType.LTypeElement) valueProvider.getValue("ty")));
}
- }, var__6395623258575590426, false);
- new Equality(body, var__tmp_92, var__6395623258575590426);
+ }, var__6395623258577404529, false);
+ new Equality(body, var__tmp_92, var__6395623258577404529);
new Equality(body, var__ty1, var__tmp_92);
new Equality(body, var__ty1, var_out_2);
diff --git a/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_MatchFunFailureQuerySpecification.java b/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_MatchFunFailureQuerySpecification.java
index d88df7f62e7abf120a6574674305bc928e455980..8d8b99275467a4a4675e9b903f1fd41119f4a314 100644
--- a/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_MatchFunFailureQuerySpecification.java
+++ b/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_MatchFunFailureQuerySpecification.java
@@ -94,17 +94,17 @@ public final class Typing_MatchFunFailureQuerySpecification extends MPSQuerySpec
exportedParameters.add(new ExportedParameter(body, var_out_2, p_out_2));
body.setSymbolicParameters(exportedParameters);
- PVariable var__6395623258575589440 = body.newVirtualVariable();
PVariable var__tmp_1 = body.getOrCreateVariableByName("tmp_1");
+ PVariable var__6395623258577379098 = body.newConstantVariable(false);
PVariable var__tmp_2 = body.getOrCreateVariableByName("tmp_2");
- PVariable var__6395623258575564661 = body.newConstantVariable(Integer.parseInt("0"));
PVariable var__ty = body.getOrCreateVariableByName("ty");
PVariable var__tmp_3 = body.getOrCreateVariableByName("tmp_3");
PVariable var__tmp_4 = body.getOrCreateVariableByName("tmp_4");
- PVariable var__6395623258575564653 = body.newConstantVariable(false);
+ PVariable var__6395623258577403543 = body.newVirtualVariable();
PVariable var__tmp_5 = body.getOrCreateVariableByName("tmp_5");
PVariable var__tmp_6 = body.getOrCreateVariableByName("tmp_6");
- PVariable var__6395623258575589456 = body.newVirtualVariable();
+ PVariable var__6395623258577379106 = body.newConstantVariable(Integer.parseInt("0"));
+ PVariable var__6395623258577403559 = body.newVirtualVariable();
PVariable var__app = body.getOrCreateVariableByName("app");
new TypeConstraint(body, Tuples.flatTupleOf(var_out_1), new ConceptKey(MetaAdapterFactory.getConcept(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL, "jetbrains.mps.lang.core.structure.BaseConcept")));
@@ -117,7 +117,7 @@ public final class Typing_MatchFunFailureQuerySpecification extends MPSQuerySpec
@Override
public String getShortDescription() {
- return "6395623258575589440";
+ return "6395623258577403543";
}
@Override
@@ -130,16 +130,16 @@ public final class Typing_MatchFunFailureQuerySpecification extends MPSQuerySpec
return LType.instance().isFun(((LType.LTypeElement) valueProvider.getValue("ty")));
}
- }, var__6395623258575589440, false);
- new Equality(body, var__tmp_3, var__6395623258575589440);
- new Equality(body, var__tmp_4, var__6395623258575564653);
+ }, var__6395623258577403543, false);
+ new Equality(body, var__tmp_3, var__6395623258577403543);
+ new Equality(body, var__tmp_4, var__6395623258577379098);
new Equality(body, var__tmp_3, var__tmp_4);
- new Equality(body, var__tmp_5, var__6395623258575564661);
+ new Equality(body, var__tmp_5, var__6395623258577379106);
new ExpressionEvaluation(body, new IExpressionEvaluator() {
@Override
public String getShortDescription() {
- return "6395623258575589456";
+ return "6395623258577403559";
}
@Override
@@ -152,8 +152,8 @@ public final class Typing_MatchFunFailureQuerySpecification extends MPSQuerySpec
return String.format("not a function");
}
- }, var__6395623258575589456, false);
- new Equality(body, var__tmp_6, var__6395623258575589456);
+ }, var__6395623258577403559, false);
+ new Equality(body, var__tmp_6, var__6395623258577403559);
new Equality(body, var__tmp_5, var_out_0);
new Equality(body, var__app, var_out_1);
new Equality(body, var__tmp_6, var_out_2);
@@ -172,17 +172,17 @@ public final class Typing_MatchFunFailureQuerySpecification extends MPSQuerySpec
exportedParameters.add(new ExportedParameter(body, var_out_2, p_out_2));
body.setSymbolicParameters(exportedParameters);
+ PVariable var__6395623258577379131 = body.newConstantVariable(false);
PVariable var__tmp_11 = body.getOrCreateVariableByName("tmp_11");
PVariable var__tmp_10 = body.getOrCreateVariableByName("tmp_10");
- PVariable var__6395623258575564694 = body.newConstantVariable(Integer.parseInt("0"));
PVariable var__ty = body.getOrCreateVariableByName("ty");
PVariable var__lam = body.getOrCreateVariableByName("lam");
- PVariable var__6395623258575564686 = body.newConstantVariable(false);
+ PVariable var__6395623258577403588 = body.newVirtualVariable();
PVariable var__tmp_7 = body.getOrCreateVariableByName("tmp_7");
+ PVariable var__6395623258577403604 = body.newVirtualVariable();
PVariable var__tmp_8 = body.getOrCreateVariableByName("tmp_8");
PVariable var__tmp_9 = body.getOrCreateVariableByName("tmp_9");
- PVariable var__6395623258575589501 = body.newVirtualVariable();
- PVariable var__6395623258575589485 = body.newVirtualVariable();
+ PVariable var__6395623258577379139 = body.newConstantVariable(Integer.parseInt("0"));
new TypeConstraint(body, Tuples.flatTupleOf(var_out_1), new ConceptKey(MetaAdapterFactory.getConcept(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL, "jetbrains.mps.lang.core.structure.BaseConcept")));
new PositivePatternCall(body, Tuples.flatTupleOf(), Typing_MatchFunFailure_0_switchCommonQuerySpecification.instance().getInternalQueryRepresentation());
@@ -193,7 +193,7 @@ public final class Typing_MatchFunFailureQuerySpecification extends MPSQuerySpec
@Override
public String getShortDescription() {
- return "6395623258575589485";
+ return "6395623258577403588";
}
@Override
@@ -206,16 +206,16 @@ public final class Typing_MatchFunFailureQuerySpecification extends MPSQuerySpec
return LType.instance().isFun(((LType.LTypeElement) valueProvider.getValue("ty")));
}
- }, var__6395623258575589485, false);
- new Equality(body, var__tmp_8, var__6395623258575589485);
- new Equality(body, var__tmp_9, var__6395623258575564686);
+ }, var__6395623258577403588, false);
+ new Equality(body, var__tmp_8, var__6395623258577403588);
+ new Equality(body, var__tmp_9, var__6395623258577379131);
new Equality(body, var__tmp_8, var__tmp_9);
- new Equality(body, var__tmp_10, var__6395623258575564694);
+ new Equality(body, var__tmp_10, var__6395623258577379139);
new ExpressionEvaluation(body, new IExpressionEvaluator() {
@Override
public String getShortDescription() {
- return "6395623258575589501";
+ return "6395623258577403604";
}
@Override
@@ -228,8 +228,8 @@ public final class Typing_MatchFunFailureQuerySpecification extends MPSQuerySpec
return String.format("not a function");
}
- }, var__6395623258575589501, false);
- new Equality(body, var__tmp_11, var__6395623258575589501);
+ }, var__6395623258577403604, false);
+ new Equality(body, var__tmp_11, var__6395623258577403604);
new Equality(body, var__tmp_10, var_out_0);
new Equality(body, var__lam, var_out_1);
new Equality(body, var__tmp_11, var_out_2);
diff --git a/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_MatchRecordFailureQuerySpecification.java b/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_MatchRecordFailureQuerySpecification.java
index 6d5b4f4de5252aae455ccad0d7a00eb6997179fe..790a5a5c97fcd531ccbe9791dea4c05507e23b84 100644
--- a/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_MatchRecordFailureQuerySpecification.java
+++ b/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_MatchRecordFailureQuerySpecification.java
@@ -94,17 +94,17 @@ public final class Typing_MatchRecordFailureQuerySpecification extends MPSQueryS
exportedParameters.add(new ExportedParameter(body, var_out_2, p_out_2));
body.setSymbolicParameters(exportedParameters);
- PVariable var__6395623258575564729 = body.newConstantVariable(Integer.parseInt("0"));
+ PVariable var__6395623258577379166 = body.newConstantVariable(false);
+ PVariable var__6395623258577379174 = body.newConstantVariable(Integer.parseInt("0"));
PVariable var__sel = body.getOrCreateVariableByName("sel");
PVariable var__ty = body.getOrCreateVariableByName("ty");
- PVariable var__6395623258575589535 = body.newVirtualVariable();
- PVariable var__6395623258575564721 = body.newConstantVariable(false);
+ PVariable var__6395623258577403654 = body.newVirtualVariable();
PVariable var__tmp_17 = body.getOrCreateVariableByName("tmp_17");
+ PVariable var__6395623258577403638 = body.newVirtualVariable();
PVariable var__tmp_16 = body.getOrCreateVariableByName("tmp_16");
PVariable var__tmp_13 = body.getOrCreateVariableByName("tmp_13");
PVariable var__tmp_12 = body.getOrCreateVariableByName("tmp_12");
PVariable var__tmp_15 = body.getOrCreateVariableByName("tmp_15");
- PVariable var__6395623258575589551 = body.newVirtualVariable();
PVariable var__tmp_14 = body.getOrCreateVariableByName("tmp_14");
new TypeConstraint(body, Tuples.flatTupleOf(var_out_1), new ConceptKey(MetaAdapterFactory.getConcept(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL, "jetbrains.mps.lang.core.structure.BaseConcept")));
@@ -117,7 +117,7 @@ public final class Typing_MatchRecordFailureQuerySpecification extends MPSQueryS
@Override
public String getShortDescription() {
- return "6395623258575589535";
+ return "6395623258577403638";
}
@Override
@@ -130,16 +130,16 @@ public final class Typing_MatchRecordFailureQuerySpecification extends MPSQueryS
return LType.instance().isRecord(((LType.LTypeElement) valueProvider.getValue("ty")));
}
- }, var__6395623258575589535, false);
- new Equality(body, var__tmp_14, var__6395623258575589535);
- new Equality(body, var__tmp_15, var__6395623258575564721);
+ }, var__6395623258577403638, false);
+ new Equality(body, var__tmp_14, var__6395623258577403638);
+ new Equality(body, var__tmp_15, var__6395623258577379166);
new Equality(body, var__tmp_14, var__tmp_15);
- new Equality(body, var__tmp_16, var__6395623258575564729);
+ new Equality(body, var__tmp_16, var__6395623258577379174);
new ExpressionEvaluation(body, new IExpressionEvaluator() {
@Override
public String getShortDescription() {
- return "6395623258575589551";
+ return "6395623258577403654";
}
@Override
@@ -152,8 +152,8 @@ public final class Typing_MatchRecordFailureQuerySpecification extends MPSQueryS
return String.format("not a record\"");
}
- }, var__6395623258575589551, false);
- new Equality(body, var__tmp_17, var__6395623258575589551);
+ }, var__6395623258577403654, false);
+ new Equality(body, var__tmp_17, var__6395623258577403654);
new Equality(body, var__tmp_16, var_out_0);
new Equality(body, var__sel, var_out_1);
new Equality(body, var__tmp_17, var_out_2);
@@ -173,16 +173,16 @@ public final class Typing_MatchRecordFailureQuerySpecification extends MPSQueryS
body.setSymbolicParameters(exportedParameters);
PVariable var__tmp_20 = body.getOrCreateVariableByName("tmp_20");
- PVariable var__6395623258575589580 = body.newVirtualVariable();
+ PVariable var__6395623258577379199 = body.newConstantVariable(false);
PVariable var__tmp_22 = body.getOrCreateVariableByName("tmp_22");
+ PVariable var__6395623258577403683 = body.newVirtualVariable();
PVariable var__tmp_21 = body.getOrCreateVariableByName("tmp_21");
PVariable var__ty = body.getOrCreateVariableByName("ty");
- PVariable var__6395623258575564762 = body.newConstantVariable(Integer.parseInt("0"));
- PVariable var__6395623258575564754 = body.newConstantVariable(false);
+ PVariable var__6395623258577403699 = body.newVirtualVariable();
+ PVariable var__6395623258577379207 = body.newConstantVariable(Integer.parseInt("0"));
PVariable var__tmp_19 = body.getOrCreateVariableByName("tmp_19");
PVariable var__tmp_18 = body.getOrCreateVariableByName("tmp_18");
PVariable var__rec = body.getOrCreateVariableByName("rec");
- PVariable var__6395623258575589596 = body.newVirtualVariable();
new TypeConstraint(body, Tuples.flatTupleOf(var_out_1), new ConceptKey(MetaAdapterFactory.getConcept(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL, "jetbrains.mps.lang.core.structure.BaseConcept")));
new PositivePatternCall(body, Tuples.flatTupleOf(), Typing_MatchRecordFailure_0_switchCommonQuerySpecification.instance().getInternalQueryRepresentation());
@@ -193,7 +193,7 @@ public final class Typing_MatchRecordFailureQuerySpecification extends MPSQueryS
@Override
public String getShortDescription() {
- return "6395623258575589580";
+ return "6395623258577403683";
}
@Override
@@ -206,16 +206,16 @@ public final class Typing_MatchRecordFailureQuerySpecification extends MPSQueryS
return LType.instance().isRecord(((LType.LTypeElement) valueProvider.getValue("ty")));
}
- }, var__6395623258575589580, false);
- new Equality(body, var__tmp_19, var__6395623258575589580);
- new Equality(body, var__tmp_20, var__6395623258575564754);
+ }, var__6395623258577403683, false);
+ new Equality(body, var__tmp_19, var__6395623258577403683);
+ new Equality(body, var__tmp_20, var__6395623258577379199);
new Equality(body, var__tmp_19, var__tmp_20);
- new Equality(body, var__tmp_21, var__6395623258575564762);
+ new Equality(body, var__tmp_21, var__6395623258577379207);
new ExpressionEvaluation(body, new IExpressionEvaluator() {
@Override
public String getShortDescription() {
- return "6395623258575589596";
+ return "6395623258577403699";
}
@Override
@@ -228,8 +228,8 @@ public final class Typing_MatchRecordFailureQuerySpecification extends MPSQueryS
return String.format("not a record");
}
- }, var__6395623258575589596, false);
- new Equality(body, var__tmp_22, var__6395623258575589596);
+ }, var__6395623258577403699, false);
+ new Equality(body, var__tmp_22, var__6395623258577403699);
new Equality(body, var__tmp_21, var_out_0);
new Equality(body, var__rec, var_out_1);
new Equality(body, var__tmp_22, var_out_2);
diff --git a/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_RecordEntryCountQuerySpecification.java b/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_RecordEntryCountQuerySpecification.java
index 4863e20fdc7f66a40c7812117bc71193eaab9c31..3b0ff516020b2d3b64464377364d9f4300157ee8 100644
--- a/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_RecordEntryCountQuerySpecification.java
+++ b/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_RecordEntryCountQuerySpecification.java
@@ -88,13 +88,13 @@ public final class Typing_RecordEntryCountQuerySpecification extends MPSQuerySpe
body.setSymbolicParameters(exportedParameters);
PVariable var__tmp_30 = body.getOrCreateVariableByName("tmp_30");
+ PVariable var__6395623258577403782 = body.newVirtualVariable();
PVariable var__num = body.getOrCreateVariableByName("num");
- PVariable var__6395623258575589679 = body.newVirtualVariable();
PVariable var__tmp_29 = body.getOrCreateVariableByName("tmp_29");
new TypeConstraint(body, Tuples.flatTupleOf(var_rec), new ConceptKey(MetaAdapterFactory.getConcept(0x6b642eaa1043424aL, 0x9e0949eb41607114L, 0x9229981a3b8f573L, "RecordTypes.structure.Record")));
- new PatternMatchCounter(body, Tuples.flatTupleOf(var_rec, var__tmp_29), Typing_RecordEntriesQuerySpecification.instance().getInternalQueryRepresentation(), var__6395623258575589679);
- new Equality(body, var__tmp_30, var__6395623258575589679);
+ new PatternMatchCounter(body, Tuples.flatTupleOf(var_rec, var__tmp_29), Typing_RecordEntriesQuerySpecification.instance().getInternalQueryRepresentation(), var__6395623258577403782);
+ new Equality(body, var__tmp_30, var__6395623258577403782);
new Equality(body, var__num, var__tmp_30);
new Equality(body, var__num, var_out_1);
diff --git a/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_RecordSameLengthFailureQuerySpecification.java b/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_RecordSameLengthFailureQuerySpecification.java
index 9a058d2450c149cf8d40a3b9c53e84e53f0f25ef..25c1eb034b6e7126f12b01cbda6257b336b099d0 100644
--- a/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_RecordSameLengthFailureQuerySpecification.java
+++ b/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_RecordSameLengthFailureQuerySpecification.java
@@ -95,23 +95,23 @@ public final class Typing_RecordSameLengthFailureQuerySpecification extends MPSQ
body.setSymbolicParameters(exportedParameters);
PVariable var__ty = body.getOrCreateVariableByName("ty");
- PVariable var__6395623258575589621 = body.newVirtualVariable();
+ PVariable var__6395623258577365223 = body.newConstantVariable(Integer.parseInt("0"));
+ PVariable var__6395623258577403724 = body.newVirtualVariable();
PVariable var__tmp_24 = body.getOrCreateVariableByName("tmp_24");
PVariable var__recordTypeSize = body.getOrCreateVariableByName("recordTypeSize");
PVariable var__tmp_23 = body.getOrCreateVariableByName("tmp_23");
- PVariable var__6395623258575550778 = body.newConstantVariable(Integer.parseInt("0"));
PVariable var__rec = body.getOrCreateVariableByName("rec");
PVariable var__recordTermSize = body.getOrCreateVariableByName("recordTermSize");
new TypeConstraint(body, Tuples.flatTupleOf(var_out_1), new ConceptKey(MetaAdapterFactory.getConcept(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL, "jetbrains.mps.lang.core.structure.BaseConcept")));
new PositivePatternCall(body, Tuples.flatTupleOf(var__rec, var__recordTermSize, var__recordTypeSize, var__ty), Typing_RecordSameLengthFailure_0_switchCommonQuerySpecification.instance().getInternalQueryRepresentation());
new Inequality(body, var__recordTypeSize, var__recordTermSize);
- new Equality(body, var__tmp_23, var__6395623258575550778);
+ new Equality(body, var__tmp_23, var__6395623258577365223);
new ExpressionEvaluation(body, new IExpressionEvaluator() {
@Override
public String getShortDescription() {
- return "6395623258575589621";
+ return "6395623258577403724";
}
@Override
@@ -124,8 +124,8 @@ public final class Typing_RecordSameLengthFailureQuerySpecification extends MPSQ
return String.format("record type and record term do not contain the same labels");
}
- }, var__6395623258575589621, false);
- new Equality(body, var__tmp_24, var__6395623258575589621);
+ }, var__6395623258577403724, false);
+ new Equality(body, var__tmp_24, var__6395623258577403724);
new Equality(body, var__tmp_23, var_out_0);
new Equality(body, var__rec, var_out_1);
new Equality(body, var__tmp_24, var_out_2);
diff --git a/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_RecordSameLengthFailure_0_switchCommonQuerySpecification.java b/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_RecordSameLengthFailure_0_switchCommonQuerySpecification.java
index 309f8c82fe7fcd2a536fd0f460b6a4308a2856f9..5db50b2f52dba62a668102f98d6747a9b51f4276 100644
--- a/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_RecordSameLengthFailure_0_switchCommonQuerySpecification.java
+++ b/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_RecordSameLengthFailure_0_switchCommonQuerySpecification.java
@@ -97,9 +97,9 @@ public final class Typing_RecordSameLengthFailure_0_switchCommonQuerySpecificati
exportedParameters.add(new ExportedParameter(body, var_ty, p_ty));
body.setSymbolicParameters(exportedParameters);
- PVariable var__6395623258575589646 = body.newVirtualVariable();
PVariable var__tmp_27 = body.getOrCreateVariableByName("tmp_27");
PVariable var__tmp_26 = body.getOrCreateVariableByName("tmp_26");
+ PVariable var__6395623258577403749 = body.newVirtualVariable();
PVariable var__tmp_25 = body.getOrCreateVariableByName("tmp_25");
new TypeConstraint(body, Tuples.flatTupleOf(var_rec), new ConceptKey(MetaAdapterFactory.getConcept(0x6b642eaa1043424aL, 0x9e0949eb41607114L, 0x9229981a3b8f573L, "RecordTypes.structure.Record")));
@@ -109,7 +109,7 @@ public final class Typing_RecordSameLengthFailure_0_switchCommonQuerySpecificati
@Override
public String getShortDescription() {
- return "6395623258575589646";
+ return "6395623258577403749";
}
@Override
@@ -122,8 +122,8 @@ public final class Typing_RecordSameLengthFailure_0_switchCommonQuerySpecificati
return LType.instance().recordSize(((LType.LTypeElement) valueProvider.getValue("ty")));
}
- }, var__6395623258575589646, false);
- new Equality(body, var__tmp_26, var__6395623258575589646);
+ }, var__6395623258577403749, false);
+ new Equality(body, var__tmp_26, var__6395623258577403749);
new Equality(body, var_recordTypeSize, var__tmp_26);
new PositivePatternCall(body, Tuples.flatTupleOf(var_rec, var__tmp_27), Typing_RecordEntryCountQuerySpecification.instance().getInternalQueryRepresentation());
new Equality(body, var_recordTermSize, var__tmp_27);
diff --git a/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_RequiredQuerySpecification.java b/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_RequiredQuerySpecification.java
index c4be3ec3cd16081c510d553af3146cd7e4ba647f..f5c62a0322ff4ce6d57860378d07f65e6e0ca9cf 100644
--- a/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_RequiredQuerySpecification.java
+++ b/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/Typing_RequiredQuerySpecification.java
@@ -98,10 +98,10 @@ public final class Typing_RequiredQuerySpecification extends MPSQuerySpecificati
PVariable var__ty = body.getOrCreateVariableByName("ty");
PVariable var__label = body.getOrCreateVariableByName("label");
PVariable var__pparent = body.getOrCreateVariableByName("pparent");
- PVariable var__6395623258575591814 = body.newVirtualVariable();
PVariable var__tmp_197 = body.getOrCreateVariableByName("tmp_197");
PVariable var__tmp_198 = body.getOrCreateVariableByName("tmp_198");
PVariable var__tmp_199 = body.getOrCreateVariableByName("tmp_199");
+ PVariable var__6395623258577405917 = body.newVirtualVariable();
new TypeConstraint(body, Tuples.flatTupleOf(var_term), new ConceptKey(MetaAdapterFactory.getInterfaceConcept(0x6b642eaa1043424aL, 0x9e0949eb41607114L, 0x1a4a252762eb92d1L, "RecordTypes.structure.Term")));
new PositivePatternCall(body, Tuples.flatTupleOf(), Typing_Required_0_switchCommonQuerySpecification.instance().getInternalQueryRepresentation());
@@ -119,7 +119,7 @@ public final class Typing_RequiredQuerySpecification extends MPSQuerySpecificati
@Override
public String getShortDescription() {
- return "6395623258575591814";
+ return "6395623258577405917";
}
@Override
@@ -132,8 +132,8 @@ public final class Typing_RequiredQuerySpecification extends MPSQuerySpecificati
return LType.instance().recordLookup(((LType.LTypeElement) valueProvider.getValue("ty")), (CodeGenerationHelper.demandWrapString(valueProvider.getValue("label"))));
}
- }, var__6395623258575591814, false);
- new Equality(body, var__tmp_199, var__6395623258575591814);
+ }, var__6395623258577405917, false);
+ new Equality(body, var__tmp_199, var__6395623258577405917);
new Equality(body, var__tmp_199, var_out_1);
SetSequence.fromSet(bodies).addElement(body);
@@ -148,12 +148,12 @@ public final class Typing_RequiredQuerySpecification extends MPSQuerySpecificati
exportedParameters.add(new ExportedParameter(body, var_out_1, p_out_1));
body.setSymbolicParameters(exportedParameters);
+ PVariable var__6395623258577405962 = body.newVirtualVariable();
PVariable var__p = body.getOrCreateVariableByName("p");
PVariable var__match_a0a1a0w = body.getOrCreateVariableByName("match_a0a1a0w");
PVariable var__t = body.getOrCreateVariableByName("t");
PVariable var__tmp_201 = body.getOrCreateVariableByName("tmp_201");
PVariable var__tmp_202 = body.getOrCreateVariableByName("tmp_202");
- PVariable var__6395623258575591859 = body.newVirtualVariable();
PVariable var__match_a0a0a1a0w = body.getOrCreateVariableByName("match_a0a0a1a0w");
PVariable var__tmp_200 = body.getOrCreateVariableByName("tmp_200");
@@ -171,7 +171,7 @@ public final class Typing_RequiredQuerySpecification extends MPSQuerySpecificati
@Override
public String getShortDescription() {
- return "6395623258575591859";
+ return "6395623258577405962";
}
@Override
@@ -184,8 +184,8 @@ public final class Typing_RequiredQuerySpecification extends MPSQuerySpecificati
return LType.Nat.create();
}
- }, var__6395623258575591859, false);
- new Equality(body, var__tmp_202, var__6395623258575591859);
+ }, var__6395623258577405962, false);
+ new Equality(body, var__tmp_202, var__6395623258577405962);
new Equality(body, var__tmp_202, var_out_1);
SetSequence.fromSet(bodies).addElement(body);
@@ -202,13 +202,13 @@ public final class Typing_RequiredQuerySpecification extends MPSQuerySpecificati
PVariable var__match_a0a1a1a0w = body.getOrCreateVariableByName("match_a0a1a1a0w");
PVariable var__p = body.getOrCreateVariableByName("p");
+ PVariable var__6395623258577406016 = body.newVirtualVariable();
PVariable var__tmp_205 = body.getOrCreateVariableByName("tmp_205");
PVariable var__match_b0a1a1a0w = body.getOrCreateVariableByName("match_b0a1a1a0w");
PVariable var__tmp_206 = body.getOrCreateVariableByName("tmp_206");
PVariable var__match_a1a1a0w = body.getOrCreateVariableByName("match_a1a1a0w");
PVariable var__tmp_203 = body.getOrCreateVariableByName("tmp_203");
PVariable var__tmp_204 = body.getOrCreateVariableByName("tmp_204");
- PVariable var__6395623258575591913 = body.newVirtualVariable();
PVariable var__t1 = body.getOrCreateVariableByName("t1");
PVariable var__t2 = body.getOrCreateVariableByName("t2");
@@ -229,7 +229,7 @@ public final class Typing_RequiredQuerySpecification extends MPSQuerySpecificati
@Override
public String getShortDescription() {
- return "6395623258575591913";
+ return "6395623258577406016";
}
@Override
@@ -242,8 +242,8 @@ public final class Typing_RequiredQuerySpecification extends MPSQuerySpecificati
return LType.Nat.create();
}
- }, var__6395623258575591913, false);
- new Equality(body, var__tmp_206, var__6395623258575591913);
+ }, var__6395623258577406016, false);
+ new Equality(body, var__tmp_206, var__6395623258577406016);
new Equality(body, var__tmp_206, var_out_1);
SetSequence.fromSet(bodies).addElement(body);
@@ -262,10 +262,10 @@ public final class Typing_RequiredQuerySpecification extends MPSQuerySpecificati
PVariable var__match_a0a1a1a0w = body.getOrCreateVariableByName("match_a0a1a1a0w");
PVariable var__p = body.getOrCreateVariableByName("p");
PVariable var__match_b0a1a1a0w = body.getOrCreateVariableByName("match_b0a1a1a0w");
+ PVariable var__6395623258577406070 = body.newVirtualVariable();
PVariable var__tmp_207 = body.getOrCreateVariableByName("tmp_207");
PVariable var__match_a1a1a0w = body.getOrCreateVariableByName("match_a1a1a0w");
PVariable var__tmp_208 = body.getOrCreateVariableByName("tmp_208");
- PVariable var__6395623258575591967 = body.newVirtualVariable();
PVariable var__t1 = body.getOrCreateVariableByName("t1");
PVariable var__t2 = body.getOrCreateVariableByName("t2");
PVariable var__tmp_210 = body.getOrCreateVariableByName("tmp_210");
@@ -287,7 +287,7 @@ public final class Typing_RequiredQuerySpecification extends MPSQuerySpecificati
@Override
public String getShortDescription() {
- return "6395623258575591967";
+ return "6395623258577406070";
}
@Override
@@ -300,8 +300,8 @@ public final class Typing_RequiredQuerySpecification extends MPSQuerySpecificati
return LType.Nat.create();
}
- }, var__6395623258575591967, false);
- new Equality(body, var__tmp_210, var__6395623258575591967);
+ }, var__6395623258577406070, false);
+ new Equality(body, var__tmp_210, var__6395623258577406070);
new Equality(body, var__tmp_210, var_out_1);
SetSequence.fromSet(bodies).addElement(body);
@@ -318,6 +318,7 @@ public final class Typing_RequiredQuerySpecification extends MPSQuerySpecificati
PVariable var__p = body.getOrCreateVariableByName("p");
PVariable var__match_a2a1a0w = body.getOrCreateVariableByName("match_a2a1a0w");
+ PVariable var__6395623258577406124 = body.newVirtualVariable();
PVariable var__tmp_212 = body.getOrCreateVariableByName("tmp_212");
PVariable var__match_a0a2a1a0w = body.getOrCreateVariableByName("match_a0a2a1a0w");
PVariable var__tmp_213 = body.getOrCreateVariableByName("tmp_213");
@@ -326,7 +327,6 @@ public final class Typing_RequiredQuerySpecification extends MPSQuerySpecificati
PVariable var__t1 = body.getOrCreateVariableByName("t1");
PVariable var__t2 = body.getOrCreateVariableByName("t2");
PVariable var__tmp_211 = body.getOrCreateVariableByName("tmp_211");
- PVariable var__6395623258575592021 = body.newVirtualVariable();
new TypeConstraint(body, Tuples.flatTupleOf(var_term), new ConceptKey(MetaAdapterFactory.getInterfaceConcept(0x6b642eaa1043424aL, 0x9e0949eb41607114L, 0x1a4a252762eb92d1L, "RecordTypes.structure.Term")));
new PositivePatternCall(body, Tuples.flatTupleOf(), Typing_Required_0_switchCommonQuerySpecification.instance().getInternalQueryRepresentation());
@@ -345,7 +345,7 @@ public final class Typing_RequiredQuerySpecification extends MPSQuerySpecificati
@Override
public String getShortDescription() {
- return "6395623258575592021";
+ return "6395623258577406124";
}
@Override
@@ -358,8 +358,8 @@ public final class Typing_RequiredQuerySpecification extends MPSQuerySpecificati
return LType.Nat.create();
}
- }, var__6395623258575592021, false);
- new Equality(body, var__tmp_214, var__6395623258575592021);
+ }, var__6395623258577406124, false);
+ new Equality(body, var__tmp_214, var__6395623258577406124);
new Equality(body, var__tmp_214, var_out_1);
SetSequence.fromSet(bodies).addElement(body);
@@ -383,7 +383,7 @@ public final class Typing_RequiredQuerySpecification extends MPSQuerySpecificati
PVariable var__match_b0a2a1a0w = body.getOrCreateVariableByName("match_b0a2a1a0w");
PVariable var__tmp_215 = body.getOrCreateVariableByName("tmp_215");
PVariable var__t1 = body.getOrCreateVariableByName("t1");
- PVariable var__6395623258575592075 = body.newVirtualVariable();
+ PVariable var__6395623258577406178 = body.newVirtualVariable();
PVariable var__t2 = body.getOrCreateVariableByName("t2");
new TypeConstraint(body, Tuples.flatTupleOf(var_term), new ConceptKey(MetaAdapterFactory.getInterfaceConcept(0x6b642eaa1043424aL, 0x9e0949eb41607114L, 0x1a4a252762eb92d1L, "RecordTypes.structure.Term")));
@@ -403,7 +403,7 @@ public final class Typing_RequiredQuerySpecification extends MPSQuerySpecificati
@Override
public String getShortDescription() {
- return "6395623258575592075";
+ return "6395623258577406178";
}
@Override
@@ -416,8 +416,8 @@ public final class Typing_RequiredQuerySpecification extends MPSQuerySpecificati
return LType.Nat.create();
}
- }, var__6395623258575592075, false);
- new Equality(body, var__tmp_218, var__6395623258575592075);
+ }, var__6395623258577406178, false);
+ new Equality(body, var__tmp_218, var__6395623258577406178);
new Equality(body, var__tmp_218, var_out_1);
SetSequence.fromSet(bodies).addElement(body);
@@ -473,7 +473,6 @@ public final class Typing_RequiredQuerySpecification extends MPSQuerySpecificati
PVariable var__p = body.getOrCreateVariableByName("p");
PVariable var__match_a4a1a0w = body.getOrCreateVariableByName("match_a4a1a0w");
- PVariable var__6395623258575592185 = body.newVirtualVariable();
PVariable var__match_a0a4a1a0w = body.getOrCreateVariableByName("match_a0a4a1a0w");
PVariable var__ty1 = body.getOrCreateVariableByName("ty1");
PVariable var__ty = body.getOrCreateVariableByName("ty");
@@ -484,6 +483,7 @@ public final class Typing_RequiredQuerySpecification extends MPSQuerySpecificati
PVariable var__match_b0a4a1a0w = body.getOrCreateVariableByName("match_b0a4a1a0w");
PVariable var__tmp_226 = body.getOrCreateVariableByName("tmp_226");
PVariable var__t1 = body.getOrCreateVariableByName("t1");
+ PVariable var__6395623258577406288 = body.newVirtualVariable();
PVariable var__t2 = body.getOrCreateVariableByName("t2");
new TypeConstraint(body, Tuples.flatTupleOf(var_term), new ConceptKey(MetaAdapterFactory.getInterfaceConcept(0x6b642eaa1043424aL, 0x9e0949eb41607114L, 0x1a4a252762eb92d1L, "RecordTypes.structure.Term")));
@@ -505,7 +505,7 @@ public final class Typing_RequiredQuerySpecification extends MPSQuerySpecificati
@Override
public String getShortDescription() {
- return "6395623258575592185";
+ return "6395623258577406288";
}
@Override
@@ -518,8 +518,8 @@ public final class Typing_RequiredQuerySpecification extends MPSQuerySpecificati
return LType.instance().funParamType(((LType.LTypeElement) valueProvider.getValue("ty")));
}
- }, var__6395623258575592185, false);
- new Equality(body, var__tmp_227, var__6395623258575592185);
+ }, var__6395623258577406288, false);
+ new Equality(body, var__tmp_227, var__6395623258577406288);
new Equality(body, var__ty1, var__tmp_227);
new Equality(body, var__ty1, var_out_1);
@@ -539,7 +539,6 @@ public final class Typing_RequiredQuerySpecification extends MPSQuerySpecificati
PVariable var__t = body.getOrCreateVariableByName("t");
PVariable var__match_a5a1a0w = body.getOrCreateVariableByName("match_a5a1a0w");
PVariable var__match_a0a5a1a0w = body.getOrCreateVariableByName("match_a0a5a1a0w");
- PVariable var__6395623258575592251 = body.newVirtualVariable();
PVariable var__ty2 = body.getOrCreateVariableByName("ty2");
PVariable var__match_b0a5a1a0w = body.getOrCreateVariableByName("match_b0a5a1a0w");
PVariable var__ty = body.getOrCreateVariableByName("ty");
@@ -547,6 +546,7 @@ public final class Typing_RequiredQuerySpecification extends MPSQuerySpecificati
PVariable var__tmp_229 = body.getOrCreateVariableByName("tmp_229");
PVariable var__name = body.getOrCreateVariableByName("name");
PVariable var__tmp_230 = body.getOrCreateVariableByName("tmp_230");
+ PVariable var__6395623258577406354 = body.newVirtualVariable();
PVariable var__tmp_231 = body.getOrCreateVariableByName("tmp_231");
PVariable var__tmp_232 = body.getOrCreateVariableByName("tmp_232");
@@ -569,7 +569,7 @@ public final class Typing_RequiredQuerySpecification extends MPSQuerySpecificati
@Override
public String getShortDescription() {
- return "6395623258575592251";
+ return "6395623258577406354";
}
@Override
@@ -582,8 +582,8 @@ public final class Typing_RequiredQuerySpecification extends MPSQuerySpecificati
return LType.instance().funResultType(((LType.LTypeElement) valueProvider.getValue("ty")));
}
- }, var__6395623258575592251, false);
- new Equality(body, var__tmp_232, var__6395623258575592251);
+ }, var__6395623258577406354, false);
+ new Equality(body, var__tmp_232, var__6395623258577406354);
new Equality(body, var__ty2, var__tmp_232);
new Equality(body, var__ty2, var_out_1);
diff --git a/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/trace.info b/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/trace.info
index ec8101e5685e1d3b0fb673a6ba4c6ec994db92ad..10645e12f1c09f4720bac44ff7a5e0ed4dd45b82 100644
--- a/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/trace.info
+++ b/inca-translation/solutions/RecordTypes_Checker/source_gen/RecordTypes_Checker/model/trace.info
@@ -855,9 +855,9 @@
-
-
-
+
+
+
@@ -878,16 +878,16 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -922,13 +922,13 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -1058,7 +1058,7 @@
-
+
@@ -1067,7 +1067,7 @@
-
+
@@ -1079,7 +1079,7 @@
-
+
@@ -1128,10 +1128,10 @@
-
-
-
-
+
+
+
+
@@ -1177,9 +1177,9 @@
-
-
-
+
+
+
@@ -1324,7 +1324,7 @@
-
+
@@ -1332,7 +1332,7 @@
-
+
@@ -1451,8 +1451,8 @@
-
-
+
+
@@ -1496,13 +1496,13 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -1542,16 +1542,16 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
+
+
@@ -1587,14 +1587,14 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -1701,8 +1701,8 @@
-
-
+
+
@@ -1716,9 +1716,9 @@
-
+
-
+
@@ -1736,8 +1736,8 @@
-
-
+
+
@@ -1837,9 +1837,9 @@
-
-
-
+
+
+
@@ -1898,11 +1898,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -1973,9 +1973,9 @@
-
-
-
+
+
+
@@ -2102,21 +2102,21 @@
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -2154,11 +2154,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -2218,10 +2218,10 @@
-
-
-
-
+
+
+
+
@@ -2411,7 +2411,7 @@
-
+
@@ -2420,7 +2420,7 @@
-
+
@@ -2448,7 +2448,7 @@
-
+
@@ -2460,7 +2460,7 @@
-
+
@@ -2475,7 +2475,7 @@
-
+
@@ -2490,7 +2490,7 @@
-
+
@@ -2507,8 +2507,8 @@
-
-
+
+
@@ -2642,8 +2642,8 @@
-
-
+
+
@@ -3179,15 +3179,15 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -3714,7 +3714,7 @@
-
+
@@ -3768,16 +3768,16 @@
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
@@ -3813,18 +3813,18 @@
-
-
-
-
+
+
+
+
-
-
+
+
-
-
+
+
@@ -3934,10 +3934,10 @@
-
-
-
-
+
+
+
+
@@ -3952,10 +3952,10 @@
-
-
-
-
+
+
+
+
@@ -4005,18 +4005,18 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
+
+
@@ -4052,17 +4052,17 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -4172,10 +4172,10 @@
-
-
-
-
+
+
+
+
@@ -4190,10 +4190,10 @@
-
-
-
-
+
+
+
+
@@ -4325,9 +4325,9 @@
-
-
-
+
+
+
@@ -4375,7 +4375,7 @@
-
+
@@ -4416,12 +4416,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -4488,8 +4488,8 @@
-
-
+
+
@@ -4537,11 +4537,11 @@
-
-
+
+
-
-
+
+
@@ -4570,13 +4570,13 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -4607,14 +4607,14 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -4650,11 +4650,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -4689,16 +4689,16 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -4808,18 +4808,18 @@
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
@@ -4857,15 +4857,15 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -5149,7 +5149,7 @@
-
+
@@ -5163,7 +5163,7 @@
-
+
@@ -5179,7 +5179,7 @@
-
+
@@ -5196,7 +5196,7 @@
-
+
@@ -5213,7 +5213,7 @@
-
+
@@ -5230,7 +5230,7 @@
-
+
@@ -5247,7 +5247,7 @@
-
+
@@ -5267,7 +5267,7 @@
-
+