Changeset: a2513c25956c for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a2513c25956c Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 monetdb5/optimizer/optimizer.mal Branch: copybinary Log Message:
optimizer.multiplex was erroneously listed as returning void diffs (45 lines): diff --git a/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures.stable.out --- a/clients/Tests/MAL-signatures.stable.out +++ b/clients/Tests/MAL-signatures.stable.out @@ -9152,8 +9152,8 @@ stdout of test 'MAL-signatures` in direc [ "optimizer", "minimal_pipe", "function optimizer.minimal_pipe():void;", "", "" ] [ "optimizer", "mitosis", "pattern optimizer.mitosis():str ", "OPTwrapper;", "" ] [ "optimizer", "mitosis", "pattern optimizer.mitosis(X_1:str, X_2:str):str ", "OPTwrapper;", "" ] -[ "optimizer", "multiplex", "pattern optimizer.multiplex():void ", "OPTwrapper;", "" ] -[ "optimizer", "multiplex", "pattern optimizer.multiplex(X_1:str, X_2:str):void ", "OPTwrapper;", "" ] +[ "optimizer", "multiplex", "pattern optimizer.multiplex():str ", "OPTwrapper;", "" ] +[ "optimizer", "multiplex", "pattern optimizer.multiplex(X_1:str, X_2:str):str ", "OPTwrapper;", "" ] [ "optimizer", "no_mitosis_pipe", "function optimizer.no_mitosis_pipe():void;", "", "" ] [ "optimizer", "oltp", "pattern optimizer.oltp():str ", "OPTwrapper;", "" ] [ "optimizer", "oltp", "pattern optimizer.oltp(X_1:str, X_2:str):str ", "OPTwrapper;", "" ] diff --git a/clients/Tests/MAL-signatures.stable.out.int128 b/clients/Tests/MAL-signatures.stable.out.int128 --- a/clients/Tests/MAL-signatures.stable.out.int128 +++ b/clients/Tests/MAL-signatures.stable.out.int128 @@ -12454,8 +12454,8 @@ stdout of test 'MAL-signatures` in direc [ "optimizer", "minimal_pipe", "function optimizer.minimal_pipe():void;", "", "" ] [ "optimizer", "mitosis", "pattern optimizer.mitosis():str ", "OPTwrapper;", "" ] [ "optimizer", "mitosis", "pattern optimizer.mitosis(X_1:str, X_2:str):str ", "OPTwrapper;", "" ] -[ "optimizer", "multiplex", "pattern optimizer.multiplex():void ", "OPTwrapper;", "" ] -[ "optimizer", "multiplex", "pattern optimizer.multiplex(X_1:str, X_2:str):void ", "OPTwrapper;", "" ] +[ "optimizer", "multiplex", "pattern optimizer.multiplex():str ", "OPTwrapper;", "" ] +[ "optimizer", "multiplex", "pattern optimizer.multiplex(X_1:str, X_2:str):str ", "OPTwrapper;", "" ] [ "optimizer", "no_mitosis_pipe", "function optimizer.no_mitosis_pipe():void;", "", "" ] [ "optimizer", "oltp", "pattern optimizer.oltp():str ", "OPTwrapper;", "" ] [ "optimizer", "oltp", "pattern optimizer.oltp(X_1:str, X_2:str):str ", "OPTwrapper;", "" ] diff --git a/monetdb5/optimizer/optimizer.mal b/monetdb5/optimizer/optimizer.mal --- a/monetdb5/optimizer/optimizer.mal +++ b/monetdb5/optimizer/optimizer.mal @@ -193,11 +193,11 @@ address OPTwrapper comment "Modify the plan to exploit parallel processing on multiple cores"; #opt_multiplex.mal -pattern optimizer.multiplex():void +pattern optimizer.multiplex():str address OPTwrapper comment "Compiler for multiplexed instructions."; -pattern optimizer.multiplex(mod:str,fcn:str):void +pattern optimizer.multiplex(mod:str,fcn:str):str address OPTwrapper comment "Compiler for multiplexed instructions."; _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
