Fixed: classifiers are now also collected from external modules.

qutorial · Nov 13, 2014 · db81b55 · db81b55
1 parent 60fe3b9
commit db81b55
Show file tree

Hide file tree

Showing 5 changed files with 352 additions and 14 deletions.
diff --git a/...lus/languages/com.mbeddr.cpp/languages/com.mbeddr.cpp.classes/languageModels/behavior.mps b/...lus/languages/com.mbeddr.cpp/languages/com.mbeddr.cpp.classes/languageModels/behavior.mps
@@ -11885,7 +11885,7 @@
  <node role="type" roleId="tpee.5680397130376446158" type="tpee.ClassifierType" typeId="tpee.1107535904670" id="8418506114727274456" nodeInfo="in">
  <link role="classifier" roleId="tpee.1107535924139" targetNodeId="k7g3.~HashSet" resolveInfo="HashSet" />
  <node role="parameter" roleId="tpee.1109201940907" type="tp25.SNodeType" typeId="tp25.1138055754698" id="8418506114727275746" nodeInfo="in">
- <link role="concept" roleId="tp25.1138405853777" targetNodeId="sg22.4387763778170601606" resolveInfo="CppImplementationModule" />
+ <link role="concept" roleId="tp25.1138405853777" targetNodeId="x27k.6437088627575722813" resolveInfo="Module" />
  </node>
  </node>
  </node>
@@ -12073,6 +12073,75 @@
  </node>
  </node>
  </node>
+ <node role="elsifClauses" roleId="tpee.1206060520071" type="tpee.ElsifClause" typeId="tpee.1206060495898" id="9194653398607283647" nodeInfo="ng">
+ <node role="condition" roleId="tpee.1206060619838" type="tpee.DotExpression" typeId="tpee.1197027756228" id="9194653398607329510" nodeInfo="nn">
+ <node role="operand" roleId="tpee.1197027771414" type="tpee.DotExpression" typeId="tpee.1197027756228" id="9194653398607285527" nodeInfo="nn">
+ <node role="operand" roleId="tpee.1197027771414" type="tpee.VariableReference" typeId="tpee.1068498886296" id="9194653398607285330" nodeInfo="nn">
+ <link role="variableDeclaration" roleId="tpee.1068581517664" targetNodeId="74985006384755618" resolveInfo="chunkDependency" />
+ </node>
+ <node role="operation" roleId="tpee.1197027833540" type="tp25.Node_ConceptMethodCall" typeId="tp25.1179409122411" id="9194653398607329021" nodeInfo="nn">
+ <link role="baseMethodDeclaration" roleId="tpee.1068499141037" targetNodeId="hwgx.7139820346881814627" resolveInfo="chunk" />
+ </node>
+ </node>
+ <node role="operation" roleId="tpee.1197027833540" type="tp25.Node_IsInstanceOfOperation" typeId="tp25.1139621453865" id="9194653398607336215" nodeInfo="nn">
+ <node role="conceptArgument" roleId="tp25.1177027386292" type="tp25.RefConcept_Reference" typeId="tp25.1177026924588" id="9194653398607337669" nodeInfo="nn">
+ <link role="conceptDeclaration" roleId="tp25.1177026940964" targetNodeId="sg22.6387747963809296042" resolveInfo="CppExternalModule" />
+ </node>
+ </node>
+ </node>
+ <node role="statementList" roleId="tpee.1206060644605" type="tpee.StatementList" typeId="tpee.1068580123136" id="9194653398607283649" nodeInfo="sn">
+ <node role="statement" roleId="tpee.1068581517665" type="tpee.ExpressionStatement" typeId="tpee.1068580123155" id="9194653398607348151" nodeInfo="nn">
+ <node role="expression" roleId="tpee.1068580123156" type="tpee.AssignmentExpression" typeId="tpee.1068498886294" id="9194653398607348152" nodeInfo="nn">
+ <node role="rValue" roleId="tpee.1068498886297" type="tpee.LocalMethodCall" typeId="tpee.7812454656619025412" id="9194653398607348153" nodeInfo="nn">
+ <link role="baseMethodDeclaration" roleId="tpee.1068499141037" targetNodeId="74985006384755253" resolveInfo="getClassesRec" />
+ <node role="actualArgument" roleId="tpee.1068499141038" type="tpee.VariableReference" typeId="tpee.1068498886296" id="9194653398607348154" nodeInfo="nn">
+ <link role="variableDeclaration" roleId="tpee.1068581517664" targetNodeId="74985006384755261" resolveInfo="inspectedModules" />
+ </node>
+ <node role="actualArgument" roleId="tpee.1068499141038" type="tp25.SNodeTypeCastExpression" typeId="tp25.1140137987495" id="9194653398607348155" nodeInfo="nn">
+ <property name="asCast" nameId="tp25.1238684351431" value="true" />
+ <link role="concept" roleId="tp25.1140138128738" targetNodeId="sg22.6387747963809296042" resolveInfo="CppExternalModule" />
+ <node role="leftExpression" roleId="tp25.1140138123956" type="tpee.DotExpression" typeId="tpee.1197027756228" id="9194653398607348156" nodeInfo="nn">
+ <node role="operand" roleId="tpee.1197027771414" type="tpee.VariableReference" typeId="tpee.1068498886296" id="9194653398607348157" nodeInfo="nn">
+ <link role="variableDeclaration" roleId="tpee.1068581517664" targetNodeId="74985006384755618" resolveInfo="chunkDependency" />
+ </node>
+ <node role="operation" roleId="tpee.1197027833540" type="tp25.Node_ConceptMethodCall" typeId="tp25.1179409122411" id="9194653398607348158" nodeInfo="nn">
+ <link role="baseMethodDeclaration" roleId="tpee.1068499141037" targetNodeId="hwgx.7139820346881814627" resolveInfo="chunk" />
+ </node>
+ </node>
+ </node>
+ <node role="actualArgument" roleId="tpee.1068499141038" type="tpee.VariableReference" typeId="tpee.1068498886296" id="9194653398607348159" nodeInfo="nn">
+ <link role="variableDeclaration" roleId="tpee.1068581517664" targetNodeId="74985006384755269" resolveInfo="discoveredClasses" />
+ </node>
+ </node>
+ <node role="lValue" roleId="tpee.1068498886295" type="tpee.VariableReference" typeId="tpee.1068498886296" id="9194653398607348160" nodeInfo="nn">
+ <link role="variableDeclaration" roleId="tpee.1068581517664" targetNodeId="74985006384755269" resolveInfo="discoveredClasses" />
+ </node>
+ </node>
+ </node>
+ <node role="statement" roleId="tpee.1068581517665" type="tpee.ExpressionStatement" typeId="tpee.1068580123155" id="9194653398607348161" nodeInfo="nn">
+ <node role="expression" roleId="tpee.1068580123156" type="tpee.DotExpression" typeId="tpee.1197027756228" id="9194653398607348162" nodeInfo="nn">
+ <node role="operand" roleId="tpee.1197027771414" type="tpee.VariableReference" typeId="tpee.1068498886296" id="9194653398607348163" nodeInfo="nn">
+ <link role="variableDeclaration" roleId="tpee.1068581517664" targetNodeId="74985006384755261" resolveInfo="inspectedModules" />
+ </node>
+ <node role="operation" roleId="tpee.1197027833540" type="tpee.InstanceMethodCallOperation" typeId="tpee.1202948039474" id="9194653398607348164" nodeInfo="nn">
+ <link role="baseMethodDeclaration" roleId="tpee.1068499141037" targetNodeId="k7g3.~Set%dadd(java%dlang%dObject)%cboolean" resolveInfo="add" />
+ <node role="actualArgument" roleId="tpee.1068499141038" type="tp25.SNodeTypeCastExpression" typeId="tp25.1140137987495" id="9194653398607348165" nodeInfo="nn">
+ <property name="asCast" nameId="tp25.1238684351431" value="true" />
+ <link role="concept" roleId="tp25.1140138128738" targetNodeId="sg22.6387747963809296042" resolveInfo="CppExternalModule" />
+ <node role="leftExpression" roleId="tp25.1140138123956" type="tpee.DotExpression" typeId="tpee.1197027756228" id="9194653398607348166" nodeInfo="nn">
+ <node role="operand" roleId="tpee.1197027771414" type="tpee.VariableReference" typeId="tpee.1068498886296" id="9194653398607348167" nodeInfo="nn">
+ <link role="variableDeclaration" roleId="tpee.1068581517664" targetNodeId="74985006384755618" resolveInfo="chunkDependency" />
+ </node>
+ <node role="operation" roleId="tpee.1197027833540" type="tp25.Node_ConceptMethodCall" typeId="tp25.1179409122411" id="9194653398607348168" nodeInfo="nn">
+ <link role="baseMethodDeclaration" roleId="tpee.1068499141037" targetNodeId="hwgx.7139820346881814627" resolveInfo="chunk" />
+ </node>
+ </node>
+ </node>
+ </node>
+ </node>
+ </node>
+ </node>
+ </node>
  </node>
  </node>
  <node role="variable" roleId="tpee.1144230900587" type="tpee.LocalVariableDeclaration" typeId="tpee.1068581242863" id="74985006384755618" nodeInfo="nr">
@@ -12109,7 +12178,7 @@
  <node role="type" roleId="tpee.5680397130376446158" type="tpee.ClassifierType" typeId="tpee.1107535904670" id="74985006384755262" nodeInfo="in">
  <link role="classifier" roleId="tpee.1107535924139" targetNodeId="k7g3.~Set" resolveInfo="Set" />
  <node role="parameter" roleId="tpee.1109201940907" type="tp25.SNodeType" typeId="tp25.1138055754698" id="74985006384755264" nodeInfo="in">
- <link role="concept" roleId="tp25.1138405853777" targetNodeId="sg22.4387763778170601606" resolveInfo="CppImplementationModule" />
+ <link role="concept" roleId="tp25.1138405853777" targetNodeId="x27k.6437088627575722813" resolveInfo="Module" />
  </node>
  </node>
  </node>

diff --git a/...us/languages/com.mbeddr.cpp/languages/com.mbeddr.cpp.classes/languageModels/structure.mps b/...us/languages/com.mbeddr.cpp/languages/com.mbeddr.cpp.classes/languageModels/structure.mps
@@ -910,5 +910,11 @@
  <link role="target" roleId="tpce.1071599976176" targetNodeId="4157133445515747689" resolveInfo="ConstructorCallExpression" />
  </node>
  </root>
+ <root type="tpce.ConceptDeclaration" typeId="tpce.1071489090640" id="9194653398609669669" nodeInfo="ig">
+ <property name="virtualPackage" nameId="tpck.1193676396447" value="OperatorDesignators" />
+ <property name="name" nameId="tpck.1169194664001" value="EqualityOperator" />
+ <property name="conceptAlias" nameId="tpce.5092175715804935370" value="==" />
+ <link role="extends" roleId="tpce.1071489389519" targetNodeId="8489939682835057211" resolveInfo="OperatorDesignatorAbstract" />
+ </root>
 </model>
 
diff --git a/...Plus/languages/com.mbeddr.cpp/languages/com.mbeddr.cpp.classes/languageModels/textGen.mps b/...Plus/languages/com.mbeddr.cpp/languages/com.mbeddr.cpp.classes/languageModels/textGen.mps
@@ -2263,20 +2263,15 @@
  <property name="value" nameId="2omo.1237305576108" value=" " />
  </node>
  <node role="part" roleId="2omo.1237306115446" type="2omo.NodeAppendPart" typeId="2omo.1237305334312" id="1146664085211854444" nodeInfo="ng">
- <node role="value" roleId="2omo.1237305790512" type="tpee.DotExpression" typeId="tpee.1197027756228" id="3417735011110123291" nodeInfo="nn">
- <node role="operand" roleId="tpee.1197027771414" type="tpee.DotExpression" typeId="tpee.1197027756228" id="3417735011110118766" nodeInfo="nn">
- <node role="operand" roleId="tpee.1197027771414" type="tpee.DotExpression" typeId="tpee.1197027756228" id="1146664085211855103" nodeInfo="nn">
- <node role="operand" roleId="tpee.1197027771414" type="2omo.NodeParameter" typeId="2omo.1233748055915" id="1146664085211854800" nodeInfo="nn" />
- <node role="operation" roleId="tpee.1197027833540" type="tp25.SLinkAccess" typeId="tp25.1138056143562" id="3417735011110115822" nodeInfo="nn">
- <link role="link" roleId="tp25.1138056516764" targetNodeId="vv6f.3417735011104370513" />
- </node>
- </node>
- <node role="operation" roleId="tpee.1197027833540" type="tp25.SLinkAccess" typeId="tp25.1138056143562" id="3417735011110121584" nodeInfo="nn">
- <link role="link" roleId="tp25.1138056516764" targetNodeId="vv6f.8489939682834515512" />
+ <node role="value" roleId="2omo.1237305790512" type="tpee.DotExpression" typeId="tpee.1197027756228" id="3417735011110118766" nodeInfo="nn">
+ <node role="operand" roleId="tpee.1197027771414" type="tpee.DotExpression" typeId="tpee.1197027756228" id="1146664085211855103" nodeInfo="nn">
+ <node role="operand" roleId="tpee.1197027771414" type="2omo.NodeParameter" typeId="2omo.1233748055915" id="1146664085211854800" nodeInfo="nn" />
+ <node role="operation" roleId="tpee.1197027833540" type="tp25.SLinkAccess" typeId="tp25.1138056143562" id="3417735011110115822" nodeInfo="nn">
+ <link role="link" roleId="tp25.1138056516764" targetNodeId="vv6f.3417735011104370513" />
  </node>
  </node>
- <node role="operation" roleId="tpee.1197027833540" type="tp25.SPropertyAccess" typeId="tp25.1138056022639" id="3417735011110124603" nodeInfo="nn">
- <link role="property" roleId="tp25.1138056395725" targetNodeId="tpck.1156235010670" resolveInfo="alias" />
+ <node role="operation" roleId="tpee.1197027833540" type="tp25.SLinkAccess" typeId="tp25.1138056143562" id="3417735011110121584" nodeInfo="nn">
+ <link role="link" roleId="tp25.1138056516764" targetNodeId="vv6f.8489939682834515512" />
  </node>
  </node>
  </node>
@@ -2569,5 +2564,57 @@
  </node>
  </node>
  </root>
+ <root type="2omo.ConceptTextGenDeclaration" typeId="2omo.1233670071145" id="9194653398611317488" nodeInfo="ng">
+ <property name="virtualPackage" nameId="tpck.1193676396447" value="OperatorDesignators" />
+ <link role="conceptDeclaration" roleId="2omo.1233670257997" targetNodeId="vv6f.7540295501294663037" resolveInfo="AssignmentOperatorDesignator" />
+ <node role="textGenBlock" roleId="2omo.1233749296504" type="2omo.GenerateTextDeclaration" typeId="2omo.1233749247888" id="9194653398611317489" nodeInfo="nn">
+ <node role="body" roleId="tpee.1137022507850" type="tpee.StatementList" typeId="tpee.1068580123136" id="9194653398611317490" nodeInfo="sn">
+ <node role="statement" roleId="tpee.1068581517665" type="2omo.AppendOperation" typeId="2omo.1237306079178" id="9194653398611319799" nodeInfo="nn">
+ <node role="part" roleId="2omo.1237306115446" type="2omo.ConstantStringAppendPart" typeId="2omo.1237305557638" id="9194653398611319819" nodeInfo="ng">
+ <property name="value" nameId="2omo.1237305576108" value="=" />
+ </node>
+ </node>
+ </node>
+ </node>
+ </root>
+ <root type="2omo.ConceptTextGenDeclaration" typeId="2omo.1233670071145" id="9194653398611319844" nodeInfo="ng">
+ <property name="virtualPackage" nameId="tpck.1193676396447" value="OperatorDesignators" />
+ <link role="conceptDeclaration" roleId="2omo.1233670257997" targetNodeId="vv6f.9194653398609669669" resolveInfo="EqualityOperator" />
+ <node role="textGenBlock" roleId="2omo.1233749296504" type="2omo.GenerateTextDeclaration" typeId="2omo.1233749247888" id="9194653398611319845" nodeInfo="nn">
+ <node role="body" roleId="tpee.1137022507850" type="tpee.StatementList" typeId="tpee.1068580123136" id="9194653398611319846" nodeInfo="sn">
+ <node role="statement" roleId="tpee.1068581517665" type="2omo.AppendOperation" typeId="2omo.1237306079178" id="9194653398611319869" nodeInfo="nn">
+ <node role="part" roleId="2omo.1237306115446" type="2omo.ConstantStringAppendPart" typeId="2omo.1237305557638" id="9194653398611390594" nodeInfo="ng">
+ <property name="value" nameId="2omo.1237305576108" value="==" />
+ </node>
+ </node>
+ </node>
+ </node>
+ </root>
+ <root type="2omo.ConceptTextGenDeclaration" typeId="2omo.1233670071145" id="9194653398611458485" nodeInfo="ng">
+ <property name="virtualPackage" nameId="tpck.1193676396447" value="OperatorDesignators" />
+ <link role="conceptDeclaration" roleId="2omo.1233670257997" targetNodeId="vv6f.8489939682834769338" resolveInfo="MinusOperatorDesignator" />
+ <node role="textGenBlock" roleId="2omo.1233749296504" type="2omo.GenerateTextDeclaration" typeId="2omo.1233749247888" id="9194653398611458486" nodeInfo="nn">
+ <node role="body" roleId="tpee.1137022507850" type="tpee.StatementList" typeId="tpee.1068580123136" id="9194653398611458487" nodeInfo="sn">
+ <node role="statement" roleId="tpee.1068581517665" type="2omo.AppendOperation" typeId="2omo.1237306079178" id="9194653398611458510" nodeInfo="nn">
+ <node role="part" roleId="2omo.1237306115446" type="2omo.ConstantStringAppendPart" typeId="2omo.1237305557638" id="9194653398611458530" nodeInfo="ng">
+ <property name="value" nameId="2omo.1237305576108" value="-" />
+ </node>
+ </node>
+ </node>
+ </node>
+ </root>
+ <root type="2omo.ConceptTextGenDeclaration" typeId="2omo.1233670071145" id="9194653398611458563" nodeInfo="ng">
+ <property name="virtualPackage" nameId="tpck.1193676396447" value="OperatorDesignators" />
+ <link role="conceptDeclaration" roleId="2omo.1233670257997" targetNodeId="vv6f.8489939682834505169" resolveInfo="PlusOperatorDesignator" />
+ <node role="textGenBlock" roleId="2omo.1233749296504" type="2omo.GenerateTextDeclaration" typeId="2omo.1233749247888" id="9194653398611458564" nodeInfo="nn">
+ <node role="body" roleId="tpee.1137022507850" type="tpee.StatementList" typeId="tpee.1068580123136" id="9194653398611458565" nodeInfo="sn">
+ <node role="statement" roleId="tpee.1068581517665" type="2omo.AppendOperation" typeId="2omo.1237306079178" id="9194653398611458650" nodeInfo="nn">
+ <node role="part" roleId="2omo.1237306115446" type="2omo.ConstantStringAppendPart" typeId="2omo.1237305557638" id="9194653398611458670" nodeInfo="ng">
+ <property name="value" nameId="2omo.1237305576108" value="+" />
+ </node>
+ </node>
+ </node>
+ </node>
+ </root>
 </model>