Skip to content

Commit

Permalink
Implement old methods through new api
Browse files Browse the repository at this point in the history
  • Loading branch information
Timur Abishev committed Oct 11, 2012
1 parent a4402a7 commit 237a9b7
Show file tree
Hide file tree
Showing 7 changed files with 55 additions and 287 deletions.
5 changes: 1 addition & 4 deletions core/kernel/smodelRuntime/jetbrains/mps/lang/smodel/generator/smodelAdapter.mps
View file
Expand Up @@ -11365,17 +11365,14 @@
</node>
<node role="initializer" roleId="tpee.1068431790190" type="tpee.DotExpression" typeId="tpee.1197027756228" id="3873386204295367256">
<node role="operand" roleId="tpee.1197027771414" type="tpee.StaticMethodCall" typeId="tpee.1081236700937" id="3873386204295367234">
<link role="baseMethodDeclaration" roleId="tpee.1068499141037" targetNodeId="ymbg.~ModelConstraints%dgetReferenceDescriptor(jetbrains%dmps%dsmodel%dSNode,java%dlang%dString,int)%cjetbrains%dmps%dsmodel%dconstraints%dReferenceDescriptor" resolveInfo="getReferenceDescriptor" />
<link role="classConcept" roleId="tpee.1144433194310" targetNodeId="ymbg.~ModelConstraints" resolveInfo="ModelConstraints" />
<link role="baseMethodDeclaration" roleId="tpee.1068499141037" targetNodeId="ymbg.~ModelConstraints%dgetReferenceDescriptor(jetbrains%dmps%dsmodel%dSNode,java%dlang%dString)%cjetbrains%dmps%dsmodel%dconstraints%dReferenceDescriptor" resolveInfo="getReferenceDescriptor" />
<node role="actualArgument" roleId="tpee.1068499141038" type="tpee.ParameterReference" typeId="tpee.1068581242874" id="3873386204295367235">
<link role="variableDeclaration" roleId="tpee.1068581517664" targetNodeId="6599163591527295189" resolveInfo="referenceNode" />
</node>
<node role="actualArgument" roleId="tpee.1068499141038" type="tpee.ParameterReference" typeId="tpee.1068581242874" id="3873386204295367236">
<link role="variableDeclaration" roleId="tpee.1068581517664" targetNodeId="6599163591527295191" resolveInfo="referenceRole" />
</node>
<node role="actualArgument" roleId="tpee.1068499141038" type="tpee.IntegerConstant" typeId="tpee.1068580320020" id="3873386204295367237">
<property name="value" nameId="tpee.1068580320021" value="0" />
</node>
</node>
<node role="operation" roleId="tpee.1197027833540" type="tpee.InstanceMethodCallOperation" typeId="tpee.1202948039474" id="3873386204295367262">
<link role="baseMethodDeclaration" roleId="tpee.1068499141037" targetNodeId="ymbg.~ReferenceDescriptor%dgetScope()%cjetbrains%dmps%dscope%dScope" resolveInfo="getScope" />
Expand Down
76 changes: 14 additions & 62 deletions ...odelRuntime/source_gen.caches/jetbrains/mps/lang/smodel/generator/smodelAdapter/generated
View file
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<dependencies version="2" modelHash="-319jc8q45z56oct52gdjn46xkxokoip">
<dependencies version="2" modelHash="-cevgdd8jf3ckx8hlybprvkmtap8hx10">
<dep model="f:java_stub#6354ebe7-c22a-4a0f-ac54-50b52ab9b065#java.io(JDK/java.io@java_stub)" />
<dep model="f:java_stub#6354ebe7-c22a-4a0f-ac54-50b52ab9b065#java.lang(JDK/java.lang@java_stub)" />
<dep model="f:java_stub#6354ebe7-c22a-4a0f-ac54-50b52ab9b065#java.util(JDK/java.util@java_stub)" />
<dep model="f:java_stub#6ed54515-acc8-4d1e-a16c-9fd6cfe951ea#jetbrains.mps.findUsages(MPS.Core/jetbrains.mps.findUsages@java_stub)" />
<dep model="f:java_stub#6ed54515-acc8-4d1e-a16c-9fd6cfe951ea#jetbrains.mps.lang.smodel.generator.smodelAdapter(MPS.Core/jetbrains.mps.lang.smodel.generator.smodelAdapter@java_stub)" />
<dep model="f:java_stub#6ed54515-acc8-4d1e-a16c-9fd6cfe951ea#jetbrains.mps.progress(MPS.Core/jetbrains.mps.progress@java_stub)" />
<dep model="f:java_stub#6ed54515-acc8-4d1e-a16c-9fd6cfe951ea#jetbrains.mps.project(MPS.Core/jetbrains.mps.project@java_stub)" />
<dep model="f:java_stub#6ed54515-acc8-4d1e-a16c-9fd6cfe951ea#jetbrains.mps.project.structure.modules(MPS.Core/jetbrains.mps.project.structure.modules@java_stub)" />
Expand Down Expand Up @@ -36,18 +37,10 @@
<dep model="r:00000000-0000-4000-0000-011c8959033a(jetbrains.mps.baseLanguage.closures.generator.baseLanguage.template.main@generator)" />
<dep model="r:b4d7d620-6723-4aa2-856b-118497e84e9e(jetbrains.mps.baseLanguage.generator.java.strings@generator)" />
</common>
<source id="1101499704720825413" name="SEnumOperations" hash="-bw92783b5hzi8i94jh0r0bmsvm2xkf7" dependsOnNodes="true">
<dep root="6599163591527171838" />
<dep root="6599163591527270715" />
<dep root="6599163591527270726" />
<dep root="6599163591527280390" />
<dep root="6599163591527282020" />
<dep root="6599163591527282285" />
<dep root="6599163591527286349" />
<dep root="6599163591527286941" />
<dep root="6599163591527298519" />
<source id="1101499704720825413" name="SEnumOperations" hash="-bw92783b5hzi8i94jh0r0bmsvm2xkf7">
<dep model="f:java_stub#6354ebe7-c22a-4a0f-ac54-50b52ab9b065#java.lang(JDK/java.lang@java_stub)" />
<dep model="f:java_stub#6354ebe7-c22a-4a0f-ac54-50b52ab9b065#java.util(JDK/java.util@java_stub)" />
<dep model="f:java_stub#6ed54515-acc8-4d1e-a16c-9fd6cfe951ea#jetbrains.mps.lang.smodel.generator.smodelAdapter(MPS.Core/jetbrains.mps.lang.smodel.generator.smodelAdapter@java_stub)" />
<dep model="f:java_stub#6ed54515-acc8-4d1e-a16c-9fd6cfe951ea#jetbrains.mps.smodel(MPS.Core/jetbrains.mps.smodel@java_stub)" />
<dep model="f:java_stub#6ed54515-acc8-4d1e-a16c-9fd6cfe951ea#jetbrains.mps.smodel.behaviour(MPS.Core/jetbrains.mps.smodel.behaviour@java_stub)" />
<dep model="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
Expand Down Expand Up @@ -107,18 +100,10 @@
<dep model="r:fc76aa36-3cff-41c7-b94b-eee0e8341932(jetbrains.mps.internal.collections.runtime)" />
<file name="SConceptOperations.java" />
</source>
<source id="6599163591527280390" name="SModelOperations" hash="-ch4hx3mrijfuytjhcylbt4962nocks0" dependsOnNodes="true">
<dep root="1101499704720825413" />
<dep root="6599163591527171838" />
<dep root="6599163591527270715" />
<dep root="6599163591527270726" />
<dep root="6599163591527282020" />
<dep root="6599163591527282285" />
<dep root="6599163591527286349" />
<dep root="6599163591527286941" />
<dep root="6599163591527298519" />
<source id="6599163591527280390" name="SModelOperations" hash="-ch4hx3mrijfuytjhcylbt4962nocks0">
<dep model="f:java_stub#6354ebe7-c22a-4a0f-ac54-50b52ab9b065#java.lang(JDK/java.lang@java_stub)" />
<dep model="f:java_stub#6354ebe7-c22a-4a0f-ac54-50b52ab9b065#java.util(JDK/java.util@java_stub)" />
<dep model="f:java_stub#6ed54515-acc8-4d1e-a16c-9fd6cfe951ea#jetbrains.mps.lang.smodel.generator.smodelAdapter(MPS.Core/jetbrains.mps.lang.smodel.generator.smodelAdapter@java_stub)" />
<dep model="f:java_stub#6ed54515-acc8-4d1e-a16c-9fd6cfe951ea#jetbrains.mps.project(MPS.Core/jetbrains.mps.project@java_stub)" />
<dep model="f:java_stub#6ed54515-acc8-4d1e-a16c-9fd6cfe951ea#jetbrains.mps.project.structure.modules(MPS.Core/jetbrains.mps.project.structure.modules@java_stub)" />
<dep model="f:java_stub#6ed54515-acc8-4d1e-a16c-9fd6cfe951ea#jetbrains.mps.smodel(MPS.Core/jetbrains.mps.smodel@java_stub)" />
Expand All @@ -139,17 +124,9 @@
<dep model="r:fc76aa36-3cff-41c7-b94b-eee0e8341932(jetbrains.mps.internal.collections.runtime)" />
<file name="SModelOperations.java" />
</source>
<source id="6599163591527282020" name="SConceptPropertyOperations" hash="-esm0qg41qkfrmu8guv4qj23wsthf1t1" dependsOnNodes="true">
<dep root="1101499704720825413" />
<dep root="6599163591527171838" />
<dep root="6599163591527270715" />
<dep root="6599163591527270726" />
<dep root="6599163591527280390" />
<dep root="6599163591527282285" />
<dep root="6599163591527286349" />
<dep root="6599163591527286941" />
<dep root="6599163591527298519" />
<source id="6599163591527282020" name="SConceptPropertyOperations" hash="-esm0qg41qkfrmu8guv4qj23wsthf1t1">
<dep model="f:java_stub#6354ebe7-c22a-4a0f-ac54-50b52ab9b065#java.lang(JDK/java.lang@java_stub)" />
<dep model="f:java_stub#6ed54515-acc8-4d1e-a16c-9fd6cfe951ea#jetbrains.mps.lang.smodel.generator.smodelAdapter(MPS.Core/jetbrains.mps.lang.smodel.generator.smodelAdapter@java_stub)" />
<dep model="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
<dep model="r:00000000-0000-4000-0000-011c89590292(jetbrains.mps.lang.structure.structure)" />
<dep model="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
Expand Down Expand Up @@ -193,18 +170,10 @@
<dep model="r:f04c1476-2f91-4f59-be13-c8e009abebee(jetbrains.mps.baseLanguageInternal.generator.template.main@generator)" />
<file name="SLinkOperations.java" />
</source>
<source id="6599163591527286941" name="SNodeOperations" hash="4d71lgrfn59r3xuwijvmrhq9i7d8tgk" dependsOnNodes="true">
<dep root="1101499704720825413" />
<dep root="6599163591527171838" />
<dep root="6599163591527270715" />
<dep root="6599163591527270726" />
<dep root="6599163591527280390" />
<dep root="6599163591527282020" />
<dep root="6599163591527282285" />
<dep root="6599163591527286349" />
<dep root="6599163591527298519" />
<source id="6599163591527286941" name="SNodeOperations" hash="-1kez28o2d5zoairvbz1f0q995y11kcw">
<dep model="f:java_stub#6354ebe7-c22a-4a0f-ac54-50b52ab9b065#java.lang(JDK/java.lang@java_stub)" />
<dep model="f:java_stub#6354ebe7-c22a-4a0f-ac54-50b52ab9b065#java.util(JDK/java.util@java_stub)" />
<dep model="f:java_stub#6ed54515-acc8-4d1e-a16c-9fd6cfe951ea#jetbrains.mps.lang.smodel.generator.smodelAdapter(MPS.Core/jetbrains.mps.lang.smodel.generator.smodelAdapter@java_stub)" />
<dep model="f:java_stub#6ed54515-acc8-4d1e-a16c-9fd6cfe951ea#jetbrains.mps.smodel(MPS.Core/jetbrains.mps.smodel@java_stub)" />
<dep model="f:java_stub#6ed54515-acc8-4d1e-a16c-9fd6cfe951ea#jetbrains.mps.util(MPS.Core/jetbrains.mps.util@java_stub)" />
<dep model="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
Expand Down Expand Up @@ -235,21 +204,13 @@
<dep model="r:f04c1476-2f91-4f59-be13-c8e009abebee(jetbrains.mps.baseLanguageInternal.generator.template.main@generator)" />
<file name="SPropertyOperations.java" />
</source>
<source id="6407023681582958584" name="AttributeOperations" hash="e2eyj4nbm2whpkgkhosfgja5fbdjea7" dependsOnNodes="true">
<dep root="1101499704720825413" />
<source id="6407023681582958584" name="AttributeOperations" hash="e2eyj4nbm2whpkgkhosfgja5fbdjea7">
<dep root="6407023681583030432" />
<dep root="6599163591527171838" />
<dep root="6599163591527270715" />
<dep root="6599163591527270726" />
<dep root="6599163591527280390" />
<dep root="6599163591527282020" />
<dep root="6599163591527282285" />
<dep root="6599163591527286349" />
<dep root="6599163591527286941" />
<dep root="6599163591527298519" />
<dep model="f:java_stub#6354ebe7-c22a-4a0f-ac54-50b52ab9b065#java.io(JDK/java.io@java_stub)" />
<dep model="f:java_stub#6354ebe7-c22a-4a0f-ac54-50b52ab9b065#java.lang(JDK/java.lang@java_stub)" />
<dep model="f:java_stub#6354ebe7-c22a-4a0f-ac54-50b52ab9b065#java.util(JDK/java.util@java_stub)" />
<dep model="f:java_stub#6ed54515-acc8-4d1e-a16c-9fd6cfe951ea#jetbrains.mps.lang.smodel.generator.smodelAdapter(MPS.Core/jetbrains.mps.lang.smodel.generator.smodelAdapter@java_stub)" />
<dep model="f:java_stub#6ed54515-acc8-4d1e-a16c-9fd6cfe951ea#jetbrains.mps.smodel(MPS.Core/jetbrains.mps.smodel@java_stub)" />
<dep model="f:java_stub#6ed54515-acc8-4d1e-a16c-9fd6cfe951ea#jetbrains.mps.smodel.search(MPS.Core/jetbrains.mps.smodel.search@java_stub)" />
<dep model="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
Expand All @@ -272,18 +233,9 @@
<dep model="r:fc76aa36-3cff-41c7-b94b-eee0e8341932(jetbrains.mps.internal.collections.runtime)" />
<file name="AttributeOperations.java" />
</source>
<source id="6407023681583030432" name="IAttributeDescriptor" hash="avsr80h04e1ny1wsalaei2iupuuu3fz" dependsOnNodes="true">
<dep root="1101499704720825413" />
<dep root="6599163591527171838" />
<dep root="6599163591527270715" />
<dep root="6599163591527270726" />
<dep root="6599163591527280390" />
<dep root="6599163591527282020" />
<dep root="6599163591527282285" />
<dep root="6599163591527286349" />
<dep root="6599163591527286941" />
<dep root="6599163591527298519" />
<source id="6407023681583030432" name="IAttributeDescriptor" hash="avsr80h04e1ny1wsalaei2iupuuu3fz">
<dep model="f:java_stub#6354ebe7-c22a-4a0f-ac54-50b52ab9b065#java.lang(JDK/java.lang@java_stub)" />
<dep model="f:java_stub#6ed54515-acc8-4d1e-a16c-9fd6cfe951ea#jetbrains.mps.lang.smodel.generator.smodelAdapter(MPS.Core/jetbrains.mps.lang.smodel.generator.smodelAdapter@java_stub)" />
<dep model="f:java_stub#6ed54515-acc8-4d1e-a16c-9fd6cfe951ea#jetbrains.mps.smodel(MPS.Core/jetbrains.mps.smodel@java_stub)" />
<dep model="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
<dep model="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
Expand Down
2 changes: 1 addition & 1 deletion ...Runtime/source_gen/jetbrains/mps/lang/smodel/generator/smodelAdapter/SNodeOperations.java
View file
Expand Up @@ -616,7 +616,7 @@ public static ISearchScope getReferentSearchScope(SNode referenceNode, String re
if (referenceNode == null) {
return null;
}
Scope scope = ModelConstraints.getReferenceDescriptor(referenceNode, referenceRole, 0).getScope();
Scope scope = ModelConstraints.getReferenceDescriptor(referenceNode, referenceRole).getScope();
if (scope instanceof ErrorScope) {
return null;
}
Expand Down
4 changes: 2 additions & 2 deletions ...nel/smodelRuntime/source_gen/jetbrains/mps/lang/smodel/generator/smodelAdapter/trace.info
View file
Expand Up @@ -1924,7 +1924,7 @@
<nodeInfo nodeId="4945759633780426958" fileName="SNodeOperations.java" startLine="603" startPosition="49" endLine="604" endPosition="49" conceptFqName="jetbrains.mps.baseLanguage.structure.ReturnStatement" />
<nodeInfo nodeId="6599163591527295179" fileName="SNodeOperations.java" startLine="607" startPosition="63" endLine="608" endPosition="56" conceptFqName="jetbrains.mps.baseLanguage.structure.ReturnStatement" />
<nodeInfo nodeId="6599163591527295201" fileName="SNodeOperations.java" startLine="616" startPosition="32" endLine="617" endPosition="18" conceptFqName="jetbrains.mps.baseLanguage.structure.ReturnStatement" />
<nodeInfo nodeId="4329964266803731002" fileName="SNodeOperations.java" startLine="618" startPosition="5" endLine="619" endPosition="102" conceptFqName="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" />
<nodeInfo nodeId="4329964266803731002" fileName="SNodeOperations.java" startLine="618" startPosition="5" endLine="619" endPosition="99" conceptFqName="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" />
<nodeInfo nodeId="4329964266803731341" fileName="SNodeOperations.java" startLine="620" startPosition="38" endLine="621" endPosition="18" conceptFqName="jetbrains.mps.baseLanguage.structure.ReturnStatement" />
<nodeInfo nodeId="4329964266803751934" fileName="SNodeOperations.java" startLine="623" startPosition="48" endLine="624" endPosition="61" conceptFqName="jetbrains.mps.baseLanguage.structure.ReturnStatement" />
<nodeInfo nodeId="6599163591527295247" fileName="SNodeOperations.java" startLine="625" startPosition="5" endLine="626" endPosition="35" conceptFqName="jetbrains.mps.baseLanguage.structure.ReturnStatement" />
Expand Down Expand Up @@ -2032,7 +2032,7 @@
<nodeInfo nodeId="6599163591527295076" fileName="SNodeOperations.java" startLine="578" startPosition="78" endLine="581" endPosition="5" conceptFqName="jetbrains.mps.baseLanguage.structure.IfStatement" />
<nodeInfo nodeId="6599163591527295113" fileName="SNodeOperations.java" startLine="592" startPosition="50" endLine="595" endPosition="5" conceptFqName="jetbrains.mps.baseLanguage.structure.IfStatement" />
<nodeInfo nodeId="6599163591527295196" fileName="SNodeOperations.java" startLine="615" startPosition="123" endLine="618" endPosition="5" conceptFqName="jetbrains.mps.baseLanguage.structure.IfStatement" />
<nodeInfo nodeId="4329964266803731332" fileName="SNodeOperations.java" startLine="619" startPosition="102" endLine="622" endPosition="5" conceptFqName="jetbrains.mps.baseLanguage.structure.IfStatement" />
<nodeInfo nodeId="4329964266803731332" fileName="SNodeOperations.java" startLine="619" startPosition="99" endLine="622" endPosition="5" conceptFqName="jetbrains.mps.baseLanguage.structure.IfStatement" />
<nodeInfo nodeId="4329964266803731345" fileName="SNodeOperations.java" startLine="622" startPosition="5" endLine="625" endPosition="5" conceptFqName="jetbrains.mps.baseLanguage.structure.IfStatement" />
<nodeInfo nodeId="6599163591527295257" fileName="SNodeOperations.java" startLine="629" startPosition="55" endLine="632" endPosition="5" conceptFqName="jetbrains.mps.baseLanguage.structure.IfStatement" />
<nodeInfo nodeId="6599163591527295319" fileName="SNodeOperations.java" startLine="646" startPosition="53" endLine="649" endPosition="5" conceptFqName="jetbrains.mps.baseLanguage.structure.IfStatement" />
Expand Down
14 changes: 7 additions & 7 deletions core/kernel/source/jetbrains/mps/smodel/constraints/ModelConstraintsManager.java
View file
Expand Up @@ -49,30 +49,30 @@ public static boolean canBeAncestor(SNode node, @Nullable SNode childNode, SNode
}

public static boolean canBeAncestor(SNode node, SNode childConcept, IOperationContext context) {
return ModelConstraints.canBeAncestor(node, childConcept);
return ModelConstraints.canBeAncestor(node, null, childConcept, null);
}

public static boolean canBeParent(SNode parentNode, SNode childConcept, SNode link, IOperationContext context) {
return ModelConstraints.canBeParent(parentNode, childConcept, link);
return ModelConstraints.canBeParent(parentNode, childConcept, link, null, null);
}

public static boolean canBeParent(jetbrains.mps.smodel.runtime.ConstraintsDescriptor descriptor, SNode parentNode, SNode childConcept, SNode link, IOperationContext context, @Nullable SNode childNode, @Nullable jetbrains.mps.smodel.runtime.CheckingNodeContext checkingNodeContext) {
return ModelConstraints.canBeParent(descriptor, parentNode, childConcept, link, childNode, checkingNodeContext);
return ModelConstraints.canBeParent(parentNode, childConcept, link, childNode, checkingNodeContext);
}

public static boolean canBeChild(String fqName, IOperationContext context, SNode parentNode, SNode link) {
return ModelConstraints.canBeChild(fqName, parentNode, link);
return ModelConstraints.canBeChild(fqName, parentNode, link, null, null);
}

public static boolean canBeChild(jetbrains.mps.smodel.runtime.ConstraintsDescriptor descriptor, String fqName, IOperationContext context, SNode parentNode, SNode link, @Nullable SNode childNode, @Nullable jetbrains.mps.smodel.runtime.CheckingNodeContext checkingNodeContext) {
return ModelConstraints.canBeChild(descriptor, fqName, parentNode, link, childNode,checkingNodeContext);
return ModelConstraints.canBeChild(fqName, parentNode, link, childNode,checkingNodeContext);
}

public static boolean canBeRoot(IOperationContext context, String conceptFqName, SModel model) {
return ModelConstraints.canBeRoot(conceptFqName, model);
return ModelConstraints.canBeRoot(conceptFqName, model, null);
}

public static boolean canBeRoot(jetbrains.mps.smodel.runtime.ConstraintsDescriptor descriptor, IOperationContext context, String conceptFqName, SModel model, @Nullable jetbrains.mps.smodel.runtime.CheckingNodeContext checkingNodeContext) {
return ModelConstraints.canBeRoot(descriptor, conceptFqName, model, checkingNodeContext);
return ModelConstraints.canBeRoot(conceptFqName, model, checkingNodeContext);
}
}

0 comments on commit 237a9b7

Please sign in to comment.