Update: Change --substitute short parameter from -s to -S for iki_read.

A lot of recent bug fixes have resulted in significant behavioral changes in the iki_read parameters.
There are enough breaking changes at this point that I feel safe in making this change from `-s` to `-S`.

This change makes iki_read more forward compatible with changes introduced in the 0.7.x and greater versions of iki_read.
The `-s` or `--select` from the 0.7.x branch is not being back ported but it is much more compatible to make the `--substitute` short parameter consistent across those releases.

diff --git a/level_3/iki_read/c/common.h b/level_3/iki_read/c/common.h
index 0cdd8de4e914e1947e656f10a1811b027e3eeca7..c61df6eb209faf9df9811838a434acf8f20162c4 100644 (file)
--- a/level_3/iki_read/c/common.h
+++ b/level_3/iki_read/c/common.h
@@ -84,7 +84,7 @@ extern "C" {
   #define IKI_READ_short_object_s     "o"
   #define IKI_READ_short_reassign_s   "R"
   #define IKI_READ_short_replace_s    "r"
-  #define IKI_READ_short_substitute_s "s"
+  #define IKI_READ_short_substitute_s "S"
   #define IKI_READ_short_total_s      "t"
   #define IKI_READ_short_whole_s      "w"
   #define IKI_READ_short_wrap_s       "W"

diff --git a/level_3/iki_read/tests/runtime/script/generate.sh b/level_3/iki_read/tests/runtime/script/generate.sh
index 38857ed3e478072a7142431e5c9d20bd82c10324..f5903338259098c7c2e8bc67769d234e03316a4a 100644 (file)
--- a/level_3/iki_read/tests/runtime/script/generate.sh
+++ b/level_3/iki_read/tests/runtime/script/generate.sh
@@ -2571,18 +2571,18 @@ generate_operate_iki() {
   generate_operate_run +n -crw yup yes      ${file_source} > ${test_current}content-replace-yup-yes-whole.expect &&
 
   #### SUBSTITUTE ####
-  generate_operate_run +n -cs a c sea             ${file_source} > ${test_current}content-substitute-a-c-sea.expect &&
-  generate_operate_run +n -cs b c sea             ${file_source} > ${test_current}content-substitute-b-c-sea.expect &&
-  generate_operate_run +n -css a c sea b c bee    ${file_source} > ${test_current}content-substitute-a-c-sea-b-c-bee.expect &&
-  generate_operate_run +n -cs hello world friend  ${file_source} > ${test_current}content-substitute-hello-world-friend.expect &&
-  generate_operate_run +n -cs yup yup yes         ${file_source} > ${test_current}content-substitute-yup-yup-yes.expect &&
-  generate_operate_run +n -cs yup nope no         ${file_source} > ${test_current}content-substitute-yup-nope-no.expect &&
-  generate_operate_run +n -csw a c sea            ${file_source} > ${test_current}content-substitute-a-c-sea-whole.expect &&
-  generate_operate_run +n -csw b c sea            ${file_source} > ${test_current}content-substitute-b-c-sea-whole.expect &&
-  generate_operate_run +n -cssw a c sea b c bee   ${file_source} > ${test_current}content-substitute-a-c-sea-b-c-bee-whole.expect &&
-  generate_operate_run +n -csw hello world friend ${file_source} > ${test_current}content-substitute-hello-world-friend-whole.expect &&
-  generate_operate_run +n -csw yup yup yes        ${file_source} > ${test_current}content-substitute-yup-yup-yes-whole.expect &&
-  generate_operate_run +n -csw yup nope no        ${file_source} > ${test_current}content-substitute-yup-nope-no-whole.expect &&
+  generate_operate_run +n -cS a c sea             ${file_source} > ${test_current}content-substitute-a-c-sea.expect &&
+  generate_operate_run +n -cS b c sea             ${file_source} > ${test_current}content-substitute-b-c-sea.expect &&
+  generate_operate_run +n -cSS a c sea b c bee    ${file_source} > ${test_current}content-substitute-a-c-sea-b-c-bee.expect &&
+  generate_operate_run +n -cS hello world friend  ${file_source} > ${test_current}content-substitute-hello-world-friend.expect &&
+  generate_operate_run +n -cS yup yup yes         ${file_source} > ${test_current}content-substitute-yup-yup-yes.expect &&
+  generate_operate_run +n -cS yup nope no         ${file_source} > ${test_current}content-substitute-yup-nope-no.expect &&
+  generate_operate_run +n -cSw a c sea            ${file_source} > ${test_current}content-substitute-a-c-sea-whole.expect &&
+  generate_operate_run +n -cSw b c sea            ${file_source} > ${test_current}content-substitute-b-c-sea-whole.expect &&
+  generate_operate_run +n -cSSw a c sea b c bee   ${file_source} > ${test_current}content-substitute-a-c-sea-b-c-bee-whole.expect &&
+  generate_operate_run +n -cSw hello world friend ${file_source} > ${test_current}content-substitute-hello-world-friend-whole.expect &&
+  generate_operate_run +n -cSw yup yup yes        ${file_source} > ${test_current}content-substitute-yup-yup-yes-whole.expect &&
+  generate_operate_run +n -cSw yup nope no        ${file_source} > ${test_current}content-substitute-yup-nope-no-whole.expect &&
 
   #### WRAP ####
   generate_operate_run +n -cW a '[' ']'                   ${file_source} > ${test_current}content-wrap-a-lbracket-rbracket.expect &&
@@ -2625,18 +2625,18 @@ generate_operate_iki() {
   generate_operate_run +n -cWrw yup '[' ']' yup yes                     ${file_source} > ${test_current}content-wrap-yup-lbracket-rbracket-replace-yup-yes-whole.expect &&
 
   #### WRAP - SUBSTITUTE ####
-  generate_operate_run +n -cWs a '[' ']' a c sea                              ${file_source} > ${test_current}content-wrap-a-lbracket-rbracket-substitute-a-c-sea.expect &&
-  generate_operate_run +n -cWs b '[' ']' b c sea                              ${file_source} > ${test_current}content-wrap-b-lbracket-rbracket-substitute-b-c-sea.expect &&
-  generate_operate_run +n -cWWss a '[' ']' b '{' '}' a c sea b c bee          ${file_source} > ${test_current}content-wrap-a-lbracket-rbracket-b-lbrace-rbrace-substitute-a-c-sea-b-c-bee.expect &&
-  generate_operate_run +n -cWs hello bold_open bold_close hello world friend  ${file_source} > ${test_current}content-wrap-hello-bold_open-bold_close-substitute-hello-world-friend.expect &&
-  generate_operate_run +n -cWs yup '[' ']' yup yup yes                        ${file_source} > ${test_current}content-wrap-yup-lbracket-rbracket-substitute-yup-yup-yes.expect &&
-  generate_operate_run +n -cWs nope '[' ']' yup nope no                       ${file_source} > ${test_current}content-wrap-yup-lbracket-rbracket-yup-nope-no.expect &&
-  generate_operate_run +n -cWsw a '[' ']' a c sea                             ${file_source} > ${test_current}content-wrap-a-lbracket-rbracket-substitute-a-c-sea-whole.expect &&
-  generate_operate_run +n -cWsw b '[' ']' b c sea                             ${file_source} > ${test_current}content-wrap-b-lbracket-rbracket-substitute-b-c-sea-whole.expect &&
-  generate_operate_run +n -cWWssw a '[' ']' b '{' '}' a c sea b c bee         ${file_source} > ${test_current}content-wrap-a-lbracket-rbracket-b-lbrace-rbrace-substitute-a-c-sea-b-c-bee-whole.expect &&
-  generate_operate_run +n -cWsw hello bold_open bold_close hello world friend ${file_source} > ${test_current}content-wrap-hello-bold_open-bold_close-substitute-hello-world-friend-whole.expect &&
-  generate_operate_run +n -cWsw yup '[' ']' yup yup yes                       ${file_source} > ${test_current}content-wrap-yup-lbracket-rbracket-substitute-yup-yup-yes-whole.expect &&
-  generate_operate_run +n -cWsw nope '[' ']' yup nope no                      ${file_source} > ${test_current}content-wrap-yup-lbracket-rbracket-yup-nope-no-whole.expect &&
+  generate_operate_run +n -cWS a '[' ']' a c sea                              ${file_source} > ${test_current}content-wrap-a-lbracket-rbracket-substitute-a-c-sea.expect &&
+  generate_operate_run +n -cWS b '[' ']' b c sea                              ${file_source} > ${test_current}content-wrap-b-lbracket-rbracket-substitute-b-c-sea.expect &&
+  generate_operate_run +n -cWWSS a '[' ']' b '{' '}' a c sea b c bee          ${file_source} > ${test_current}content-wrap-a-lbracket-rbracket-b-lbrace-rbrace-substitute-a-c-sea-b-c-bee.expect &&
+  generate_operate_run +n -cWS hello bold_open bold_close hello world friend  ${file_source} > ${test_current}content-wrap-hello-bold_open-bold_close-substitute-hello-world-friend.expect &&
+  generate_operate_run +n -cWS yup '[' ']' yup yup yes                        ${file_source} > ${test_current}content-wrap-yup-lbracket-rbracket-substitute-yup-yup-yes.expect &&
+  generate_operate_run +n -cWS nope '[' ']' yup nope no                       ${file_source} > ${test_current}content-wrap-yup-lbracket-rbracket-yup-nope-no.expect &&
+  generate_operate_run +n -cWSw a '[' ']' a c sea                             ${file_source} > ${test_current}content-wrap-a-lbracket-rbracket-substitute-a-c-sea-whole.expect &&
+  generate_operate_run +n -cWSw b '[' ']' b c sea                             ${file_source} > ${test_current}content-wrap-b-lbracket-rbracket-substitute-b-c-sea-whole.expect &&
+  generate_operate_run +n -cWWSSw a '[' ']' b '{' '}' a c sea b c bee         ${file_source} > ${test_current}content-wrap-a-lbracket-rbracket-b-lbrace-rbrace-substitute-a-c-sea-b-c-bee-whole.expect &&
+  generate_operate_run +n -cWSw hello bold_open bold_close hello world friend ${file_source} > ${test_current}content-wrap-hello-bold_open-bold_close-substitute-hello-world-friend-whole.expect &&
+  generate_operate_run +n -cWSw yup '[' ']' yup yup yes                       ${file_source} > ${test_current}content-wrap-yup-lbracket-rbracket-substitute-yup-yup-yes-whole.expect &&
+  generate_operate_run +n -cWSw nope '[' ']' yup nope no                      ${file_source} > ${test_current}content-wrap-yup-lbracket-rbracket-yup-nope-no-whole.expect &&
 
   echo "Generation Complete"