Skip to content

Commit

Permalink
Fixes a bug in the computation of lazy arguments
Browse files Browse the repository at this point in the history
  • Loading branch information
@AlexisDrogoul
AlexisDrogoul committed Aug 3, 2021
1 parent 1737aa2 commit c7cc59f
Showing 1 changed file with 30 additions and 49 deletions.
79 changes: 30 additions & 49 deletions msi.gama.core/src/msi/gaml/descriptions/OperatorProto.java
View file
Expand Up @@ -80,16 +80,15 @@ public IExpression create(final IDescription context, final EObject currentEObje
try {
if (semanticValidator != null) {
final boolean semantic = semanticValidator.validate(context, currentEObject, exprs);
if (!semantic) { return null; }
if (!semantic) return null;
}
switch (signature.size()) {
case 1:
if (isVarOrField) { return new TypeFieldExpression(this, context, exprs[0]); }
if (isVarOrField) return new TypeFieldExpression(this, context, exprs[0]);
return UnaryOperator.create(this, context, exprs[0]);
case 2:
if (isVarOrField) {
if (isVarOrField)
return new BinaryOperator.BinaryVarOperator(this, context, exprs[0], (IVarExpression) exprs[1]);
}
return BinaryOperator.create(this, context, exprs);
default:
return NAryOperator.create(this, exprs);
Expand Down Expand Up @@ -121,9 +120,7 @@ public OperatorProto(final String name, final AnnotatedElement method, final Gam
super(name, method, plugin);
iterator = IExpressionCompiler.ITERATORS.contains(name);

if (name.equals(IKeyword.AS)) {
AS = this;
}
if (IKeyword.AS.equals(name)) { AS = this; }
IValidator tempValidator = null;
String[] dependencies = null;
if (method != null) {
Expand Down Expand Up @@ -153,18 +150,15 @@ public OperatorProto(final String name, final AnnotatedElement method, final Gam

private boolean[] computeLazyness(final AnnotatedElement method) {
final boolean[] result = new boolean[signature.size()];
if (result.length == 0) { return result; }
if (result.length == 0) return result;
if (method instanceof Method) {
final Method m = (Method) method;
final Class[] classes = m.getParameterTypes();
if (classes.length == 0) return result;
int begin = 0;
if (classes[0] == IScope.class) {
begin = 1;
}
if (classes[0] == IScope.class) { begin = 1; }
for (int i = begin; i < classes.length; i++) {
if (IExpression.class.isAssignableFrom(classes[i])) {
result[i - begin] = true;
}
if (IExpression.class.isAssignableFrom(classes[i])) { result[i - begin] = true; }
}
}
return result;
Expand All @@ -187,22 +181,20 @@ private OperatorProto(final OperatorProto op, final IType gamaType) {

@Override
public String getTitle() {
if (isVarOrField) {
return "field " + getName() + " of type " + returnType + ", for values of type "
+ signature.asPattern(false);
}
if (isVarOrField) return "field " + getName() + " of type " + returnType + ", for values of type "
+ signature.asPattern(false);
return "operator " + getName() + "(" + signature.asPattern(false) + "), returns " + returnType;
}

@Override
public String getDocumentation() {
if (!isVarOrField) { return super.getDocumentation(); }
if (!isVarOrField) return super.getDocumentation();
final vars annot = getSupport().getAnnotation(vars.class);
if (annot != null) {
final variable[] allVars = annot.value();
for (final variable v : allVars) {
if (v.name().equals(getName())) {
if (v.doc().length > 0) { return v.doc()[0].value(); }
if (v.doc().length > 0) return v.doc()[0].value();
break;
}
}
Expand All @@ -211,8 +203,7 @@ public String getDocumentation() {
}

public void verifyExpectedTypes(final IDescription context, final IType<?> rightType) {
if (expectedContentType == null || expectedContentType.length == 0) { return; }
if (context == null) { return; }
if (expectedContentType == null || expectedContentType.length == 0 || (context == null)) return;
if (expectedContentType.length == 1 && iterator) {
final IType<?> expected = Types.get(expectedContentType[0]);
if (!rightType.isTranslatableInto(expected)) {
Expand All @@ -221,7 +212,7 @@ public void verifyExpectedTypes(final IDescription context, final IType<?> right
}
} else if (signature.isUnary()) {
for (final int element : expectedContentType) {
if (rightType.isTranslatableInto(Types.get(element))) { return; }
if (rightType.isTranslatableInto(Types.get(element))) return;
}
context.error("Operator " + getName() + " expects arguments of type " + rightType, IGamlIssue.WRONG_TYPE);
}
Expand All @@ -233,18 +224,16 @@ public String serialize(final boolean includingBuiltIn) {
}

public String getCategory() {
if (support == null) { return "Other"; }
if (support == null) return "Other";
final operator op = support.getAnnotation(operator.class);
if (op == null) // Happens sometimes for synthetic operators
{
if (op == null)
return "Other";
} else {
else {
final String[] strings = op.category();
if (strings.length > 0) {
if (strings.length > 0)
return op.category()[0];
} else {
else
return "Other";
}
}
}

Expand All @@ -265,18 +254,14 @@ public String getPattern(final boolean withVariables) {
final int size = signature.size();
final String aName = getName();
if (size == 1 || size > 2) {
if (noMandatoryParenthesis.contains(aName)) {
if (noMandatoryParenthesis.contains(aName))
return aName + signature.asPattern(withVariables);
} else {
else
return aName + "(" + signature.asPattern(withVariables) + ")";
}
} else { // size == 2
if (binaries.contains(aName)) {
return signature.get(0).asPattern() + " " + aName + " " + signature.get(1).asPattern();
} else {
return aName + "(" + signature.asPattern(withVariables) + ")";
}
}
} else if (binaries.contains(aName))
return signature.get(0).asPattern() + " " + aName + " " + signature.get(1).asPattern();
else
return aName + "(" + signature.asPattern(withVariables) + ")";
}

// @Override
Expand All @@ -292,26 +277,22 @@ public OperatorProto copyWithSignature(final IType gamaType) {
@Override
public void collectUsedVarsOf(final SpeciesDescription species,
final ICollector<IVarDescriptionUser> alreadyProcessed, final ICollector<VariableDescription> result) {
if (alreadyProcessed.contains(this)) { return; }
if (alreadyProcessed.contains(this)) return;
alreadyProcessed.add(this);
if (depends_on == null) { return; }
if (depends_on == null) return;
for (final String s : depends_on) {
if (species.hasAttribute(s)) {
result.add(species.getAttribute(s));
}
if (species.hasAttribute(s)) { result.add(species.getAttribute(s)); }
}
}

@Override
public doc getDocAnnotation() {
doc d = super.getDocAnnotation();
if (d != null) { return d; }
if (d != null) return d;
if (support != null && support.isAnnotationPresent(operator.class)) {
final operator op = support.getAnnotation(operator.class);
final doc[] docs = op.doc();
if (docs != null && docs.length > 0) {
d = docs[0];
}
if (docs != null && docs.length > 0) { d = docs[0]; }
}
return d;
}
Expand Down

0 comments on commit c7cc59f

Please sign in to comment.