From 303225cb85ceb9f9d74fcd90b6f415084b3bdb8c Mon Sep 17 00:00:00 2001 From: munja Date: Sun, 6 Feb 2022 19:57:52 +0100 Subject: [PATCH] fix: updating mm_x macros following fix to mf_verifymacvars --- all.sas | 29 +++++++++++++++++++++-------- meta/mm_createapplication.sas | 5 ++++- meta/mm_createdocument.sas | 5 ++++- meta/mm_createlibrary.sas | 12 +++++++----- meta/mm_createstp.sas | 7 ++++++- 5 files changed, 42 insertions(+), 16 deletions(-) diff --git a/all.sas b/all.sas index 580cdeb..d56d0e9 100644 --- a/all.sas +++ b/all.sas @@ -12615,7 +12615,10 @@ run; %&mD.put Executing &sysmacroname..sas; %&mD.put _local_; -%mf_verifymacvars(tree name) +%mp_abort(iftrue= (%mf_verifymacvars(tree name)=0) + ,mac=&sysmacroname + ,msg=%str(Empty inputs: tree name) +) /** * check tree exists @@ -12839,7 +12842,10 @@ run; %&mD.put Executing &sysmacroname..sas; %&mD.put _local_; -%mf_verifymacvars(tree name) +%mp_abort(iftrue= (%mf_verifymacvars(tree name)=0) + ,mac=&sysmacroname + ,msg=%str(Empty inputs: tree name) +) /** * check tree exists @@ -13208,12 +13214,14 @@ run; filename &frefin temp; filename &frefout temp; +%mp_abort(iftrue= ( + &engine=BASE & %mf_verifymacvars(libname libref engine servercontext tree)=0 + ) + ,mac=&sysmacroname + ,msg=%str(Empty inputs: libname libref engine servercontext tree) +) + %if &engine=BASE %then %do; - - %mf_verifymacvars(libname libref engine servercontext tree) - - - /** * Check that the ServerContext exists */ @@ -13504,7 +13512,12 @@ filename &frefout temp; %&mD.put Executing mm_CreateSTP.sas; %&mD.put _local_; -%mf_verifymacvars(stpname filename directory tree) +%mp_abort( + iftrue=(%mf_verifymacvars(stpname filename directory tree)=0) + ,mac=&sysmacroname + ,msg=%str(Empty inputs: stpname filename directory tree) +) + %mp_dropmembers(%scan(&outds,2,.)) /** diff --git a/meta/mm_createapplication.sas b/meta/mm_createapplication.sas index 21423a1..90d1ea4 100644 --- a/meta/mm_createapplication.sas +++ b/meta/mm_createapplication.sas @@ -59,7 +59,10 @@ %&mD.put Executing &sysmacroname..sas; %&mD.put _local_; -%mf_verifymacvars(tree name) +%mp_abort(iftrue= (%mf_verifymacvars(tree name)=0) + ,mac=&sysmacroname + ,msg=%str(Empty inputs: tree name) +) /** * check tree exists diff --git a/meta/mm_createdocument.sas b/meta/mm_createdocument.sas index 3eee0e3..7afd567 100644 --- a/meta/mm_createdocument.sas +++ b/meta/mm_createdocument.sas @@ -47,7 +47,10 @@ %&mD.put Executing &sysmacroname..sas; %&mD.put _local_; -%mf_verifymacvars(tree name) +%mp_abort(iftrue= (%mf_verifymacvars(tree name)=0) + ,mac=&sysmacroname + ,msg=%str(Empty inputs: tree name) +) /** * check tree exists diff --git a/meta/mm_createlibrary.sas b/meta/mm_createlibrary.sas index 5eee354..267027f 100644 --- a/meta/mm_createlibrary.sas +++ b/meta/mm_createlibrary.sas @@ -133,12 +133,14 @@ run; filename &frefin temp; filename &frefout temp; +%mp_abort(iftrue= ( + &engine=BASE & %mf_verifymacvars(libname libref engine servercontext tree)=0 + ) + ,mac=&sysmacroname + ,msg=%str(Empty inputs: libname libref engine servercontext tree) +) + %if &engine=BASE %then %do; - - %mf_verifymacvars(libname libref engine servercontext tree) - - - /** * Check that the ServerContext exists */ diff --git a/meta/mm_createstp.sas b/meta/mm_createstp.sas index e4f5196..5294254 100755 --- a/meta/mm_createstp.sas +++ b/meta/mm_createstp.sas @@ -108,7 +108,12 @@ %&mD.put Executing mm_CreateSTP.sas; %&mD.put _local_; -%mf_verifymacvars(stpname filename directory tree) +%mp_abort( + iftrue=(%mf_verifymacvars(stpname filename directory tree)=0) + ,mac=&sysmacroname + ,msg=%str(Empty inputs: stpname filename directory tree) +) + %mp_dropmembers(%scan(&outds,2,.)) /**