Skip to content
Snippets Groups Projects
Commit af6ee382 authored by Derval Guillaume's avatar Derval Guillaume
Browse files

EqLoop -> LikeLoop

parent 8c495ccf
No related branches found
No related tags found
No related merge requests found
__all__ = [
"Meta", "GBOMLObject", "VarScope", "VarType", "SOSType", "ObjType",
"Operator", "ExpressionObj", "Expression", "BoolExpression", "VarOrParamLeaf",
"VarOrParam", "Array", "Loop", "BaseLoop", "EqLoop", "Function", "BoolExpressionOp",
"VarOrParam", "Array", "Loop", "BaseLoop", "LikeLoop", "Function", "BoolExpressionOp",
"BoolExpressionComparison", "ScopeChange", "ImportFile", "Definition", "Constraint",
"StdConstraint", "SOSConstraint", "Objective", "VariableDefinition", "Node",
"HyperEdge", "NodeDefinition", "HyperEdgeDefinition",
......
......@@ -22,7 +22,7 @@ class BaseLoop(Loop):
@dataclass
class EqLoop(Loop):
class LikeLoop(Loop):
varid: str
on: VarOrParam
condition: Optional[BoolExpression]
......
......@@ -83,9 +83,9 @@ OBJ_TYPE: "min" | "max"
// LOOPS
?loop: multi_loop | implicit_loop
?multi_loop: (base_loop | eq_loop)+
?multi_loop: (base_loop | like_loop)+
base_loop: "for" ID "in" iterable ["where" bool_expression]
eq_loop: "for" ID "=" var_or_param ["where" bool_expression]
like_loop: "for" ID "like" var_or_param ["where" bool_expression] //var_or_param must point to an indexing param
implicit_loop: "where" bool_expression
// BOOLEAN EXPRESSIONS
......
......@@ -92,7 +92,7 @@ class GBOMLParser:
"constraint_sos": SOSConstraint,
"objective": Objective,
"base_loop": BaseLoop,
"eq_loop": EqLoop,
"like_loop": LikeLoop,
"implicit_loop": ImplicitLoop,
"subtraction": _op_transform(Operator.minus),
"sum": _op_transform(Operator.plus),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment