diff --git a/plugins/mps-build/languages/build.mps/generator/source_gen.caches/jetbrains/mps/build/mps/generated b/plugins/mps-build/languages/build.mps/generator/source_gen.caches/jetbrains/mps/build/mps/generated index 62b05bddb0d3..ab9c421f593b 100644 --- a/plugins/mps-build/languages/build.mps/generator/source_gen.caches/jetbrains/mps/build/mps/generated +++ b/plugins/mps-build/languages/build.mps/generator/source_gen.caches/jetbrains/mps/build/mps/generated @@ -1,5 +1,5 @@ - + diff --git a/plugins/mps-build/languages/build.mps/generator/source_gen.caches/jetbrains/mps/build/mps/generator/template/main/generated b/plugins/mps-build/languages/build.mps/generator/source_gen.caches/jetbrains/mps/build/mps/generator/template/main/generated index 2c6bc054bc3f..da5ff81d878c 100644 --- a/plugins/mps-build/languages/build.mps/generator/source_gen.caches/jetbrains/mps/build/mps/generator/template/main/generated +++ b/plugins/mps-build/languages/build.mps/generator/source_gen.caches/jetbrains/mps/build/mps/generator/template/main/generated @@ -1,5 +1,5 @@ - + diff --git a/plugins/mps-build/languages/build.mps/generator/source_gen/jetbrains/mps/build/mps/generator/template/main/QueriesGenerated.java b/plugins/mps-build/languages/build.mps/generator/source_gen/jetbrains/mps/build/mps/generator/template/main/QueriesGenerated.java index a5a4c6b62b08..3c8d65d41142 100644 --- a/plugins/mps-build/languages/build.mps/generator/source_gen/jetbrains/mps/build/mps/generator/template/main/QueriesGenerated.java +++ b/plugins/mps-build/languages/build.mps/generator/source_gen/jetbrains/mps/build/mps/generator/template/main/QueriesGenerated.java @@ -664,21 +664,24 @@ public static Object propertyMacro_GetValue_10_24(final PropertyMacroContext _co return "-Xmx" + heapSize + "m"; } public static Object propertyMacro_GetValue_10_25(final PropertyMacroContext _context) { - return SPropertyOperations.getString(_context.getNode(), PROPS.name$MnvL); + return ((String) _context.getVariable("var:generatorOptions")); } public static Object propertyMacro_GetValue_10_26(final PropertyMacroContext _context) { - return "${" + SPropertyOperations.getString(_context.getNode(), PROPS.name$MnvL) + "}"; + return SPropertyOperations.getString(_context.getNode(), PROPS.name$MnvL); } public static Object propertyMacro_GetValue_10_27(final PropertyMacroContext _context) { - return SPropertyOperations.getString(_context.getNode(), PROPS.path$oN2q); + return "${" + SPropertyOperations.getString(_context.getNode(), PROPS.name$MnvL) + "}"; } public static Object propertyMacro_GetValue_10_28(final PropertyMacroContext _context) { return SPropertyOperations.getString(_context.getNode(), PROPS.path$oN2q); } public static Object propertyMacro_GetValue_10_29(final PropertyMacroContext _context) { - return (String) BuildSourcePath__BehaviorDescriptor.getAntPath_id7ro1ZztyOh5.invoke(SLinkOperations.getTarget(_context.getNode(), LINKS.path$iYKB), Context.defaultContext(_context)); + return SPropertyOperations.getString(_context.getNode(), PROPS.path$oN2q); } public static Object propertyMacro_GetValue_10_30(final PropertyMacroContext _context) { + return (String) BuildSourcePath__BehaviorDescriptor.getAntPath_id7ro1ZztyOh5.invoke(SLinkOperations.getTarget(_context.getNode(), LINKS.path$iYKB), Context.defaultContext(_context)); + } + public static Object propertyMacro_GetValue_10_31(final PropertyMacroContext _context) { SNode mpsAspect = Sequence.fromIterable(SNodeOperations.ofConcept(SLinkOperations.getChildren(_context.getNode(), LINKS.aspects$6r0Q), CONCEPTS.BuildMpsAspect$Ey)).first(); int heapSize; @@ -692,23 +695,23 @@ public static Object propertyMacro_GetValue_10_30(final PropertyMacroContext _co return "-Xmx" + heapSize + "m"; } - public static Object propertyMacro_GetValue_10_31(final PropertyMacroContext _context) { + public static Object propertyMacro_GetValue_10_32(final PropertyMacroContext _context) { return SPropertyOperations.getString(_context.getNode(), PROPS.name$MnvL); } - public static Object propertyMacro_GetValue_10_32(final PropertyMacroContext _context) { + public static Object propertyMacro_GetValue_10_33(final PropertyMacroContext _context) { return "${" + SPropertyOperations.getString(_context.getNode(), PROPS.name$MnvL) + "}"; } - public static Object propertyMacro_GetValue_10_33(final PropertyMacroContext _context) { + public static Object propertyMacro_GetValue_10_34(final PropertyMacroContext _context) { return SPropertyOperations.getString(SNodeOperations.cast(ListSequence.fromList(SLinkOperations.getChildren(_context.getNode(), LINKS.aspects$6r0Q)).findFirst(new IWhereFilter() { public boolean accept(SNode it) { return SNodeOperations.isInstanceOf(it, CONCEPTS.BuildMpsAspect$Ey); } }), CONCEPTS.BuildMpsAspect$Ey), PROPS.excludes$mj5k); } - public static Object propertyMacro_GetValue_10_34(final PropertyMacroContext _context) { + public static Object propertyMacro_GetValue_10_35(final PropertyMacroContext _context) { return (String) BuildSourcePath__BehaviorDescriptor.getAntPath_id7ro1ZztyOh5.invoke(SLinkOperations.getTarget(_context.getNode(), LINKS.path$zL7z), Context.defaultContext(_context)); } - public static Object propertyMacro_GetValue_10_35(final PropertyMacroContext _context) { + public static Object propertyMacro_GetValue_10_36(final PropertyMacroContext _context) { return SPropertyOperations.getString(_context.getNode(), PROPS.path$URGX); } public static Object propertyMacro_GetValue_12_0(final PropertyMacroContext _context) { @@ -1087,19 +1090,22 @@ public static boolean ifMacro_Condition_10_5(final IfMacroContext _context) { return ((SNode) _context.getVariable("var:compilerOptions")) != null && isNotEmptyString(SPropertyOperations.getString(((SNode) _context.getVariable("var:compilerOptions")), PROPS.javaLevel$8zbK)); } public static boolean ifMacro_Condition_10_6(final IfMacroContext _context) { + return ((String) _context.getVariable("var:generatorOptions")) != null; + } + public static boolean ifMacro_Condition_10_7(final IfMacroContext _context) { // XXX the reason I decided to put as alternative to as a start is // to avoid deep dive into common/java/mps task dependencies and how to switch to a different set. // Instead, just stick to present workflow return SPropertyOperations.getBoolean(Sequence.fromIterable(SNodeOperations.ofConcept(SLinkOperations.getChildren(_context.getNode(), LINKS.plugins$AsCR), CONCEPTS.BuildMPSPlugin$YW)).first(), PROPS.useMakeTask$aRFt); } - public static boolean ifMacro_Condition_10_7(final IfMacroContext _context) { + public static boolean ifMacro_Condition_10_8(final IfMacroContext _context) { return Sequence.fromIterable(((MPSModulesPartitioner) _context.getVariable("var:closure")).getExternal()).isNotEmpty(); } - public static boolean ifMacro_Condition_10_8(final IfMacroContext _context) { + public static boolean ifMacro_Condition_10_9(final IfMacroContext _context) { SNode mpsAspect = Sequence.fromIterable(SNodeOperations.ofConcept(SLinkOperations.getChildren(_context.getNode(), LINKS.aspects$6r0Q), CONCEPTS.BuildMpsAspect$Ey)).first(); return (mpsAspect != null) && SPropertyOperations.getBoolean(mpsAspect, PROPS.testGeneration$xdoj); } - public static boolean ifMacro_Condition_10_9(final IfMacroContext _context) { + public static boolean ifMacro_Condition_10_10(final IfMacroContext _context) { SNode ba = ListSequence.fromList(SLinkOperations.getChildren(_context.getNode(), LINKS.aspects$6r0Q)).findFirst(new IWhereFilter() { public boolean accept(SNode it) { return SNodeOperations.isInstanceOf(it, CONCEPTS.BuildMpsAspect$Ey); @@ -1110,16 +1116,16 @@ public boolean accept(SNode it) { } return isNotEmptyString(SPropertyOperations.getString(SNodeOperations.cast(ba, CONCEPTS.BuildMpsAspect$Ey), PROPS.excludes$mj5k)); } - public static boolean ifMacro_Condition_10_10(final IfMacroContext _context) { + public static boolean ifMacro_Condition_10_11(final IfMacroContext _context) { return Sequence.fromIterable(((MPSModulesPartitioner) _context.getVariable("var:closure")).getExternal()).isNotEmpty(); } - public static boolean ifMacro_Condition_10_11(final IfMacroContext _context) { + public static boolean ifMacro_Condition_10_12(final IfMacroContext _context) { // sort of stupid way to find out if project has 'generate' task; // although the previous one, hardcoded check for presence of specific task library node, // was not better. return Sequence.fromIterable(SNodeOperations.ofConcept(SLinkOperations.getChildren(SLinkOperations.getTarget(_context.getNode(), LINKS.project$ciHu), LINKS.plugins$AsCR), CONCEPTS.BuildMPSPlugin$YW)).isNotEmpty(); } - public static boolean ifMacro_Condition_10_12(final IfMacroContext _context) { + public static boolean ifMacro_Condition_10_13(final IfMacroContext _context) { return ListSequence.fromList(((List) _context.getVariable("var:dependency"))).isNotEmpty(); } public static boolean ifMacro_Condition_17_0(final IfMacroContext _context) { @@ -1540,7 +1546,7 @@ public static Iterable sourceNodesQuery_10_1(final SourceSubstituteMacroN // which is to be reduced to path value later. return Sequence.fromIterable(Sequence.fromArray(((ModulePlugins) _context.getVariable("var:requiredPlugins")).getPluginPaths(_context))).select(new ISelector() { public SNode select(String it) { - return createGeneratorInternal_String_x583g4_a0a0a0e0jn(it); + return createGeneratorInternal_String_x583g4_a0a0a0e0ln(it); } }); } @@ -1614,7 +1620,7 @@ public static Iterable sourceNodesQuery_10_9(final SourceSubstituteMacroN public static Iterable sourceNodesQuery_10_10(final SourceSubstituteMacroNodesContext _context) { return Sequence.fromIterable(Sequence.fromArray(((String[]) _context.getVariable("var:requiredPlugins")))).select(new ISelector() { public SNode select(String it) { - return createGeneratorInternal_String_x583g4_a0a0a0a0sn(it); + return createGeneratorInternal_String_x583g4_a0a0a0a0un(it); } }); } @@ -1976,7 +1982,7 @@ public static Object varMacro_Value_10_8(final TemplateVarContext _context) { List> dependencies = new ProjectDependency(_context, _context.getNode()).collectDependencies().getDependencies(); return ListSequence.fromList(dependencies).select(new ISelector, SNode>() { public SNode select(Tuples._2 it) { - return createGeneratorInternal_ProjectDependency_x583g4_a0a0a0a1a593(it._1(), it._0()); + return createGeneratorInternal_ProjectDependency_x583g4_a0a0a0a1a793(it._1(), it._0()); } }).toListSequence(); } @@ -2557,6 +2563,7 @@ public Collection evaluate(@NotNull SourceSubstituteMacroNodesContext ctx pvqMethods.put("4035665851936450300", new PVQ(i++, MetaAdapterFactory.getProperty(0x479c7a8c02f943b5L, 0x9139d910cb22f298L, 0x5c842a42c54cfd1fL, 0x5c842a42c54cfd20L, "text"), "aaa")); pvqMethods.put("4035665851936951126", new PVQ(i++, MetaAdapterFactory.getProperty(0x479c7a8c02f943b5L, 0x9139d910cb22f298L, 0x5c842a42c54cfd1fL, 0x5c842a42c54cfd20L, "text"), "module.msd")); pvqMethods.put("4035665851936219812", new PVQ(i++, MetaAdapterFactory.getProperty(0x479c7a8c02f943b5L, 0x9139d910cb22f298L, 0x5c842a42c54cfd1fL, 0x5c842a42c54cfd20L, "text"), "-Xmx512m")); + pvqMethods.put("7780584650041397805", new PVQ(i++, MetaAdapterFactory.getProperty(0x479c7a8c02f943b5L, 0x9139d910cb22f298L, 0x5c842a42c54cfd1fL, 0x5c842a42c54cfd20L, "text"), "--options")); pvqMethods.put("4035665851936216040", new PVQ(i++, MetaAdapterFactory.getProperty(0x479c7a8c02f943b5L, 0x9139d910cb22f298L, 0x5c842a42c54cfd1fL, 0x5c842a42c54cfd20L, "text"), "name")); pvqMethods.put("4035665851936216049", new PVQ(i++, MetaAdapterFactory.getProperty(0x479c7a8c02f943b5L, 0x9139d910cb22f298L, 0x5c842a42c54cfd1fL, 0x5c842a42c54cfd20L, "text"), "${propertyName}")); pvqMethods.put("3239569521490197761", new PVQ(i++, MetaAdapterFactory.getProperty(0x479c7a8c02f943b5L, 0x9139d910cb22f298L, 0x5c842a42c54cfd1fL, 0x5c842a42c54cfd20L, "text"), "plugins.path")); @@ -2860,70 +2867,72 @@ public Object evaluate(@NotNull PropertyMacroContext ctx) throws GenerationFailu case 120: return QueriesGenerated.propertyMacro_GetValue_10_35(ctx); case 121: - return QueriesGenerated.propertyMacro_GetValue_12_0(ctx); + return QueriesGenerated.propertyMacro_GetValue_10_36(ctx); case 122: - return QueriesGenerated.propertyMacro_GetValue_12_1(ctx); + return QueriesGenerated.propertyMacro_GetValue_12_0(ctx); case 123: - return QueriesGenerated.propertyMacro_GetValue_12_2(ctx); + return QueriesGenerated.propertyMacro_GetValue_12_1(ctx); case 124: - return QueriesGenerated.propertyMacro_GetValue_13_0(ctx); + return QueriesGenerated.propertyMacro_GetValue_12_2(ctx); case 125: - return QueriesGenerated.propertyMacro_GetValue_13_1(ctx); + return QueriesGenerated.propertyMacro_GetValue_13_0(ctx); case 126: - return QueriesGenerated.propertyMacro_GetValue_13_2(ctx); + return QueriesGenerated.propertyMacro_GetValue_13_1(ctx); case 127: - return QueriesGenerated.propertyMacro_GetValue_13_3(ctx); + return QueriesGenerated.propertyMacro_GetValue_13_2(ctx); case 128: - return QueriesGenerated.propertyMacro_GetValue_14_0(ctx); + return QueriesGenerated.propertyMacro_GetValue_13_3(ctx); case 129: - return QueriesGenerated.propertyMacro_GetValue_14_1(ctx); + return QueriesGenerated.propertyMacro_GetValue_14_0(ctx); case 130: - return QueriesGenerated.propertyMacro_GetValue_17_0(ctx); + return QueriesGenerated.propertyMacro_GetValue_14_1(ctx); case 131: - return QueriesGenerated.propertyMacro_GetValue_17_1(ctx); + return QueriesGenerated.propertyMacro_GetValue_17_0(ctx); case 132: - return QueriesGenerated.propertyMacro_GetValue_17_2(ctx); + return QueriesGenerated.propertyMacro_GetValue_17_1(ctx); case 133: - return QueriesGenerated.propertyMacro_GetValue_17_3(ctx); + return QueriesGenerated.propertyMacro_GetValue_17_2(ctx); case 134: - return QueriesGenerated.propertyMacro_GetValue_17_4(ctx); + return QueriesGenerated.propertyMacro_GetValue_17_3(ctx); case 135: - return QueriesGenerated.propertyMacro_GetValue_17_5(ctx); + return QueriesGenerated.propertyMacro_GetValue_17_4(ctx); case 136: - return QueriesGenerated.propertyMacro_GetValue_17_6(ctx); + return QueriesGenerated.propertyMacro_GetValue_17_5(ctx); case 137: - return QueriesGenerated.propertyMacro_GetValue_17_7(ctx); + return QueriesGenerated.propertyMacro_GetValue_17_6(ctx); case 138: - return QueriesGenerated.propertyMacro_GetValue_17_8(ctx); + return QueriesGenerated.propertyMacro_GetValue_17_7(ctx); case 139: - return QueriesGenerated.propertyMacro_GetValue_17_9(ctx); + return QueriesGenerated.propertyMacro_GetValue_17_8(ctx); case 140: - return QueriesGenerated.propertyMacro_GetValue_17_10(ctx); + return QueriesGenerated.propertyMacro_GetValue_17_9(ctx); case 141: - return QueriesGenerated.propertyMacro_GetValue_17_11(ctx); + return QueriesGenerated.propertyMacro_GetValue_17_10(ctx); case 142: - return QueriesGenerated.propertyMacro_GetValue_17_12(ctx); + return QueriesGenerated.propertyMacro_GetValue_17_11(ctx); case 143: - return QueriesGenerated.propertyMacro_GetValue_17_13(ctx); + return QueriesGenerated.propertyMacro_GetValue_17_12(ctx); case 144: - return QueriesGenerated.propertyMacro_GetValue_17_14(ctx); + return QueriesGenerated.propertyMacro_GetValue_17_13(ctx); case 145: - return QueriesGenerated.propertyMacro_GetValue_17_15(ctx); + return QueriesGenerated.propertyMacro_GetValue_17_14(ctx); case 146: - return QueriesGenerated.propertyMacro_GetValue_17_16(ctx); + return QueriesGenerated.propertyMacro_GetValue_17_15(ctx); case 147: - return QueriesGenerated.propertyMacro_GetValue_17_17(ctx); + return QueriesGenerated.propertyMacro_GetValue_17_16(ctx); case 148: - return QueriesGenerated.propertyMacro_GetValue_17_18(ctx); + return QueriesGenerated.propertyMacro_GetValue_17_17(ctx); case 149: - return QueriesGenerated.propertyMacro_GetValue_18_0(ctx); + return QueriesGenerated.propertyMacro_GetValue_17_18(ctx); case 150: - return QueriesGenerated.propertyMacro_GetValue_18_1(ctx); + return QueriesGenerated.propertyMacro_GetValue_18_0(ctx); case 151: - return QueriesGenerated.propertyMacro_GetValue_18_2(ctx); + return QueriesGenerated.propertyMacro_GetValue_18_1(ctx); case 152: - return QueriesGenerated.propertyMacro_GetValue_19_0(ctx); + return QueriesGenerated.propertyMacro_GetValue_18_2(ctx); case 153: + return QueriesGenerated.propertyMacro_GetValue_19_0(ctx); + case 154: return QueriesGenerated.propertyMacro_GetValue_19_1(ctx); default: throw new GenerationFailureException(String.format("Inconsistent QueriesGenerated: there's no method for query %s (key: #%d)", ctx.getTemplateReference(), methodKey)); @@ -3001,6 +3010,7 @@ public Object evaluate(@NotNull PropertyMacroContext ctx) throws GenerationFailu imcMethods.put("1933226676407114454", new IfMC(i++)); imcMethods.put("4035665851936438514", new IfMC(i++)); imcMethods.put("4035665851935707502", new IfMC(i++)); + imcMethods.put("7780584650041397812", new IfMC(i++)); imcMethods.put("4035665851935770399", new IfMC(i++)); imcMethods.put("398731435601112750", new IfMC(i++)); imcMethods.put("1787667533297084980", new IfMC(i++)); @@ -3177,10 +3187,12 @@ public boolean check(@NotNull IfMacroContext ctx) throws GenerationFailureExcept case 74: return QueriesGenerated.ifMacro_Condition_10_12(ctx); case 75: - return QueriesGenerated.ifMacro_Condition_17_0(ctx); + return QueriesGenerated.ifMacro_Condition_10_13(ctx); case 76: - return QueriesGenerated.ifMacro_Condition_17_1(ctx); + return QueriesGenerated.ifMacro_Condition_17_0(ctx); case 77: + return QueriesGenerated.ifMacro_Condition_17_1(ctx); + case 78: return QueriesGenerated.ifMacro_Condition_19_0(ctx); default: throw new GenerationFailureException(String.format("Inconsistent QueriesGenerated: there's no condition method for if macro %s (key: #%d)", ctx.getTemplateReference(), methodKey)); @@ -3512,17 +3524,17 @@ public void invoke(@NotNull MapSrcMacroPostProcContext ctx) throws GenerationFai } } } - private static SNode createGeneratorInternal_String_x583g4_a0a0a0e0jn(String p0) { + private static SNode createGeneratorInternal_String_x583g4_a0a0a0e0ln(String p0) { SNodeBuilder n0 = new SNodeBuilder().init(CONCEPTS.GeneratorInternal_String$CC); n0.setProperty(PROPS.path$oN2q, p0); return n0.getResult(); } - private static SNode createGeneratorInternal_String_x583g4_a0a0a0a0sn(String p0) { + private static SNode createGeneratorInternal_String_x583g4_a0a0a0a0un(String p0) { SNodeBuilder n0 = new SNodeBuilder().init(CONCEPTS.GeneratorInternal_String$CC); n0.setProperty(PROPS.path$oN2q, p0); return n0.getResult(); } - private static SNode createGeneratorInternal_ProjectDependency_x583g4_a0a0a0a1a593(String p0, SNode p1) { + private static SNode createGeneratorInternal_ProjectDependency_x583g4_a0a0a0a1a793(String p0, SNode p1) { SNodeBuilder n0 = new SNodeBuilder().init(CONCEPTS.GeneratorInternal_ProjectDependency$bb); n0.setProperty(PROPS.path$URGX, p0); n0.setReferenceTarget(LINKS.project$ciHu, p1); diff --git a/plugins/mps-build/languages/build.mps/generator/source_gen/jetbrains/mps/build/mps/generator/template/main/trace.info b/plugins/mps-build/languages/build.mps/generator/source_gen/jetbrains/mps/build/mps/generator/template/main/trace.info index c915713c0045..aeeb5f04ce88 100644 --- a/plugins/mps-build/languages/build.mps/generator/source_gen/jetbrains/mps/build/mps/generator/template/main/trace.info +++ b/plugins/mps-build/languages/build.mps/generator/source_gen/jetbrains/mps/build/mps/generator/template/main/trace.info @@ -14,22 +14,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -46,168 +46,168 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -217,86 +217,86 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -358,314 +358,320 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -690,136 +696,138 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - + + - + - - - - - - - - - - + + + + + + + + + + @@ -847,150 +855,154 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + @@ -1041,216 +1053,222 @@ - + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - - + + + - - + + - - - - - - + + + + + + - + - + - + @@ -1259,22 +1277,22 @@ - + - + - + - + - + - + @@ -1287,49 +1305,49 @@ - + - - + + - + - + - + - + - + - + - + - + - + - - + + - + @@ -1338,10 +1356,10 @@ - + - + @@ -1355,228 +1373,228 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + @@ -1639,255 +1657,255 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1920,107 +1938,107 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - + + + + @@ -2055,143 +2073,143 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - + + + + + + @@ -2267,163 +2285,163 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -2432,93 +2450,93 @@ - + - + - + - - + + - - + + - - - + + + - + - + - + - + - - + + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + @@ -2531,13 +2549,13 @@ - + - + - + @@ -2549,25 +2567,25 @@ - + - + - + - + - + - + - + @@ -2583,206 +2601,206 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - + + + + + + + + + + + + + - + - + @@ -2806,67 +2824,67 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + - + - + - + - + - + @@ -2880,242 +2898,242 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - - - + + + @@ -3127,42 +3145,42 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3170,13 +3188,13 @@ - - - - - - - + + + + + + + @@ -3184,27 +3202,27 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + @@ -3226,253 +3244,253 @@ - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - - + + - + - + - + - - - - - - - - - - - - - + + + + + + + + + + + + + - + - - - - - - - + + + + + + + @@ -3498,103 +3516,103 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3602,32 +3620,32 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -3638,64 +3656,64 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3718,84 +3736,84 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -3859,250 +3877,250 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4150,56 +4168,56 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4249,153 +4267,153 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4537,154 +4555,154 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -4699,75 +4717,75 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - + - + - + - + - + - + - - + + - + @@ -4783,40 +4801,40 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - + - - - - + + + + - + - - + + diff --git a/plugins/mps-build/languages/build.mps/generator/template/jetbrains/mps/build/mps/generator/template/main@generator.mps b/plugins/mps-build/languages/build.mps/generator/template/jetbrains/mps/build/mps/generator/template/main@generator.mps index adbe55aa3e9d..19e5e90119e8 100644 --- a/plugins/mps-build/languages/build.mps/generator/template/jetbrains/mps/build/mps/generator/template/main@generator.mps +++ b/plugins/mps-build/languages/build.mps/generator/template/jetbrains/mps/build/mps/generator/template/main@generator.mps @@ -17826,6 +17826,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +