Skip to content

Commit 35d2fef

Browse files
committed
Temporary fix for check for nothing in function checking
Should only add when nothing is specified
1 parent c65916c commit 35d2fef

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/AcuteML.jl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ macro aml(expr)
366366
# Function provided
367367
else
368368
amlconst[i]=quote
369-
if ($(esc(amlFunsI)))($amlVarsI)
369+
if !isnothing($amlVarsI) && ($(esc(amlFunsI)))($amlVarsI)
370370
addelementVect!(aml, $amlNamesI, $amlVarsI, $amlTypesI)
371371
else
372372
error("$($amlNamesI) doesn't meet criteria function")
@@ -378,15 +378,15 @@ macro aml(expr)
378378

379379
$amlVarsI = findallcontent($(esc(argTypesI)), $amlNamesI, aml, $amlTypesI)
380380

381-
if !(($(esc(amlFunsI)))($amlVarsI))
381+
if !isnothing($amlVarsI) && !(($(esc(amlFunsI)))($amlVarsI))
382382
error("$($amlNamesI) doesn't meet criteria function")
383383
end
384384
end
385385

386386
if mutability
387387
amlmutability[i] = quote
388388
if name == $amlSymI
389-
if ($(esc(amlFunsI)))($(amlVarsCall[i]))
389+
if !isnothing($(amlVarsCall[i])) && ($(esc(amlFunsI)))($(amlVarsCall[i]))
390390
updateallcontent!(value, $amlNamesI, str.aml, $amlTypesI)
391391
else
392392
error("$($amlNamesI) doesn't meet criteria function")
@@ -419,7 +419,7 @@ macro aml(expr)
419419
# Function provided
420420
else
421421
amlconst[i]=quote
422-
if ($(esc(amlFunsI)))($amlVarsI)
422+
if !isnothing($amlVarsI) && ($(esc(amlFunsI)))($amlVarsI)
423423
addelementOne!(aml, $amlNamesI, $amlVarsI, $amlTypesI)
424424
else
425425
error("$($amlNamesI) doesn't meet criteria function")
@@ -430,14 +430,14 @@ macro aml(expr)
430430

431431
$amlVarsI = findfirstcontent($(esc(argTypesI)), $amlNamesI, aml, $amlTypesI)
432432

433-
if !(($(esc(amlFunsI)))($amlVarsI))
433+
if !isnothing($amlVarsI) && !(($(esc(amlFunsI)))($amlVarsI))
434434
error("$($amlNamesI) doesn't meet criteria function")
435435
end
436436
end
437437
if mutability
438438
amlmutability[i] = quote
439439
if name == $amlSymI
440-
if ($(esc(amlFunsI)))($(amlVarsCall[i]))
440+
if !isnothing($(amlVarsCall[i])) && ($(esc(amlFunsI)))($(amlVarsCall[i]))
441441
updatefirstcontent!(value, $amlNamesI, str.aml, $amlTypesI)
442442
else
443443
error("$($amlNamesI) doesn't meet criteria function")

0 commit comments

Comments
 (0)