From 190dbddfe33e3ec25b0c83dff1ca5c60b184e5a7 Mon Sep 17 00:00:00 2001 From: munja Date: Thu, 7 Apr 2022 09:52:56 +0100 Subject: [PATCH] fix: using regex special chars instead of hex constants in mp_jsonout --- all.sas | 42 ++++++++++++++++++------------------ base/mp_jsonout.sas | 14 ++++++------ meta/mm_createwebservice.sas | 14 ++++++------ viya/mv_createwebservice.sas | 14 ++++++------ 4 files changed, 42 insertions(+), 42 deletions(-) diff --git a/all.sas b/all.sas index bcdf20d..e7a0c71 100644 --- a/all.sas +++ b/all.sas @@ -8422,13 +8422,13 @@ options prxchange('s/'!!'0A'x!!'/\n/',-1, prxchange('s/'!!'0D'x!!'/\r/',-1, prxchange('s/'!!'09'x!!'/\t/',-1, - prxchange('s/'!!'00'x!!'/\\u0000/',-1, /* NUL */ - prxchange('s/'!!'0E'x!!'/\\u000E/',-1, /* SS */ - prxchange('s/'!!'0F'x!!'/\\u000F/',-1, /* SF */ - prxchange('s/'!!'01'x!!'/\\u0001/',-1, /* SOH */ - prxchange('s/'!!'02'x!!'/\\u0002/',-1, /* STX */ - prxchange('s/'!!'02'x!!'/\\u0010/',-1, /* DLE */ - prxchange('s/'!!'11'x!!'/\\u0011/',-1, /* DC1 */ + prxchange('s/\x00/\\u0000/',-1, /* NUL */ + prxchange('s/\x0E/\\u000E/',-1, /* SS */ + prxchange('s/\x0F/\\u000F/',-1, /* SF */ + prxchange('s/\x01/\\u0001/',-1, /* SOH */ + prxchange('s/\x02/\\u0002/',-1, /* STX */ + prxchange('s/\x10/\\u0010/',-1, /* DLE */ + prxchange('s/\x11/\\u0011/',-1, /* DC1 */ prxchange('s/\\/\\\\/',-1,&&name&i) ))))))))))))!!'"'; %end; @@ -14939,13 +14939,13 @@ data _null_; put ' prxchange(''s/''!!''0A''x!!''/\n/'',-1, '; put ' prxchange(''s/''!!''0D''x!!''/\r/'',-1, '; put ' prxchange(''s/''!!''09''x!!''/\t/'',-1, '; - put ' prxchange(''s/''!!''00''x!!''/\\u0000/'',-1, /* NUL */ '; - put ' prxchange(''s/''!!''0E''x!!''/\\u000E/'',-1, /* SS */ '; - put ' prxchange(''s/''!!''0F''x!!''/\\u000F/'',-1, /* SF */ '; - put ' prxchange(''s/''!!''01''x!!''/\\u0001/'',-1, /* SOH */ '; - put ' prxchange(''s/''!!''02''x!!''/\\u0002/'',-1, /* STX */ '; - put ' prxchange(''s/''!!''02''x!!''/\\u0010/'',-1, /* DLE */ '; - put ' prxchange(''s/''!!''11''x!!''/\\u0011/'',-1, /* DC1 */ '; + put ' prxchange(''s/\x00/\\u0000/'',-1, /* NUL */ '; + put ' prxchange(''s/\x0E/\\u000E/'',-1, /* SS */ '; + put ' prxchange(''s/\x0F/\\u000F/'',-1, /* SF */ '; + put ' prxchange(''s/\x01/\\u0001/'',-1, /* SOH */ '; + put ' prxchange(''s/\x02/\\u0002/'',-1, /* STX */ '; + put ' prxchange(''s/\x10/\\u0010/'',-1, /* DLE */ '; + put ' prxchange(''s/\x11/\\u0011/'',-1, /* DC1 */ '; put ' prxchange(''s/\\/\\\\/'',-1,&&name&i) '; put ' ))))))))))))!!''"''; '; put ' %end; '; @@ -20417,13 +20417,13 @@ data _null_; put ' prxchange(''s/''!!''0A''x!!''/\n/'',-1, '; put ' prxchange(''s/''!!''0D''x!!''/\r/'',-1, '; put ' prxchange(''s/''!!''09''x!!''/\t/'',-1, '; - put ' prxchange(''s/''!!''00''x!!''/\\u0000/'',-1, /* NUL */ '; - put ' prxchange(''s/''!!''0E''x!!''/\\u000E/'',-1, /* SS */ '; - put ' prxchange(''s/''!!''0F''x!!''/\\u000F/'',-1, /* SF */ '; - put ' prxchange(''s/''!!''01''x!!''/\\u0001/'',-1, /* SOH */ '; - put ' prxchange(''s/''!!''02''x!!''/\\u0002/'',-1, /* STX */ '; - put ' prxchange(''s/''!!''02''x!!''/\\u0010/'',-1, /* DLE */ '; - put ' prxchange(''s/''!!''11''x!!''/\\u0011/'',-1, /* DC1 */ '; + put ' prxchange(''s/\x00/\\u0000/'',-1, /* NUL */ '; + put ' prxchange(''s/\x0E/\\u000E/'',-1, /* SS */ '; + put ' prxchange(''s/\x0F/\\u000F/'',-1, /* SF */ '; + put ' prxchange(''s/\x01/\\u0001/'',-1, /* SOH */ '; + put ' prxchange(''s/\x02/\\u0002/'',-1, /* STX */ '; + put ' prxchange(''s/\x10/\\u0010/'',-1, /* DLE */ '; + put ' prxchange(''s/\x11/\\u0011/'',-1, /* DC1 */ '; put ' prxchange(''s/\\/\\\\/'',-1,&&name&i) '; put ' ))))))))))))!!''"''; '; put ' %end; '; diff --git a/base/mp_jsonout.sas b/base/mp_jsonout.sas index c68fb30..df61d1f 100644 --- a/base/mp_jsonout.sas +++ b/base/mp_jsonout.sas @@ -203,13 +203,13 @@ prxchange('s/'!!'0A'x!!'/\n/',-1, prxchange('s/'!!'0D'x!!'/\r/',-1, prxchange('s/'!!'09'x!!'/\t/',-1, - prxchange('s/'!!'00'x!!'/\\u0000/',-1, /* NUL */ - prxchange('s/'!!'0E'x!!'/\\u000E/',-1, /* SS */ - prxchange('s/'!!'0F'x!!'/\\u000F/',-1, /* SF */ - prxchange('s/'!!'01'x!!'/\\u0001/',-1, /* SOH */ - prxchange('s/'!!'02'x!!'/\\u0002/',-1, /* STX */ - prxchange('s/'!!'02'x!!'/\\u0010/',-1, /* DLE */ - prxchange('s/'!!'11'x!!'/\\u0011/',-1, /* DC1 */ + prxchange('s/\x00/\\u0000/',-1, /* NUL */ + prxchange('s/\x0E/\\u000E/',-1, /* SS */ + prxchange('s/\x0F/\\u000F/',-1, /* SF */ + prxchange('s/\x01/\\u0001/',-1, /* SOH */ + prxchange('s/\x02/\\u0002/',-1, /* STX */ + prxchange('s/\x10/\\u0010/',-1, /* DLE */ + prxchange('s/\x11/\\u0011/',-1, /* DC1 */ prxchange('s/\\/\\\\/',-1,&&name&i) ))))))))))))!!'"'; %end; diff --git a/meta/mm_createwebservice.sas b/meta/mm_createwebservice.sas index 374e1c7..17d4e2d 100644 --- a/meta/mm_createwebservice.sas +++ b/meta/mm_createwebservice.sas @@ -236,13 +236,13 @@ data _null_; put ' prxchange(''s/''!!''0A''x!!''/\n/'',-1, '; put ' prxchange(''s/''!!''0D''x!!''/\r/'',-1, '; put ' prxchange(''s/''!!''09''x!!''/\t/'',-1, '; - put ' prxchange(''s/''!!''00''x!!''/\\u0000/'',-1, /* NUL */ '; - put ' prxchange(''s/''!!''0E''x!!''/\\u000E/'',-1, /* SS */ '; - put ' prxchange(''s/''!!''0F''x!!''/\\u000F/'',-1, /* SF */ '; - put ' prxchange(''s/''!!''01''x!!''/\\u0001/'',-1, /* SOH */ '; - put ' prxchange(''s/''!!''02''x!!''/\\u0002/'',-1, /* STX */ '; - put ' prxchange(''s/''!!''02''x!!''/\\u0010/'',-1, /* DLE */ '; - put ' prxchange(''s/''!!''11''x!!''/\\u0011/'',-1, /* DC1 */ '; + put ' prxchange(''s/\x00/\\u0000/'',-1, /* NUL */ '; + put ' prxchange(''s/\x0E/\\u000E/'',-1, /* SS */ '; + put ' prxchange(''s/\x0F/\\u000F/'',-1, /* SF */ '; + put ' prxchange(''s/\x01/\\u0001/'',-1, /* SOH */ '; + put ' prxchange(''s/\x02/\\u0002/'',-1, /* STX */ '; + put ' prxchange(''s/\x10/\\u0010/'',-1, /* DLE */ '; + put ' prxchange(''s/\x11/\\u0011/'',-1, /* DC1 */ '; put ' prxchange(''s/\\/\\\\/'',-1,&&name&i) '; put ' ))))))))))))!!''"''; '; put ' %end; '; diff --git a/viya/mv_createwebservice.sas b/viya/mv_createwebservice.sas index acbc844..17b079b 100644 --- a/viya/mv_createwebservice.sas +++ b/viya/mv_createwebservice.sas @@ -380,13 +380,13 @@ data _null_; put ' prxchange(''s/''!!''0A''x!!''/\n/'',-1, '; put ' prxchange(''s/''!!''0D''x!!''/\r/'',-1, '; put ' prxchange(''s/''!!''09''x!!''/\t/'',-1, '; - put ' prxchange(''s/''!!''00''x!!''/\\u0000/'',-1, /* NUL */ '; - put ' prxchange(''s/''!!''0E''x!!''/\\u000E/'',-1, /* SS */ '; - put ' prxchange(''s/''!!''0F''x!!''/\\u000F/'',-1, /* SF */ '; - put ' prxchange(''s/''!!''01''x!!''/\\u0001/'',-1, /* SOH */ '; - put ' prxchange(''s/''!!''02''x!!''/\\u0002/'',-1, /* STX */ '; - put ' prxchange(''s/''!!''02''x!!''/\\u0010/'',-1, /* DLE */ '; - put ' prxchange(''s/''!!''11''x!!''/\\u0011/'',-1, /* DC1 */ '; + put ' prxchange(''s/\x00/\\u0000/'',-1, /* NUL */ '; + put ' prxchange(''s/\x0E/\\u000E/'',-1, /* SS */ '; + put ' prxchange(''s/\x0F/\\u000F/'',-1, /* SF */ '; + put ' prxchange(''s/\x01/\\u0001/'',-1, /* SOH */ '; + put ' prxchange(''s/\x02/\\u0002/'',-1, /* STX */ '; + put ' prxchange(''s/\x10/\\u0010/'',-1, /* DLE */ '; + put ' prxchange(''s/\x11/\\u0011/'',-1, /* DC1 */ '; put ' prxchange(''s/\\/\\\\/'',-1,&&name&i) '; put ' ))))))))))))!!''"''; '; put ' %end; ';