Pop_Slime/crtr
1
0
Fork 0
Code Issues 6 Pull Requests Projects 1 Releases Activity

Rename constraint types to avoid ambiguity.

Browse Source
This commit is contained in:
PopSlime
2023-07-27 22:06:15 +08:00
parent 98e35fc6f6
commit 9b091a0084
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Assets/Cryville/Crtr/Ruleset.cs
View File

@@ -146,7 +146,7 @@ namespace Cryville.Crtr {
[ElementList]
public PairList<RulesetSelectors, Constraint> Elements = new PairList<RulesetSelectors, Constraint>();
[PropertyList]
public PairList<PropertyKey, PdtExpression> Properties = new PairList<PropertyKey, PdtExpression>();
public PairList<ConstraintKey, PdtExpression> Properties = new PairList<ConstraintKey, PdtExpression>();
public void Optimize(PdtEvaluatorBase etor) {
foreach (var e in Properties) {
etor.Optimize(e.Value);
@@ -164,13 +164,13 @@ namespace Cryville.Crtr {
foreach (var prop in Properties) {
var name = prop.Key.Name;
switch (prop.Key.Type) {
case PropertyType.Property:
case ConstraintType.Property:
if (ev.PropSrcs.TryGetValue(name, out src))
etor.ContextSelfValue = src;
etor.Evaluate(ev.PropOps[name], prop.Value);
etor.ContextSelfValue = null;
break;
case PropertyType.Variable:
case ConstraintType.Variable:
_arbop.Name = name;
etor.Evaluate(_arbop, prop.Value);
break;
@@ -187,22 +187,22 @@ namespace Cryville.Crtr {
etor.ContextCascadeDiscard();
}
}
public class PropertyKey {
public PropertyType Type { get; private set; }
public class ConstraintKey {
public ConstraintType Type { get; private set; }
public int Name { get; private set; }
public PropertyKey(PropertyType type, string name) {
public ConstraintKey(ConstraintType type, string name) {
Type = type;
Name = IdentifierManager.Shared.Request(name);
}
public override string ToString() {
switch (Type) {
case PropertyType.Property: return (string)IdentifierManager.Shared.Retrieve(Name);
case PropertyType.Variable: return string.Format("@var {0}", IdentifierManager.Shared.Retrieve(Name));
case ConstraintType.Property: return (string)IdentifierManager.Shared.Retrieve(Name);
case ConstraintType.Variable: return string.Format("@var {0}", IdentifierManager.Shared.Retrieve(Name));
default: return string.Format("<{0}> {1}", Type, IdentifierManager.Shared.Retrieve(Name));
}
}
}
public enum PropertyType {
public enum ConstraintType {
Property,
Variable,
}

2
Assets/Cryville/Crtr/RulesetInterpreter.cs
View File

@@ -59,7 +59,7 @@ namespace Cryville.Crtr {
break;
case ';':
case ':':
return new PropertyKey(a.Contains("var") ? PropertyType.Variable : PropertyType.Property, key);
return new ConstraintKey(a.Contains("var") ? ConstraintType.Variable : ConstraintType.Property, key);
case '{':
return new RulesetSelectors(s);
case '}':