feat(): added options spec to constraints/meta

Author: bvdmitri

src/backends/reactivemp.jl

@@ -341,8 +341,29 @@ end
 
 ## Factorisations constraints specification language
 
-function write_constraints_specification(::ReactiveMPBackend, factorisation, marginalsform, messagesform) 
-    return :(ReactiveMP.ConstraintsSpecification($factorisation, $marginalsform, $messagesform))
+function write_constraints_specification(::ReactiveMPBackend, factorisation, marginalsform, messagesform, options) 
+    return :(ReactiveMP.ConstraintsSpecification($factorisation, $marginalsform, $messagesform, $options))
+end
+
+function write_constraints_specification_options(::ReactiveMPBackend, options)
+    @capture(options, [ entries__ ]) || error("Invalid constraints specification options syntax. Should be `@constraints [ option1 = value1, ... ] ...`, but `$(options)` found.")
+    
+    is_warn_option_present = false
+
+    warn_option = :(true)
+
+    foreach(entries) do option 
+        if @capture(option, warn = value_)
+            !is_warn_option_present || error("`warn` option $(option) for constraints specification has been redefined.")
+            is_warn_option_present = true
+            @assert value isa Bool "`warn` option for constraints specification expects true/false value"
+            warn_option = value
+        else
+            error("Unknown option '$option' for constraints specification.")
+        end
+    end
+
+    return :(ReactiveMP.ConstraintsSpecificationOptions($warn_option))
 end
 
 function write_factorisation_constraint(::ReactiveMPBackend, names, entries) 
@@ -387,8 +408,29 @@ end
 
 ## Meta specification language
 
-function write_meta_specification(::ReactiveMPBackend, entries) 
-    return :(ReactiveMP.MetaSpecification($entries))
+function write_meta_specification(::ReactiveMPBackend, entries, options) 
+    return :(ReactiveMP.MetaSpecification($entries, $options))
+end
+
+function write_meta_specification_options(::ReactiveMPBackend, options)
+    @capture(options, [ entries__ ]) || error("Invalid meta specification options syntax. Should be `@meta [ option1 = value1, ... ] ...`, but `$(options)` found.")
+    
+    is_warn_option_present = false
+
+    warn_option = :(true)
+
+    foreach(entries) do option 
+        if @capture(option, warn = value_)
+            !is_warn_option_present || error("`warn` option $(option) for meta specification has been redefined.")
+            is_warn_option_present = true
+            @assert value isa Bool "`warn` option for meta specification expects true/false value"
+            warn_option = value
+        else
+            error("Unknown option '$option' for meta specification.")
+        end
+    end
+
+    return :(ReactiveMP.MetaSpecificationOptions($warn_option))
 end
 
 function write_meta_specification_entry(::ReactiveMPBackend, F, N, meta) 

src/constraints.jl

@@ -1,10 +1,15 @@
 export @constraints
 
 """
-    write_constraints_specification(backend, factorisation, marginalsform, messagesform) 
+    write_constraints_specification(backend, factorisation, marginalsform, messagesform, options) 
 """
 function write_constraints_specification end
 
+"""
+    write_constraints_specification_options(backend, options)
+"""
+function write_constraints_specification_options end
+
 """
     write_factorisation_constraint(backend, names, entries)
 """
@@ -56,7 +61,12 @@ function write_form_constraint_specification_entry end
 function write_form_constraint_specification end
 
 macro constraints(constraints_specification)
-    return generate_constraints_expression(__get_current_backend(), constraints_specification)
+    # Empty options is :([])
+    return generate_constraints_expression(__get_current_backend(), :([]), constraints_specification)
+end
+
+macro constraints(constraints_options, constraints_specification)
+    return generate_constraints_expression(__get_current_backend(), constraints_options, constraints_specification)
 end
 
 ## Factorisation constraints
@@ -125,19 +135,20 @@ end
 
 ##
 
-function generate_constraints_expression(backend, constraints_specification)
+function generate_constraints_expression(backend, constraints_options, constraints_specification)
 
     if isblock(constraints_specification)
         generatedfname = gensym(:constraints)
         generatedfbody = :(function $(generatedfname)() $constraints_specification end)
-        return :($(generate_constraints_expression(backend, generatedfbody))())
+        return :($(generate_constraints_expression(backend, constraints_options, generatedfbody))())
     end
 
     @capture(constraints_specification, (function cs_name_(cs_args__; cs_kwargs__) cs_body_ end) | (function cs_name_(cs_args__) cs_body_ end)) || 
         error("Constraints specification language requires full function definition")
 
-    cs_args   = cs_args === nothing ? [] : cs_args
-    cs_kwargs = cs_kwargs === nothing ? [] : cs_kwargs
+    cs_args    = cs_args === nothing ? [] : cs_args
+    cs_kwargs  = cs_kwargs === nothing ? [] : cs_kwargs
+    cs_options = write_constraints_specification_options(backend, constraints_options)
 
     lhs_dict = Dict{UInt, FactorisationConstraintLHSInfo}()
 
@@ -308,7 +319,13 @@ function generate_constraints_expression(backend, constraints_specification)
         return expression
     end
 
-    return_specification = write_constraints_specification(backend, factorisation_constraints_symbol, marginals_form_constraints_symbol, messages_form_constraints_symbol)
+    return_specification = write_constraints_specification(
+        backend, 
+        factorisation_constraints_symbol, 
+        marginals_form_constraints_symbol, 
+        messages_form_constraints_symbol,
+        cs_options
+    )
 
     res = quote
          function $cs_name($(cs_args...); $(cs_kwargs...))

src/meta.jl

@@ -1,37 +1,49 @@
 export @meta
 
 """
-    write_meta_specification(backend, entries)
+    write_meta_specification(backend, entries, options)
 """
 function write_meta_specification end
 
+"""
+    write_meta_specification_options(backend, options)
+"""
+function write_meta_specification_options end
+
 """
     write_meta_specification_entry(backend, F, N, meta)
 """
 function write_meta_specification_entry end
 
+
 macro meta(meta_specification)
-    return generate_meta_expression(__get_current_backend(), meta_specification)
+    # Empty options `:([])`
+    return generate_meta_expression(__get_current_backend(), :([]), meta_specification)
+end
+
+macro meta(meta_options, meta_specification)
+    return generate_meta_expression(__get_current_backend(), meta_options, meta_specification)
 end
 
 struct MetaSpecificationLHSInfo
     hash      :: UInt
     checkname :: Symbol
 end
 
-function generate_meta_expression(backend, meta_specification)
+function generate_meta_expression(backend, meta_options, meta_specification)
 
     if isblock(meta_specification)
         generatedfname = gensym(:constraints)
         generatedfbody = :(function $(generatedfname)() $meta_specification end)
-        return :($(generate_meta_expression(backend, generatedfbody))())
+        return :($(generate_meta_expression(backend, meta_options, generatedfbody))())
     end
 
     @capture(meta_specification, (function cs_name_(cs_args__; cs_kwargs__) cs_body_ end) | (function cs_name_(cs_args__) cs_body_ end)) || 
         error("Meta specification language requires full function definition")
 
-    cs_args   = cs_args === nothing ? [] : cs_args
-    cs_kwargs = cs_kwargs === nothing ? [] : cs_kwargs
+    cs_args    = cs_args === nothing ? [] : cs_args
+    cs_kwargs  = cs_kwargs === nothing ? [] : cs_kwargs
+    cs_options = write_meta_specification_options(backend, meta_options)
 
     lhs_dict = Dict{UInt, MetaSpecificationLHSInfo}()
 
@@ -76,7 +88,7 @@ function generate_meta_expression(backend, meta_specification)
         end
     end
 
-    ret_meta_specification = write_meta_specification(backend, meta_spec_symbol)
+    ret_meta_specification = write_meta_specification(backend, meta_spec_symbol, cs_options)
 
     res = quote
         function $cs_name($(cs_args...); $(cs_kwargs...))