From af692b836113019a395ff0586a49f025f69344f1 Mon Sep 17 00:00:00 2001 From: eduardomadeira98 Date: Wed, 3 Apr 2024 01:24:46 +0100 Subject: [PATCH] () removed from decorators with no-args, closes #57 --- aeon/sugar/aeon_sugar.lark | 4 ++-- examples/PSB2/annotations/multi_objective/gcd.ae | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/aeon/sugar/aeon_sugar.lark b/aeon/sugar/aeon_sugar.lark index b30ee03e..9054da55 100644 --- a/aeon/sugar/aeon_sugar.lark +++ b/aeon/sugar/aeon_sugar.lark @@ -18,10 +18,10 @@ def : soft_constraint "def" ID ":" type "=" expression ";" -> d soft_constraint : -> empty_list | macro (macro)* -> macros -macro : "@" ID "(" macro_args ")" -> macro +macro : "@" ID macro_args -> macro macro_args : -> empty_list - | expression ("," expression)* -> macro_args + | "(" expression ("," expression)* ")" -> macro_args args : -> empty_list diff --git a/examples/PSB2/annotations/multi_objective/gcd.ae b/examples/PSB2/annotations/multi_objective/gcd.ae index d0a0661c..b3857a11 100644 --- a/examples/PSB2/annotations/multi_objective/gcd.ae +++ b/examples/PSB2/annotations/multi_objective/gcd.ae @@ -10,7 +10,7 @@ def calculate_fuel_cost_errors : (train : TrainData) -> (f:(a: Int) -> (b: Int) load_dataset, train, calculate_fuel_cost_errors) -@allow_recursion() +@allow_recursion @multi_minimize_float(calculate_fuel_cost_errors train synth) def synth (n:Int) (z:Int) : Int { (?hole: Int)