Browse files

fix MPS-11471 absolute paths are not replaced with path varaibles

  • Loading branch information...
1 parent a420181 commit 581715810c896d48d4eaaaae175863d28488b709 @juliabeliaeva juliabeliaeva committed Feb 4, 2011
Showing with 636 additions and 522 deletions.
  1. +9 −25 platform/buildlanguage/languages/dependency/generator/buildlanguage/template/main@generator.mps
  2. +22 −22 ...ncy/source_gen.caches/jetbrains/mps/build/dependency/generator/buildlanguage/template/main/.debug
  3. +1 −0 ...mps/build/dependency/generator/buildlanguage/template/main/.hash.-c8mz3tgcj9is2ysv7j35z8rdtup67ly
  4. +0 −1 .../mps/build/dependency/generator/buildlanguage/template/main/.hash.1bi9xea6oa1yzzie69pdhqsowcjw4zx
  5. +5 −5 ...ce_gen/jetbrains/mps/build/dependency/generator/buildlanguage/template/main/QueriesGenerated.java
  6. +93 −22 platform/buildlanguage/languages/packaging/generator/buildlanguage/template/main@generator.mps
  7. +35 −1 platform/buildlanguage/languages/packaging/languageModels/behavior.mps
  8. +45 −44 ...buildlanguage/languages/packaging/source_gen.caches/jetbrains/mps/build/packaging/behavior/.debug
  9. +1 −0 ...g/source_gen.caches/jetbrains/mps/build/packaging/behavior/.hash.-7ohu29qz4cufudbe322cswxfsyh1bln
  10. +0 −1 ...ng/source_gen.caches/jetbrains/mps/build/packaging/behavior/.hash.945mpnxx3o351cv174fdrmwweqi00n3
  11. +393 −389 ...ging/source_gen.caches/jetbrains/mps/build/packaging/generator/buildlanguage/template/main/.debug
  12. +0 −1 .../mps/build/packaging/generator/buildlanguage/template/main/.hash.-a6iacqyc2dg493cfo84394s14tqzf1u
  13. +1 −0 ...s/mps/build/packaging/generator/buildlanguage/template/main/.hash.4m1l2q27ivn9vcbyzwhe8gsntwxaytv
  14. +5 −1 ...nguage/languages/packaging/source_gen/jetbrains/mps/build/packaging/behavior/Module_Behavior.java
  15. +26 −10 ...rce_gen/jetbrains/mps/build/packaging/generator/buildlanguage/template/main/QueriesGenerated.java
View
34 ...rm/buildlanguage/languages/dependency/generator/buildlanguage/template/main@generator.mps
@@ -150,31 +150,15 @@
<node role="propertyValue:21" type="jetbrains.mps.buildlanguage.structure.FileName:21" id="1216910634579">
<node role="value:21" type="jetbrains.mps.buildlanguage.structure.StringLiteral:21" id="1216910634580">
<property name="value:21" value="" />
- <node role="propertyMacro$property_attribute$value:21" type="jetbrains.mps.lang.generator.structure.PropertyMacro:2" id="1216910679653">
- <node role="propertyValueFunction:2" type="jetbrains.mps.lang.generator.structure.PropertyMacro_GetPropertyValue:2" id="1216910679654">
- <node role="body:2" type="jetbrains.mps.baseLanguage.structure.StatementList:3" id="1216910679655">
- <node role="statement:3" type="jetbrains.mps.baseLanguage.structure.ExpressionStatement:3" id="1216910683422">
- <node role="expression:3" type="jetbrains.mps.baseLanguage.structure.DotExpression:3" id="7266929446532793055">
- <node role="operand:3" type="jetbrains.mps.baseLanguage.structure.DotExpression:3" id="1216911053799">
- <node role="operand:3" type="jetbrains.mps.baseLanguage.structure.DotExpression:3" id="1216910683629">
- <node role="operand:3" type="jetbrains.mps.lang.generator.structure.TemplateFunctionParameter_sourceNode:2" id="1216910683423" />
- <node role="operation:3" type="jetbrains.mps.lang.smodel.structure.SLinkAccess:16" id="1216910686795">
- <link role="link:16" targetNodeId="1.1216907884130:0" />
- </node>
- </node>
- <node role="operation:3" type="jetbrains.mps.lang.smodel.structure.SPropertyAccess:16" id="1216911057876">
- <link role="property:16" targetNodeId="1.1216907465733:0" resolveInfo="path" />
- </node>
- </node>
- <node role="operation:3" type="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation:3" id="7266929446532804793">
- <link role="baseMethodDeclaration:3" targetNodeId="8.~String.replace(java.lang.CharSequence,java.lang.CharSequence):java.lang.String" resolveInfo="replace" />
- <node role="actualArgument:3" type="jetbrains.mps.baseLanguage.structure.StringLiteral:3" id="7266929446532806972">
- <property name="value:3" value="\\" />
- </node>
- <node role="actualArgument:3" type="jetbrains.mps.baseLanguage.structure.StringLiteral:3" id="7266929446532806975">
- <property name="value:3" value="/" />
- </node>
- </node>
+ </node>
+ <node role="nodeMacro$attribute:21" type="jetbrains.mps.lang.generator.structure.CopySrcNodeMacro:2" id="3791907277386824348">
+ <node role="sourceNodeQuery:2" type="jetbrains.mps.lang.generator.structure.SourceSubstituteMacro_SourceNodeQuery:2" id="3791907277386824349">
+ <node role="body:2" type="jetbrains.mps.baseLanguage.structure.StatementList:3" id="3791907277386824350">
+ <node role="statement:3" type="jetbrains.mps.baseLanguage.structure.ExpressionStatement:3" id="3791907277386824351">
+ <node role="expression:3" type="jetbrains.mps.baseLanguage.structure.DotExpression:3" id="3791907277386824352">
+ <node role="operand:3" type="jetbrains.mps.lang.generator.structure.TemplateFunctionParameter_sourceNode:2" id="3791907277386824353" />
+ <node role="operation:3" type="jetbrains.mps.lang.smodel.structure.SLinkAccess:16" id="3791907277386824354">
+ <link role="link:16" targetNodeId="1.1216907884130:0" />
</node>
</node>
</node>
View
44 ...ce_gen.caches/jetbrains/mps/build/dependency/generator/buildlanguage/template/main/.debug
@@ -4,23 +4,23 @@
<root nodeId="1216906941020">
<nodeInfo nodeId="7857794759872176566" fileName="QueriesGenerated.java" startLine="141" startPosition="214" endLine="145" endPosition="0" />
<scopeInfo nodeId="1219773202906" fileName="QueriesGenerated.java" startLine="20" startPosition="148" endLine="21" endPosition="69" />
- <scopeInfo nodeId="1216910679655" fileName="QueriesGenerated.java" startLine="24" startPosition="148" endLine="25" endPosition="132" />
- <scopeInfo nodeId="1216910654590" fileName="QueriesGenerated.java" startLine="28" startPosition="148" endLine="29" endPosition="82" />
- <scopeInfo nodeId="1216907163431" fileName="QueriesGenerated.java" startLine="32" startPosition="148" endLine="33" endPosition="78" />
- <scopeInfo nodeId="1216908261232" fileName="QueriesGenerated.java" startLine="36" startPosition="148" endLine="37" endPosition="85" />
- <scopeInfo nodeId="1216908364135" fileName="QueriesGenerated.java" startLine="40" startPosition="148" endLine="41" endPosition="82" />
- <scopeInfo nodeId="1216906986546" fileName="QueriesGenerated.java" startLine="44" startPosition="148" endLine="45" endPosition="69" />
- <scopeInfo nodeId="7857794759872021244" fileName="QueriesGenerated.java" startLine="48" startPosition="154" endLine="49" endPosition="72" />
- <scopeInfo nodeId="1217528713107" fileName="QueriesGenerated.java" startLine="60" startPosition="145" endLine="61" endPosition="99" />
- <scopeInfo nodeId="763186553349438291" fileName="QueriesGenerated.java" startLine="64" startPosition="150" endLine="65" endPosition="193" />
- <scopeInfo nodeId="763186553349590558" fileName="QueriesGenerated.java" startLine="68" startPosition="150" endLine="69" endPosition="107" />
- <scopeInfo nodeId="1216908641563" fileName="QueriesGenerated.java" startLine="72" startPosition="145" endLine="73" endPosition="102" />
- <scopeInfo nodeId="1216908738118" fileName="QueriesGenerated.java" startLine="76" startPosition="145" endLine="77" endPosition="103" />
- <scopeInfo nodeId="763186553349438311" fileName="QueriesGenerated.java" startLine="80" startPosition="150" endLine="81" endPosition="195" />
- <scopeInfo nodeId="763186553349438391" fileName="QueriesGenerated.java" startLine="84" startPosition="150" endLine="85" endPosition="107" />
- <scopeInfo nodeId="1216913346657" fileName="QueriesGenerated.java" startLine="88" startPosition="145" endLine="89" endPosition="142" />
- <scopeInfo nodeId="1235489624448" fileName="QueriesGenerated.java" startLine="92" startPosition="145" endLine="93" endPosition="107" />
- <scopeInfo nodeId="7857794759871997504" fileName="QueriesGenerated.java" startLine="104" startPosition="136" endLine="105" endPosition="96" />
+ <scopeInfo nodeId="1216910654590" fileName="QueriesGenerated.java" startLine="24" startPosition="148" endLine="25" endPosition="82" />
+ <scopeInfo nodeId="1216907163431" fileName="QueriesGenerated.java" startLine="28" startPosition="148" endLine="29" endPosition="78" />
+ <scopeInfo nodeId="1216908261232" fileName="QueriesGenerated.java" startLine="32" startPosition="148" endLine="33" endPosition="85" />
+ <scopeInfo nodeId="1216908364135" fileName="QueriesGenerated.java" startLine="36" startPosition="148" endLine="37" endPosition="82" />
+ <scopeInfo nodeId="1216906986546" fileName="QueriesGenerated.java" startLine="40" startPosition="148" endLine="41" endPosition="69" />
+ <scopeInfo nodeId="7857794759872021244" fileName="QueriesGenerated.java" startLine="44" startPosition="154" endLine="45" endPosition="72" />
+ <scopeInfo nodeId="1217528713107" fileName="QueriesGenerated.java" startLine="56" startPosition="145" endLine="57" endPosition="99" />
+ <scopeInfo nodeId="763186553349438291" fileName="QueriesGenerated.java" startLine="60" startPosition="150" endLine="61" endPosition="193" />
+ <scopeInfo nodeId="763186553349590558" fileName="QueriesGenerated.java" startLine="64" startPosition="150" endLine="65" endPosition="107" />
+ <scopeInfo nodeId="1216908641563" fileName="QueriesGenerated.java" startLine="68" startPosition="145" endLine="69" endPosition="102" />
+ <scopeInfo nodeId="1216908738118" fileName="QueriesGenerated.java" startLine="72" startPosition="145" endLine="73" endPosition="103" />
+ <scopeInfo nodeId="763186553349438311" fileName="QueriesGenerated.java" startLine="76" startPosition="150" endLine="77" endPosition="195" />
+ <scopeInfo nodeId="763186553349438391" fileName="QueriesGenerated.java" startLine="80" startPosition="150" endLine="81" endPosition="107" />
+ <scopeInfo nodeId="1216913346657" fileName="QueriesGenerated.java" startLine="84" startPosition="145" endLine="85" endPosition="142" />
+ <scopeInfo nodeId="1235489624448" fileName="QueriesGenerated.java" startLine="88" startPosition="145" endLine="89" endPosition="107" />
+ <scopeInfo nodeId="7857794759871997504" fileName="QueriesGenerated.java" startLine="100" startPosition="136" endLine="101" endPosition="96" />
+ <scopeInfo nodeId="3791907277386824350" fileName="QueriesGenerated.java" startLine="108" startPosition="150" endLine="109" endPosition="74" />
<scopeInfo nodeId="1219772645178" fileName="QueriesGenerated.java" startLine="112" startPosition="144" endLine="113" endPosition="30" />
<scopeInfo nodeId="1219772677483" fileName="QueriesGenerated.java" startLine="116" startPosition="144" endLine="117" endPosition="30" />
<scopeInfo nodeId="1219772732043" fileName="QueriesGenerated.java" startLine="120" startPosition="144" endLine="121" endPosition="30" />
@@ -52,13 +52,13 @@
<unitInfo nodeId="7857794759872176566" fileName="QueriesGenerated.java" startLine="141" startPosition="179" endLine="145" endPosition="5" unitName="jetbrains.mps.build.dependency.generator.buildlanguage.template.main.ISelector$anonymous" />
</root>
<root nodeId="1219772393477">
- <scopeInfo nodeId="1219772533884" fileName="QueriesGenerated.java" startLine="52" startPosition="148" endLine="53" endPosition="88" />
- <scopeInfo nodeId="1219772582498" fileName="QueriesGenerated.java" startLine="56" startPosition="148" endLine="57" endPosition="88" />
- <scopeInfo nodeId="1219772509209" fileName="QueriesGenerated.java" startLine="96" startPosition="145" endLine="97" endPosition="150" />
- <scopeInfo nodeId="1219772493890" fileName="QueriesGenerated.java" startLine="108" startPosition="130" endLine="109" endPosition="83" />
+ <scopeInfo nodeId="1219772533884" fileName="QueriesGenerated.java" startLine="48" startPosition="148" endLine="49" endPosition="88" />
+ <scopeInfo nodeId="1219772582498" fileName="QueriesGenerated.java" startLine="52" startPosition="148" endLine="53" endPosition="88" />
+ <scopeInfo nodeId="1219772509209" fileName="QueriesGenerated.java" startLine="92" startPosition="145" endLine="93" endPosition="150" />
+ <scopeInfo nodeId="1219772493890" fileName="QueriesGenerated.java" startLine="104" startPosition="130" endLine="105" endPosition="83" />
</root>
<root nodeId="1224775844691">
- <scopeInfo nodeId="1224775901839" fileName="QueriesGenerated.java" startLine="100" startPosition="145" endLine="101" endPosition="153" />
+ <scopeInfo nodeId="1224775901839" fileName="QueriesGenerated.java" startLine="96" startPosition="145" endLine="97" endPosition="153" />
</root>
</debugInfo>
View
1 ...d/dependency/generator/buildlanguage/template/main/.hash.-c8mz3tgcj9is2ysv7j35z8rdtup67ly
@@ -0,0 +1 @@
+-c8mz3tgcj9is2ysv7j35z8rdtup67ly
View
1 ...ld/dependency/generator/buildlanguage/template/main/.hash.1bi9xea6oa1yzzie69pdhqsowcjw4zx
@@ -1 +0,0 @@
-1bi9xea6oa1yzzie69pdhqsowcjw4zx
View
10 ...etbrains/mps/build/dependency/generator/buildlanguage/template/main/QueriesGenerated.java
@@ -5,9 +5,9 @@
import jetbrains.mps.smodel.IOperationContext;
import jetbrains.mps.generator.template.PropertyMacroContext;
import jetbrains.mps.lang.smodel.generator.smodelAdapter.SPropertyOperations;
-import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations;
import jetbrains.mps.generator.template.ReferenceMacroContext;
import jetbrains.mps.internal.collections.runtime.ListSequence;
+import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations;
import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations;
import jetbrains.mps.generator.template.IfMacroContext;
import org.apache.commons.lang.StringUtils;
@@ -21,10 +21,6 @@ public static Object propertyMacro_GetPropertyValue_1219773202905(final IOperati
return SPropertyOperations.getString(_context.getNode(), "name");
}
- public static Object propertyMacro_GetPropertyValue_1216910679654(final IOperationContext operationContext, final PropertyMacroContext _context) {
- return SPropertyOperations.getString(SLinkOperations.getTarget(_context.getNode(), "classes", true), "path").replace("\\", "/");
- }
-
public static Object propertyMacro_GetPropertyValue_1216910654589(final IOperationContext operationContext, final PropertyMacroContext _context) {
return SPropertyOperations.getString(_context.getNode(), "name") + ".classes";
}
@@ -109,6 +105,10 @@ public static boolean ifMacro_Condition_1219772493889(final IOperationContext op
return (SLinkOperations.getTarget(_context.getNode(), "macro", false) != null);
}
+ public static SNode sourceNodeQuery_3791907277386824349(final IOperationContext operationContext, final SourceSubstituteMacroNodeContext _context) {
+ return SLinkOperations.getTarget(_context.getNode(), "classes", true);
+ }
+
public static SNode sourceNodeQuery_1219772645177(final IOperationContext operationContext, final SourceSubstituteMacroNodeContext _context) {
return _context.getNode();
}
View
115 ...orm/buildlanguage/languages/packaging/generator/buildlanguage/template/main@generator.mps
@@ -4580,28 +4580,6 @@
</node>
</node>
</node>
- <node role="classes:0" type="jetbrains.mps.build.dependency.structure.PathHolder:0" id="1217518452083">
- <property name="path:0" value="module.classes" />
- <node role="propertyMacro$property_attribute$path:0" type="jetbrains.mps.lang.generator.structure.PropertyMacro:2" id="1217518689737">
- <node role="propertyValueFunction:2" type="jetbrains.mps.lang.generator.structure.PropertyMacro_GetPropertyValue:2" id="1217518689738">
- <node role="body:2" type="jetbrains.mps.baseLanguage.structure.StatementList:3" id="1217518689739">
- <node role="statement:3" type="jetbrains.mps.baseLanguage.structure.ExpressionStatement:3" id="1217518694108">
- <node role="expression:3" type="jetbrains.mps.baseLanguage.structure.DotExpression:3" id="1217518695530">
- <node role="operand:3" type="jetbrains.mps.baseLanguage.structure.DotExpression:3" id="1217524981320">
- <node role="operand:3" type="jetbrains.mps.lang.generator.structure.TemplateFunctionParameter_sourceNode:2" id="1217518694109" />
- <node role="operation:3" type="jetbrains.mps.lang.smodel.structure.SLinkAccess:16" id="1217524982666">
- <link role="link:16" targetNodeId="1.1217524800588:7" />
- </node>
- </node>
- <node role="operation:3" type="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall:16" id="1217518701291">
- <link role="baseMethodDeclaration:16" targetNodeId="20.1216909316753" resolveInfo="getClassesGen" />
- </node>
- </node>
- </node>
- </node>
- </node>
- </node>
- </node>
<node role="nodeMacro$attribute:0" type="jetbrains.mps.lang.generator.structure.LoopMacro:2" id="1217518508069">
<node role="sourceNodesQuery:2" type="jetbrains.mps.lang.generator.structure.SourceSubstituteMacro_SourceNodesQuery:2" id="1217518508070">
<node role="body:2" type="jetbrains.mps.baseLanguage.structure.StatementList:3" id="1217518508071">
@@ -4677,6 +4655,99 @@
</node>
</node>
</node>
+ <node role="classes:0" type="jetbrains.mps.build.dependency.structure.PathHolder:0" id="3315989002810591671">
+ <property name="path:0" value="path" />
+ <link role="macro:0" targetNodeId="1219419181122" resolveInfo="macro" />
+ <node role="nodeMacro$attribute:0" type="jetbrains.mps.lang.generator.structure.MapSrcNodeMacro:2" id="3315989002810591730">
+ <node role="sourceNodeQuery:2" type="jetbrains.mps.lang.generator.structure.SourceSubstituteMacro_SourceNodeQuery:2" id="3315989002810591731">
+ <node role="body:2" type="jetbrains.mps.baseLanguage.structure.StatementList:3" id="3315989002810591732">
+ <node role="statement:3" type="jetbrains.mps.baseLanguage.structure.ExpressionStatement:3" id="3315989002810591733">
+ <node role="expression:3" type="jetbrains.mps.baseLanguage.structure.DotExpression:3" id="3315989002810591745">
+ <node role="operand:3" type="jetbrains.mps.baseLanguage.structure.DotExpression:3" id="3315989002810591737">
+ <node role="operand:3" type="jetbrains.mps.lang.generator.structure.TemplateFunctionParameter_sourceNode:2" id="3315989002810591734" />
+ <node role="operation:3" type="jetbrains.mps.lang.smodel.structure.SLinkAccess:16" id="3315989002810591743">
+ <link role="link:16" targetNodeId="1.1217524800588:7" />
+ </node>
+ </node>
+ <node role="operation:3" type="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall:16" id="3315989002810591750">
+ <link role="baseMethodDeclaration:16" targetNodeId="20.3315989002810564857" resolveInfo="getClassesGen" />
+ </node>
+ </node>
+ </node>
+ </node>
+ </node>
+ </node>
+ <node role="nodeMacro$attribute:0" type="jetbrains.mps.lang.generator.structure.IfMacro:2" id="3315989002810591752">
+ <node role="conditionFunction:2" type="jetbrains.mps.lang.generator.structure.IfMacro_Condition:2" id="3315989002810591753">
+ <node role="body:2" type="jetbrains.mps.baseLanguage.structure.StatementList:3" id="3315989002810591754">
+ <node role="statement:3" type="jetbrains.mps.baseLanguage.structure.ExpressionStatement:3" id="3315989002810591755">
+ <node role="expression:3" type="jetbrains.mps.baseLanguage.structure.DotExpression:3" id="3315989002810591768">
+ <node role="operand:3" type="jetbrains.mps.baseLanguage.structure.DotExpression:3" id="3315989002810591759">
+ <node role="operand:3" type="jetbrains.mps.lang.generator.structure.TemplateFunctionParameter_sourceNode:2" id="3315989002810591756" />
+ <node role="operation:3" type="jetbrains.mps.lang.smodel.structure.SLinkAccess:16" id="3315989002810591766">
+ <link role="link:16" targetNodeId="1.1219229006340:7" />
+ </node>
+ </node>
+ <node role="operation:3" type="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation:16" id="3315989002810591773" />
+ </node>
+ </node>
+ </node>
+ </node>
+ <node role="alternativeConsequence:2" type="jetbrains.mps.lang.generator.structure.InlineTemplate_RuleConsequence:2" id="3315989002810591808">
+ <node role="templateNode:2" type="jetbrains.mps.build.dependency.structure.PathHolder:0" id="3315989002810591810">
+ <property name="path:0" value="path" />
+ <node role="propertyMacro$property_attribute$path:0" type="jetbrains.mps.lang.generator.structure.PropertyMacro:2" id="3315989002810591811">
+ <node role="propertyValueFunction:2" type="jetbrains.mps.lang.generator.structure.PropertyMacro_GetPropertyValue:2" id="3315989002810591812">
+ <node role="body:2" type="jetbrains.mps.baseLanguage.structure.StatementList:3" id="3315989002810591813">
+ <node role="statement:3" type="jetbrains.mps.baseLanguage.structure.ExpressionStatement:3" id="3315989002810591820">
+ <node role="expression:3" type="jetbrains.mps.baseLanguage.structure.DotExpression:3" id="3315989002810591821">
+ <node role="operand:3" type="jetbrains.mps.lang.generator.structure.TemplateFunctionParameter_sourceNode:2" id="3315989002810591822" />
+ <node role="operation:3" type="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall:16" id="3315989002810591823">
+ <link role="baseMethodDeclaration:16" targetNodeId="20.1219231432401" resolveInfo="getValue" />
+ </node>
+ </node>
+ </node>
+ </node>
+ </node>
+ </node>
+ </node>
+ </node>
+ </node>
+ <node role="referenceMacro$link_attribute$macro:0" type="jetbrains.mps.lang.generator.structure.ReferenceMacro:2" id="3315989002810591774">
+ <node role="referentFunction:2" type="jetbrains.mps.lang.generator.structure.ReferenceMacro_GetReferent:2" id="3315989002810591775">
+ <node role="body:2" type="jetbrains.mps.baseLanguage.structure.StatementList:3" id="3315989002810591776">
+ <node role="statement:3" type="jetbrains.mps.baseLanguage.structure.ExpressionStatement:3" id="3315989002810591777">
+ <node role="expression:3" type="jetbrains.mps.baseLanguage.structure.DotExpression:3" id="3315989002810591778">
+ <node role="operand:3" type="jetbrains.mps.lang.generator.generationContext.structure.TemplateFunctionParameter_generationContext:0" id="3315989002810591779" />
+ <node role="operation:3" type="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_GetOutputByLabelAndInput:0" id="3315989002810591780">
+ <link role="label:0" targetNodeId="1219771046960" resolveInfo="MacroToMacro" />
+ <node role="inputNode:0" type="jetbrains.mps.baseLanguage.structure.DotExpression:3" id="3315989002810591781">
+ <node role="operand:3" type="jetbrains.mps.lang.generator.structure.TemplateFunctionParameter_sourceNode:2" id="3315989002810591782" />
+ <node role="operation:3" type="jetbrains.mps.lang.smodel.structure.SLinkAccess:16" id="3315989002810591786">
+ <link role="link:16" targetNodeId="1.1219229006340:7" />
+ </node>
+ </node>
+ </node>
+ </node>
+ </node>
+ </node>
+ </node>
+ </node>
+ <node role="propertyMacro$property_attribute$path:0" type="jetbrains.mps.lang.generator.structure.PropertyMacro:2" id="3315989002810591787">
+ <node role="propertyValueFunction:2" type="jetbrains.mps.lang.generator.structure.PropertyMacro_GetPropertyValue:2" id="3315989002810591788">
+ <node role="body:2" type="jetbrains.mps.baseLanguage.structure.StatementList:3" id="3315989002810591789">
+ <node role="statement:3" type="jetbrains.mps.baseLanguage.structure.ExpressionStatement:3" id="3315989002810591790">
+ <node role="expression:3" type="jetbrains.mps.baseLanguage.structure.DotExpression:3" id="3315989002810591794">
+ <node role="operand:3" type="jetbrains.mps.lang.generator.structure.TemplateFunctionParameter_sourceNode:2" id="3315989002810591791" />
+ <node role="operation:3" type="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall:16" id="3315989002810591807">
+ <link role="baseMethodDeclaration:16" targetNodeId="20.1219770843283" resolveInfo="getPathWithoutMacro" />
+ </node>
+ </node>
+ </node>
+ </node>
+ </node>
+ </node>
+ </node>
</node>
</node>
<node role="rootTemplateAnnotation$attribute:0" type="jetbrains.mps.lang.generator.structure.RootTemplateAnnotation:2" id="1216902420776">
View
36 platform/buildlanguage/languages/packaging/languageModels/behavior.mps
@@ -4432,7 +4432,7 @@
<node role="visibility" type="jetbrains.mps.baseLanguage.structure.PublicVisibility:3" id="1219155724381" />
</node>
<node role="method" type="jetbrains.mps.lang.behavior.structure.ConceptMethodDeclaration" id="1216909316753">
- <property name="name" value="getClassesGen" />
+ <property name="name" value="getClassesGenString" />
<property name="isPrivate" value="false" />
<node role="body" type="jetbrains.mps.baseLanguage.structure.StatementList:3" id="1216909316755">
<node role="statement:3" type="jetbrains.mps.baseLanguage.structure.ExpressionStatement:3" id="1218707822277">
@@ -4472,6 +4472,40 @@
<node role="visibility" type="jetbrains.mps.baseLanguage.structure.PublicVisibility:3" id="1219155724359" />
<node role="returnType" type="jetbrains.mps.baseLanguage.structure.StringType:3" id="1219235451470" />
</node>
+ <node role="method" type="jetbrains.mps.lang.behavior.structure.ConceptMethodDeclaration" id="3315989002810564857">
+ <property name="name" value="getClassesGen" />
+ <property name="isPrivate" value="false" />
+ <node role="body" type="jetbrains.mps.baseLanguage.structure.StatementList:3" id="3315989002810564858">
+ <node role="statement:3" type="jetbrains.mps.baseLanguage.structure.ExpressionStatement:3" id="3315989002810586208">
+ <node role="expression:3" type="jetbrains.mps.baseLanguage.structure.DotExpression:3" id="3315989002810586209">
+ <node role="operand:3" type="jetbrains.mps.lang.behavior.structure.ThisNodeExpression" id="3315989002810586210" />
+ <node role="operation:3" type="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall:16" id="3315989002810586211">
+ <link role="baseMethodDeclaration:16" targetNodeId="1239195000114" resolveInfo="getPathHolder" />
+ <node role="actualArgument:16" type="jetbrains.mps.baseLanguage.structure.DotExpression:3" id="5419177948393669110">
+ <node role="operand:3" type="jetbrains.mps.baseLanguage.structure.DotExpression:3" id="5419177948393669111">
+ <node role="operand:3" type="jetbrains.mps.baseLanguage.structure.DotExpression:3" id="5419177948393669112">
+ <node role="operand:3" type="jetbrains.mps.lang.behavior.structure.ThisNodeExpression" id="5419177948393669113" />
+ <node role="operation:3" type="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall:16" id="5419177948393669114">
+ <link role="baseMethodDeclaration:16" targetNodeId="1213877515148" resolveInfo="getModule" />
+ </node>
+ </node>
+ <node role="operation:3" type="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation:3" id="5419177948393669115">
+ <link role="baseMethodDeclaration:3" targetNodeId="6.~IModule.getClassesGen():jetbrains.mps.vfs.IFile" resolveInfo="getClassesGen" />
+ </node>
+ </node>
+ <node role="operation:3" type="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation:3" id="5419177948393669116">
+ <link role="baseMethodDeclaration:3" targetNodeId="7.~IFile.getAbsolutePath():java.lang.String" resolveInfo="getAbsolutePath" />
+ </node>
+ </node>
+ </node>
+ </node>
+ </node>
+ </node>
+ <node role="visibility" type="jetbrains.mps.baseLanguage.structure.PublicVisibility:3" id="3315989002810564873" />
+ <node role="returnType" type="jetbrains.mps.lang.smodel.structure.SNodeType:16" id="3315989002810564875">
+ <link role="concept:16" targetNodeId="1.1204737220833:7" resolveInfo="PathHolder" />
+ </node>
+ </node>
<node role="method" type="jetbrains.mps.lang.behavior.structure.ConceptMethodDeclaration" id="1216909568805">
<property name="name" value="getSources" />
<property name="isPrivate" value="false" />
View
89 ...guage/languages/packaging/source_gen.caches/jetbrains/mps/build/packaging/behavior/.debug
@@ -38,7 +38,7 @@
<unitInfo fileName="Variable_Behavior.java" startLine="17" startPosition="0" endLine="95" endPosition="0" unitName="jetbrains.mps.build.packaging.behavior.Variable_Behavior" />
<unitInfo fileName="AbstractProjectComponent_Behavior.java" startLine="17" startPosition="0" endLine="102" endPosition="0" unitName="jetbrains.mps.build.packaging.behavior.AbstractProjectComponent_Behavior" />
<unitInfo fileName="MPSLayout_Behavior.java" startLine="23" startPosition="0" endLine="152" endPosition="0" unitName="jetbrains.mps.build.packaging.behavior.MPSLayout_Behavior" />
- <unitInfo fileName="Module_Behavior.java" startLine="32" startPosition="0" endLine="211" endPosition="0" unitName="jetbrains.mps.build.packaging.behavior.Module_Behavior" />
+ <unitInfo fileName="Module_Behavior.java" startLine="32" startPosition="0" endLine="215" endPosition="0" unitName="jetbrains.mps.build.packaging.behavior.Module_Behavior" />
<root nodeId="1213877173053">
<nodeInfo nodeId="1240317482667" fileName="IStringExpression_Behavior.java" startLine="16" startPosition="71" endLine="17" endPosition="14" />
<nodeInfo nodeId="8148924375507879478" fileName="IStringExpression_Behavior.java" startLine="20" startPosition="80" endLine="21" endPosition="76" />
@@ -361,21 +361,21 @@
<nodeInfo nodeId="1213877515129" fileName="Module_Behavior.java" startLine="145" startPosition="77" endLine="146" endPosition="124" />
<nodeInfo nodeId="1213877515140" fileName="Module_Behavior.java" startLine="149" startPosition="76" endLine="150" endPosition="120" />
<nodeInfo nodeId="1219146659682" fileName="Module_Behavior.java" startLine="157" startPosition="69" endLine="158" endPosition="91" />
- <nodeInfo nodeId="1216909799568" fileName="Module_Behavior.java" startLine="165" startPosition="75" endLine="166" endPosition="151" />
- <nodeInfo nodeId="1222444532241" fileName="Module_Behavior.java" startLine="169" startPosition="69" endLine="170" endPosition="71" />
- <nodeInfo nodeId="1222444532251" fileName="Module_Behavior.java" startLine="171" startPosition="102" endLine="172" endPosition="94" />
- <nodeInfo nodeId="1222444532267" fileName="Module_Behavior.java" startLine="174" startPosition="96" endLine="175" endPosition="92" />
- <nodeInfo nodeId="1222444532282" fileName="Module_Behavior.java" startLine="177" startPosition="102" endLine="178" endPosition="94" />
- <nodeInfo nodeId="1222444532294" fileName="Module_Behavior.java" startLine="179" startPosition="5" endLine="180" endPosition="16" />
- <nodeInfo nodeId="1222444746702" fileName="Module_Behavior.java" startLine="183" startPosition="70" endLine="184" endPosition="73" />
- <nodeInfo nodeId="1222444746712" fileName="Module_Behavior.java" startLine="185" startPosition="102" endLine="186" endPosition="55" />
- <nodeInfo nodeId="1222444746727" fileName="Module_Behavior.java" startLine="188" startPosition="96" endLine="189" endPosition="53" />
- <nodeInfo nodeId="1222444746742" fileName="Module_Behavior.java" startLine="191" startPosition="102" endLine="192" endPosition="55" />
- <nodeInfo nodeId="1222444746754" fileName="Module_Behavior.java" startLine="193" startPosition="5" endLine="194" endPosition="16" />
- <nodeInfo nodeId="1235487763789" fileName="Module_Behavior.java" startLine="198" startPosition="37" endLine="199" endPosition="44" />
- <nodeInfo nodeId="1235487808589" fileName="Module_Behavior.java" startLine="200" startPosition="46" endLine="201" endPosition="113" />
- <nodeInfo nodeId="1235487938566" fileName="Module_Behavior.java" startLine="203" startPosition="5" endLine="204" endPosition="88" />
- <nodeInfo nodeId="1235487864512" fileName="Module_Behavior.java" startLine="207" startPosition="72" endLine="208" endPosition="53" />
+ <nodeInfo nodeId="1216909799568" fileName="Module_Behavior.java" startLine="169" startPosition="75" endLine="170" endPosition="151" />
+ <nodeInfo nodeId="1222444532241" fileName="Module_Behavior.java" startLine="173" startPosition="69" endLine="174" endPosition="71" />
+ <nodeInfo nodeId="1222444532251" fileName="Module_Behavior.java" startLine="175" startPosition="102" endLine="176" endPosition="94" />
+ <nodeInfo nodeId="1222444532267" fileName="Module_Behavior.java" startLine="178" startPosition="96" endLine="179" endPosition="92" />
+ <nodeInfo nodeId="1222444532282" fileName="Module_Behavior.java" startLine="181" startPosition="102" endLine="182" endPosition="94" />
+ <nodeInfo nodeId="1222444532294" fileName="Module_Behavior.java" startLine="183" startPosition="5" endLine="184" endPosition="16" />
+ <nodeInfo nodeId="1222444746702" fileName="Module_Behavior.java" startLine="187" startPosition="70" endLine="188" endPosition="73" />
+ <nodeInfo nodeId="1222444746712" fileName="Module_Behavior.java" startLine="189" startPosition="102" endLine="190" endPosition="55" />
+ <nodeInfo nodeId="1222444746727" fileName="Module_Behavior.java" startLine="192" startPosition="96" endLine="193" endPosition="53" />
+ <nodeInfo nodeId="1222444746742" fileName="Module_Behavior.java" startLine="195" startPosition="102" endLine="196" endPosition="55" />
+ <nodeInfo nodeId="1222444746754" fileName="Module_Behavior.java" startLine="197" startPosition="5" endLine="198" endPosition="16" />
+ <nodeInfo nodeId="1235487763789" fileName="Module_Behavior.java" startLine="202" startPosition="37" endLine="203" endPosition="44" />
+ <nodeInfo nodeId="1235487808589" fileName="Module_Behavior.java" startLine="204" startPosition="46" endLine="205" endPosition="113" />
+ <nodeInfo nodeId="1235487938566" fileName="Module_Behavior.java" startLine="207" startPosition="5" endLine="208" endPosition="88" />
+ <nodeInfo nodeId="1235487864512" fileName="Module_Behavior.java" startLine="211" startPosition="72" endLine="212" endPosition="53" />
<nodeInfo nodeId="4771114505329668076" fileName="Module_Behavior.java" startLine="59" startPosition="101" endLine="62" endPosition="7" />
<nodeInfo nodeId="1213877514845" fileName="Module_Behavior.java" startLine="67" startPosition="89" endLine="70" endPosition="5" />
<nodeInfo nodeId="1215710658549" fileName="Module_Behavior.java" startLine="71" startPosition="39" endLine="74" endPosition="5" />
@@ -384,13 +384,13 @@
<nodeInfo nodeId="1239195086707" fileName="Module_Behavior.java" startLine="96" startPosition="172" endLine="99" endPosition="5" />
<nodeInfo nodeId="1218642607277" fileName="Module_Behavior.java" startLine="109" startPosition="86" endLine="112" endPosition="7" />
<nodeInfo nodeId="1213877515040" fileName="Module_Behavior.java" startLine="115" startPosition="55" endLine="118" endPosition="7" />
- <nodeInfo nodeId="1222444532248" fileName="Module_Behavior.java" startLine="170" startPosition="71" endLine="173" endPosition="5" />
- <nodeInfo nodeId="1222444532264" fileName="Module_Behavior.java" startLine="173" startPosition="5" endLine="176" endPosition="5" />
- <nodeInfo nodeId="1222444532279" fileName="Module_Behavior.java" startLine="176" startPosition="5" endLine="179" endPosition="5" />
- <nodeInfo nodeId="1222444746709" fileName="Module_Behavior.java" startLine="184" startPosition="73" endLine="187" endPosition="5" />
- <nodeInfo nodeId="1222444746724" fileName="Module_Behavior.java" startLine="187" startPosition="5" endLine="190" endPosition="5" />
- <nodeInfo nodeId="1222444746739" fileName="Module_Behavior.java" startLine="190" startPosition="5" endLine="193" endPosition="5" />
- <nodeInfo nodeId="1235487792730" fileName="Module_Behavior.java" startLine="199" startPosition="44" endLine="202" endPosition="7" />
+ <nodeInfo nodeId="1222444532248" fileName="Module_Behavior.java" startLine="174" startPosition="71" endLine="177" endPosition="5" />
+ <nodeInfo nodeId="1222444532264" fileName="Module_Behavior.java" startLine="177" startPosition="5" endLine="180" endPosition="5" />
+ <nodeInfo nodeId="1222444532279" fileName="Module_Behavior.java" startLine="180" startPosition="5" endLine="183" endPosition="5" />
+ <nodeInfo nodeId="1222444746709" fileName="Module_Behavior.java" startLine="188" startPosition="73" endLine="191" endPosition="5" />
+ <nodeInfo nodeId="1222444746724" fileName="Module_Behavior.java" startLine="191" startPosition="5" endLine="194" endPosition="5" />
+ <nodeInfo nodeId="1222444746739" fileName="Module_Behavior.java" startLine="194" startPosition="5" endLine="197" endPosition="5" />
+ <nodeInfo nodeId="1235487792730" fileName="Module_Behavior.java" startLine="203" startPosition="44" endLine="206" endPosition="7" />
<nodeInfo nodeId="1480356222699429497" fileName="Module_Behavior.java" startLine="125" startPosition="157" endLine="129" endPosition="0" />
<nodeInfo nodeId="1480356222699429714" fileName="Module_Behavior.java" startLine="136" startPosition="181" endLine="140" endPosition="0" />
<nodeInfo nodeId="1213877514864" fileName="Module_Behavior.java" startLine="74" startPosition="5" endLine="79" endPosition="5" />
@@ -399,7 +399,7 @@
<nodeInfo nodeId="1213877515109" fileName="Module_Behavior.java" startLine="135" startPosition="86" endLine="140" endPosition="142" />
<nodeInfo nodeId="627603934122280644" fileName="Module_Behavior.java" startLine="57" startPosition="74" endLine="63" endPosition="5" />
<nodeInfo nodeId="1218642589001" fileName="Module_Behavior.java" startLine="107" startPosition="36" endLine="113" endPosition="5" />
- <nodeInfo nodeId="1235487623700" fileName="Module_Behavior.java" startLine="197" startPosition="78" endLine="203" endPosition="5" />
+ <nodeInfo nodeId="1235487623700" fileName="Module_Behavior.java" startLine="201" startPosition="78" endLine="207" endPosition="5" />
<nodeInfo nodeId="1213877515107" fileName="Module_Behavior.java" startLine="133" startPosition="76" endLine="141" endPosition="5" />
<scopeInfo nodeId="1213877515201" fileName="Module_Behavior.java" startLine="33" startPosition="43" endLine="34" endPosition="0" />
<scopeInfo nodeId="1213877514767" fileName="Module_Behavior.java" startLine="37" startPosition="74" endLine="38" endPosition="68" />
@@ -420,16 +420,17 @@
<scopeInfo nodeId="1213877515139" fileName="Module_Behavior.java" startLine="149" startPosition="76" endLine="150" endPosition="120" />
<scopeInfo nodeId="1213877515150" fileName="Module_Behavior.java" startLine="153" startPosition="70" endLine="154" endPosition="127" />
<scopeInfo nodeId="1213877515160" fileName="Module_Behavior.java" startLine="157" startPosition="69" endLine="158" endPosition="91" />
- <scopeInfo nodeId="1216909316755" fileName="Module_Behavior.java" startLine="161" startPosition="73" endLine="162" endPosition="222" />
- <scopeInfo nodeId="1216909568807" fileName="Module_Behavior.java" startLine="165" startPosition="75" endLine="166" endPosition="151" />
- <scopeInfo nodeId="1222444532250" fileName="Module_Behavior.java" startLine="171" startPosition="102" endLine="172" endPosition="94" />
- <scopeInfo nodeId="1222444532266" fileName="Module_Behavior.java" startLine="174" startPosition="96" endLine="175" endPosition="92" />
- <scopeInfo nodeId="1222444532281" fileName="Module_Behavior.java" startLine="177" startPosition="102" endLine="178" endPosition="94" />
- <scopeInfo nodeId="1222444746711" fileName="Module_Behavior.java" startLine="185" startPosition="102" endLine="186" endPosition="55" />
- <scopeInfo nodeId="1222444746726" fileName="Module_Behavior.java" startLine="188" startPosition="96" endLine="189" endPosition="53" />
- <scopeInfo nodeId="1222444746741" fileName="Module_Behavior.java" startLine="191" startPosition="102" endLine="192" endPosition="55" />
- <scopeInfo nodeId="1235487792731" fileName="Module_Behavior.java" startLine="200" startPosition="46" endLine="201" endPosition="113" />
- <scopeInfo nodeId="1235487831797" fileName="Module_Behavior.java" startLine="207" startPosition="72" endLine="208" endPosition="53" />
+ <scopeInfo nodeId="1216909316755" fileName="Module_Behavior.java" startLine="161" startPosition="79" endLine="162" endPosition="222" />
+ <scopeInfo nodeId="3315989002810564858" fileName="Module_Behavior.java" startLine="165" startPosition="78" endLine="166" endPosition="160" />
+ <scopeInfo nodeId="1216909568807" fileName="Module_Behavior.java" startLine="169" startPosition="75" endLine="170" endPosition="151" />
+ <scopeInfo nodeId="1222444532250" fileName="Module_Behavior.java" startLine="175" startPosition="102" endLine="176" endPosition="94" />
+ <scopeInfo nodeId="1222444532266" fileName="Module_Behavior.java" startLine="178" startPosition="96" endLine="179" endPosition="92" />
+ <scopeInfo nodeId="1222444532281" fileName="Module_Behavior.java" startLine="181" startPosition="102" endLine="182" endPosition="94" />
+ <scopeInfo nodeId="1222444746711" fileName="Module_Behavior.java" startLine="189" startPosition="102" endLine="190" endPosition="55" />
+ <scopeInfo nodeId="1222444746726" fileName="Module_Behavior.java" startLine="192" startPosition="96" endLine="193" endPosition="53" />
+ <scopeInfo nodeId="1222444746741" fileName="Module_Behavior.java" startLine="195" startPosition="102" endLine="196" endPosition="55" />
+ <scopeInfo nodeId="1235487792731" fileName="Module_Behavior.java" startLine="204" startPosition="46" endLine="205" endPosition="113" />
+ <scopeInfo nodeId="1235487831797" fileName="Module_Behavior.java" startLine="211" startPosition="72" endLine="212" endPosition="53" />
<scopeInfo nodeId="1213877514796" fileName="Module_Behavior.java" startLine="49" startPosition="70" endLine="52" endPosition="129">
<varInfo nodeId="1219235231660" varName="str" />
<varInfo nodeId="1213877514798" varName="descriptor" />
@@ -439,20 +440,20 @@
</scopeInfo>
<scopeInfo nodeId="1213877514865" fileName="Module_Behavior.java" startLine="75" startPosition="33" endLine="78" endPosition="7" />
<scopeInfo nodeId="1213877515039" fileName="Module_Behavior.java" startLine="115" startPosition="55" endLine="118" endPosition="7" />
- <scopeInfo nodeId="1222444532248" fileName="Module_Behavior.java" startLine="170" startPosition="71" endLine="173" endPosition="5" />
- <scopeInfo nodeId="1222444532264" fileName="Module_Behavior.java" startLine="173" startPosition="5" endLine="176" endPosition="5" />
- <scopeInfo nodeId="1222444532279" fileName="Module_Behavior.java" startLine="176" startPosition="5" endLine="179" endPosition="5" />
- <scopeInfo nodeId="1222444746709" fileName="Module_Behavior.java" startLine="184" startPosition="73" endLine="187" endPosition="5" />
- <scopeInfo nodeId="1222444746724" fileName="Module_Behavior.java" startLine="187" startPosition="5" endLine="190" endPosition="5" />
- <scopeInfo nodeId="1222444746739" fileName="Module_Behavior.java" startLine="190" startPosition="5" endLine="193" endPosition="5" />
+ <scopeInfo nodeId="1222444532248" fileName="Module_Behavior.java" startLine="174" startPosition="71" endLine="177" endPosition="5" />
+ <scopeInfo nodeId="1222444532264" fileName="Module_Behavior.java" startLine="177" startPosition="5" endLine="180" endPosition="5" />
+ <scopeInfo nodeId="1222444532279" fileName="Module_Behavior.java" startLine="180" startPosition="5" endLine="183" endPosition="5" />
+ <scopeInfo nodeId="1222444746709" fileName="Module_Behavior.java" startLine="188" startPosition="73" endLine="191" endPosition="5" />
+ <scopeInfo nodeId="1222444746724" fileName="Module_Behavior.java" startLine="191" startPosition="5" endLine="194" endPosition="5" />
+ <scopeInfo nodeId="1222444746739" fileName="Module_Behavior.java" startLine="194" startPosition="5" endLine="197" endPosition="5" />
<scopeInfo nodeId="627603934122280645" fileName="Module_Behavior.java" startLine="58" startPosition="41" endLine="62" endPosition="7">
<varInfo nodeId="8715456793545854796" varName="dirs" />
</scopeInfo>
<scopeInfo nodeId="1213877514972" fileName="Module_Behavior.java" startLine="87" startPosition="80" endLine="91" endPosition="71" />
<scopeInfo nodeId="1218642589002" fileName="Module_Behavior.java" startLine="108" startPosition="108" endLine="112" endPosition="7" />
<scopeInfo nodeId="1480356222699429497" fileName="Module_Behavior.java" startLine="125" startPosition="157" endLine="129" endPosition="0" />
<scopeInfo nodeId="1480356222699429714" fileName="Module_Behavior.java" startLine="136" startPosition="181" endLine="140" endPosition="0" />
- <scopeInfo nodeId="1235487623702" fileName="Module_Behavior.java" startLine="198" startPosition="37" endLine="202" endPosition="7">
+ <scopeInfo nodeId="1235487623702" fileName="Module_Behavior.java" startLine="202" startPosition="37" endLine="206" endPosition="7">
<varInfo nodeId="1235487763790" varName="solution" />
</scopeInfo>
<scopeInfo nodeId="1213877514864" fileName="Module_Behavior.java" startLine="74" startPosition="5" endLine="79" endPosition="5">
@@ -471,18 +472,18 @@
<scopeInfo nodeId="1239195000117" fileName="Module_Behavior.java" startLine="94" startPosition="85" endLine="101" endPosition="22">
<varInfo nodeId="1239195086690" varName="pathHolder" />
</scopeInfo>
- <scopeInfo nodeId="1235487584037" fileName="Module_Behavior.java" startLine="197" startPosition="78" endLine="204" endPosition="88" />
+ <scopeInfo nodeId="1235487584037" fileName="Module_Behavior.java" startLine="201" startPosition="78" endLine="208" endPosition="88" />
<scopeInfo nodeId="8196794507570019549" fileName="Module_Behavior.java" startLine="55" startPosition="85" endLine="64" endPosition="56">
<varInfo nodeId="627603934122281058" varName="result" />
<varInfo nodeId="7250370422265908620" varName="caches" />
</scopeInfo>
<scopeInfo nodeId="1213877515100" fileName="Module_Behavior.java" startLine="132" startPosition="84" endLine="142" endPosition="34">
<varInfo nodeId="1213877515102" varName="module" />
</scopeInfo>
- <scopeInfo nodeId="1222444513020" fileName="Module_Behavior.java" startLine="169" startPosition="69" endLine="180" endPosition="16">
+ <scopeInfo nodeId="1222444513020" fileName="Module_Behavior.java" startLine="173" startPosition="69" endLine="184" endPosition="16">
<varInfo nodeId="1222444532242" varName="list" />
</scopeInfo>
- <scopeInfo nodeId="1222444746701" fileName="Module_Behavior.java" startLine="183" startPosition="70" endLine="194" endPosition="16">
+ <scopeInfo nodeId="1222444746701" fileName="Module_Behavior.java" startLine="187" startPosition="70" endLine="198" endPosition="16">
<varInfo nodeId="1222444746703" varName="list" />
</scopeInfo>
<scopeInfo nodeId="1213877514844" fileName="Module_Behavior.java" startLine="67" startPosition="89" endLine="80" endPosition="97">
View
1 ..._gen.caches/jetbrains/mps/build/packaging/behavior/.hash.-7ohu29qz4cufudbe322cswxfsyh1bln
@@ -0,0 +1 @@
+-7ohu29qz4cufudbe322cswxfsyh1bln
View
1 ...e_gen.caches/jetbrains/mps/build/packaging/behavior/.hash.945mpnxx3o351cv174fdrmwweqi00n3
@@ -1 +0,0 @@
-945mpnxx3o351cv174fdrmwweqi00n3
View
782 ...rce_gen.caches/jetbrains/mps/build/packaging/generator/buildlanguage/template/main/.debug
393 additions, 389 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
1 ...ld/packaging/generator/buildlanguage/template/main/.hash.-a6iacqyc2dg493cfo84394s14tqzf1u
@@ -1 +0,0 @@
--a6iacqyc2dg493cfo84394s14tqzf1u
View
1 ...ild/packaging/generator/buildlanguage/template/main/.hash.4m1l2q27ivn9vcbyzwhe8gsntwxaytv
@@ -0,0 +1 @@
+4m1l2q27ivn9vcbyzwhe8gsntwxaytv
View
6 ...anguages/packaging/source_gen/jetbrains/mps/build/packaging/behavior/Module_Behavior.java
@@ -158,10 +158,14 @@ public static Macros call_getMacros_1213877515158(SNode thisNode) {
return Macros.moduleDescriptor(Module_Behavior.call_getModule_1213877515148(thisNode));
}
- public static String call_getClassesGen_1216909316753(SNode thisNode) {
+ public static String call_getClassesGenString_1216909316753(SNode thisNode) {
return ModuleUtil.getRelativePath(Module_Behavior.call_getModule_1213877515148(thisNode).getClassesGen().getAbsolutePath(), AbstractProjectComponent_Behavior.call_getHomePath_1213877333764(thisNode).getAbsolutePath());
}
+ public static SNode call_getClassesGen_3315989002810564857(SNode thisNode) {
+ return Module_Behavior.call_getPathHolder_1239195000114(thisNode, Module_Behavior.call_getModule_1213877515148(thisNode).getClassesGen().getAbsolutePath());
+ }
+
public static List<SNode> call_getSources_1216909568805(SNode thisNode) {
return Module_Behavior.call_getPathHolders_1213877515000(thisNode, Module_Behavior.call_getModule_1213877515148(thisNode).getSourcePaths(), false);
}
View
36 ...jetbrains/mps/build/packaging/generator/buildlanguage/template/main/QueriesGenerated.java
@@ -251,14 +251,18 @@ public static Object propertyMacro_GetPropertyValue_1220027664152(final IOperati
return PathHolder_Behavior.call_getPathWithoutMacro_1219770843283(_context.getNode());
}
- public static Object propertyMacro_GetPropertyValue_1217518689738(final IOperationContext operationContext, final PropertyMacroContext _context) {
- return Module_Behavior.call_getClassesGen_1216909316753(SLinkOperations.getTarget(_context.getNode(), "module", false));
- }
-
public static Object propertyMacro_GetPropertyValue_1217518534457(final IOperationContext operationContext, final PropertyMacroContext _context) {
return SPropertyOperations.getString(SLinkOperations.getTarget(_context.getNode(), "module", false), "name").replace(File.separator, "_");
}
+ public static Object propertyMacro_GetPropertyValue_3315989002810591812(final IOperationContext operationContext, final PropertyMacroContext _context) {
+ return PathHolder_Behavior.call_getValue_1219231432401(_context.getNode());
+ }
+
+ public static Object propertyMacro_GetPropertyValue_3315989002810591788(final IOperationContext operationContext, final PropertyMacroContext _context) {
+ return PathHolder_Behavior.call_getPathWithoutMacro_1219770843283(_context.getNode());
+ }
+
public static Object propertyMacro_GetPropertyValue_1216902460852(final IOperationContext operationContext, final PropertyMacroContext _context) {
return SPropertyOperations.getString(_context.getNode(), "name") + "-compile";
}
@@ -436,6 +440,10 @@ public static Object referenceMacro_GetReferent_1220024351671(final IOperationCo
return _context.getOutputNodeByInputNodeAndMappingLabel(SLinkOperations.getTarget(_context.getNode(), "macro", false), "MacroToMacro");
}
+ public static Object referenceMacro_GetReferent_3315989002810591775(final IOperationContext operationContext, final ReferenceMacroContext _context) {
+ return _context.getOutputNodeByInputNodeAndMappingLabel(SLinkOperations.getTarget(_context.getNode(), "macro", false), "MacroToMacro");
+ }
+
public static Object referenceMacro_GetReferent_1220032480105(final IOperationContext operationContext, final ReferenceMacroContext _context) {
return _context.getOutputNodeByInputNodeAndMappingLabel(SLinkOperations.getTarget(_context.getNode(), "macro", false), "MacroToMacro");
}
@@ -631,6 +639,10 @@ public static boolean ifMacro_Condition_1220024351653(final IOperationContext op
return (SLinkOperations.getTarget(_context.getNode(), "macro", false) != null);
}
+ public static boolean ifMacro_Condition_3315989002810591753(final IOperationContext operationContext, final IfMacroContext _context) {
+ return (SLinkOperations.getTarget(_context.getNode(), "macro", false) != null);
+ }
+
public static boolean ifMacro_Condition_1220032434961(final IOperationContext operationContext, final IfMacroContext _context) {
return (SLinkOperations.getTarget(_context.getNode(), "macro", false) != null);
}
@@ -710,6 +722,10 @@ public static SNode sourceNodeQuery_1219156936386(final IOperationContext operat
return SLinkOperations.getTarget(_context.getNode(), "message", true);
}
+ public static SNode sourceNodeQuery_3315989002810591731(final IOperationContext operationContext, final SourceSubstituteMacroNodeContext _context) {
+ return Module_Behavior.call_getClassesGen_3315989002810564857(SLinkOperations.getTarget(_context.getNode(), "module", false));
+ }
+
public static SNode sourceNodeQuery_1219156054317(final IOperationContext operationContext, final SourceSubstituteMacroNodeContext _context) {
return SLinkOperations.getTarget(_context.getNode(), "left", true);
}
@@ -1006,11 +1022,11 @@ public static void mappingScript_CodeBlock_4708969439075231893(final IOperationC
if (module != null && module.isPackaged()) {
- SNode fileComponent = new QueriesGenerated.QuotationClass_x583g4_a0a2a1a0a181().createNode();
+ SNode fileComponent = new QueriesGenerated.QuotationClass_x583g4_a0a2a1a0a581().createNode();
SLinkOperations.setTarget(SLinkOperations.getTarget(fileComponent, "sourcePath", true), "compositePathComponent", Util.getPackagedJarPath(module), true);
if (new File(Util.getRuntimeJarPathString(moduleNode)).exists()) {
- SNode fileRuntimeComponent = new QueriesGenerated.QuotationClass_x583g4_a0a0a5a1a0a181().createNode();
+ SNode fileRuntimeComponent = new QueriesGenerated.QuotationClass_x583g4_a0a0a5a1a0a581().createNode();
SLinkOperations.setTarget(SLinkOperations.getTarget(fileRuntimeComponent, "sourcePath", true), "compositePathComponent", Util.getRuntimeJarPath(moduleNode), true);
SNodeOperations.insertNextSiblingChild(moduleNode, fileRuntimeComponent);
}
@@ -1019,8 +1035,8 @@ public static void mappingScript_CodeBlock_4708969439075231893(final IOperationC
}
}
- public static class QuotationClass_x583g4_a0a2a1a0a181 {
- public QuotationClass_x583g4_a0a2a1a0a181() {
+ public static class QuotationClass_x583g4_a0a2a1a0a581 {
+ public QuotationClass_x583g4_a0a2a1a0a581() {
}
public SNode createNode() {
@@ -1055,8 +1071,8 @@ public SNode createNode() {
}
}
- public static class QuotationClass_x583g4_a0a0a5a1a0a181 {
- public QuotationClass_x583g4_a0a0a5a1a0a181() {
+ public static class QuotationClass_x583g4_a0a0a5a1a0a581 {
+ public QuotationClass_x583g4_a0a0a5a1a0a581() {
}
public SNode createNode() {

0 comments on commit 5817158

Please sign in to comment.