From 35d2fef5688af2b642a748d389df9cdbff78d0fb Mon Sep 17 00:00:00 2001 From: aminya Date: Tue, 3 Dec 2019 03:44:09 -0600 Subject: [PATCH] Temporary fix for check for nothing in function checking Should only add when nothing is specified --- src/AcuteML.jl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/AcuteML.jl b/src/AcuteML.jl index 1a368c0..158d838 100644 --- a/src/AcuteML.jl +++ b/src/AcuteML.jl @@ -366,7 +366,7 @@ macro aml(expr) # Function provided else amlconst[i]=quote - if ($(esc(amlFunsI)))($amlVarsI) + if !isnothing($amlVarsI) && ($(esc(amlFunsI)))($amlVarsI) addelementVect!(aml, $amlNamesI, $amlVarsI, $amlTypesI) else error("$($amlNamesI) doesn't meet criteria function") @@ -378,7 +378,7 @@ macro aml(expr) $amlVarsI = findallcontent($(esc(argTypesI)), $amlNamesI, aml, $amlTypesI) - if !(($(esc(amlFunsI)))($amlVarsI)) + if !isnothing($amlVarsI) && !(($(esc(amlFunsI)))($amlVarsI)) error("$($amlNamesI) doesn't meet criteria function") end end @@ -386,7 +386,7 @@ macro aml(expr) if mutability amlmutability[i] = quote if name == $amlSymI - if ($(esc(amlFunsI)))($(amlVarsCall[i])) + if !isnothing($(amlVarsCall[i])) && ($(esc(amlFunsI)))($(amlVarsCall[i])) updateallcontent!(value, $amlNamesI, str.aml, $amlTypesI) else error("$($amlNamesI) doesn't meet criteria function") @@ -419,7 +419,7 @@ macro aml(expr) # Function provided else amlconst[i]=quote - if ($(esc(amlFunsI)))($amlVarsI) + if !isnothing($amlVarsI) && ($(esc(amlFunsI)))($amlVarsI) addelementOne!(aml, $amlNamesI, $amlVarsI, $amlTypesI) else error("$($amlNamesI) doesn't meet criteria function") @@ -430,14 +430,14 @@ macro aml(expr) $amlVarsI = findfirstcontent($(esc(argTypesI)), $amlNamesI, aml, $amlTypesI) - if !(($(esc(amlFunsI)))($amlVarsI)) + if !isnothing($amlVarsI) && !(($(esc(amlFunsI)))($amlVarsI)) error("$($amlNamesI) doesn't meet criteria function") end end if mutability amlmutability[i] = quote if name == $amlSymI - if ($(esc(amlFunsI)))($(amlVarsCall[i])) + if !isnothing($(amlVarsCall[i])) && ($(esc(amlFunsI)))($(amlVarsCall[i])) updatefirstcontent!(value, $amlNamesI, str.aml, $amlTypesI) else error("$($amlNamesI) doesn't meet criteria function")