common struct esc

Author: aminya

src/@aml/@aml_create.jl

@@ -98,18 +98,21 @@ function aml_create(expr::Expr, args_param, args_defaultvalue, args_type, args_v
 
         struct_definition =:($expr)
 
-        struct_xmlchecker = get_struct_xmlchecker(struct_function, args_var)
+        # args_var is used here to support all the inputs (even non-aml)
+        esc_args_var = esc.(args_var)
+
+        struct_xmlchecker = get_struct_xmlchecker(struct_function, esc_args_var)
 
         # Creator
-        struct_xmlcreator = get_struct_xmlcreator(S, amlargs_param, struct_xmlchecker, node_initializer, args_xmlcreator, args_var, custom_creator_end)
+        struct_xmlcreator = get_struct_xmlcreator(S, amlargs_param, struct_xmlchecker, node_initializer, args_xmlcreator, esc_args_var, custom_creator_end)
         # Extractor
-        struct_xmlextractor = get_struct_xmlextractor(S, args_xmlextractor, struct_xmlchecker, args_var, custom_extractor_end)
+        struct_xmlextractor = get_struct_xmlextractor(S, args_xmlextractor, struct_xmlchecker, esc_args_var, custom_extractor_end)
 
         if iscurly
             # Creator
-            struct_xmlcreator_curly = get_struct_xmlcreator(SQ, P, amlargs_param, struct_xmlchecker, node_initializer, args_xmlcreator, args_var, custom_creator_end)
+            struct_xmlcreator_curly = get_struct_xmlcreator(SQ, P, amlargs_param, struct_xmlchecker, node_initializer, args_xmlcreator, esc_args_var, custom_creator_end)
             # Extractor
-            struct_xmlextractor_curly = get_struct_xmlextractor(SQ, P, args_xmlextractor, struct_xmlchecker, args_var, custom_extractor_end)
+            struct_xmlextractor_curly = get_struct_xmlextractor(SQ, P, args_xmlextractor, struct_xmlchecker, esc_args_var, custom_extractor_end)
         else
             struct_xmlcreator_curly = nothing
             struct_xmlextractor_curly = nothing

src/@aml/@aml_create/get_struct_xml_.jl

@@ -3,12 +3,12 @@
 """
 check function for the aml struct
 """
-function get_struct_xmlchecker(struct_function, args_var)
+function get_struct_xmlchecker(struct_function, esc_args_var)
     # aml Function
     if !ismissing(struct_function[1])
         F = struct_function[1]
         struct_xmlchecker = quote
-            if !( ($(esc(F)))($(esc.(args_var)...)) )
+            if !( ($(esc(F)))($(esc_args_var...)) )
                 error("struct criteria function ($($(esc(F)))) isn't meet")
             end
         end
@@ -18,49 +18,51 @@ function get_struct_xmlchecker(struct_function, args_var)
     return struct_xmlchecker
 end
 ################################################################
-function get_struct_xmlcreator(T, args_param, struct_xmlchecker, node_initializer, args_xmlcreator, args_var, custom_creator_end)
+function get_struct_xmlcreator(T, args_param, struct_xmlchecker, node_initializer, args_xmlcreator, esc_args_var, custom_creator_end)
     struct_xmlcreator = quote
         function ($(esc(T)))(; $(esc.(args_param)...))
             $struct_xmlchecker
             $node_initializer
             $(args_xmlcreator...)
             $(esc(custom_creator_end))
-            return ($(esc(T)))($(esc.(args_var)...), aml)
+            return ($(esc(T)))($(esc_args_var...), aml)
         end
     end
     return struct_xmlcreator
 end
-function get_struct_xmlcreator(SQ, P, args_param, struct_xmlchecker, node_initializer, args_xmlcreator, args_var, custom_creator_end)
+function get_struct_xmlcreator(SQ, P, args_param, struct_xmlchecker, node_initializer, args_xmlcreator, esc_args_var, custom_creator_end)
     struct_xmlcreator_curly = quote
         function ($(esc(SQ)))(; $(esc.(args_param)...)) where {$(esc.(P)...)}
             $struct_xmlchecker
             $node_initializer
             $(args_xmlcreator...)
             $(esc(custom_creator_end))
-            return ($(esc(SQ)))($(esc.(args_var)...), aml)
+            return ($(esc(SQ)))($(esc_args_var...), aml)
         end
     end
     return struct_xmlcreator_curly
 end
 ################################################################
-function get_struct_xmlextractor(T, args_xmlextractor, struct_xmlchecker, args_var, custom_extractor_end)
+function get_struct_xmlextractor(T, args_xmlextractor, struct_xmlchecker, esc_args_var, custom_extractor_end)
+
     struct_xmlextractor = quote
         function ($(esc(T)))(aml::Union{Document, Node})
             $(args_xmlextractor...)
             $struct_xmlchecker
             $(esc(custom_extractor_end))
-            return ($(esc(T)))($(esc.(args_var)...), aml)
+            return ($(esc(T)))($(esc_args_var...), aml)
         end
     end
     return struct_xmlextractor
 end
-function get_struct_xmlextractor(SQ, P, args_xmlextractor, struct_xmlchecker, args_var, custom_extractor_end)
+function get_struct_xmlextractor(SQ, P, args_xmlextractor, struct_xmlchecker, esc_args_var, custom_extractor_end)
+
     struct_xmlextractor_curly = quote
         function ($(esc(SQ)))(aml::Union{Document, Node}) where {$(esc.(P)...)}
             $(args_xmlextractor...)
             $struct_xmlchecker
             $(esc(custom_extractor_end))
-            return ($(esc(SQ)))($(esc.(args_var)...), aml)
+            return ($(esc(SQ)))($(esc_args_var...), aml)
         end
     end
     return struct_xmlextractor_curly