From: Fred T. Hamster Date: Sat, 14 Feb 2026 10:38:00 +0000 (-0500) Subject: little zeno steps towards building X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=9d1580761f93babb2e8a8c2cf9be6b9a7161825c;p=feisty_meow.git little zeno steps towards building added NIL to NULL_POINTER in upgrade script also. --- diff --git a/octopi/library/tests_cromp/crompish_pax.h b/octopi/library/tests_cromp/crompish_pax.h index 869211a1..5634e591 100644 --- a/octopi/library/tests_cromp/crompish_pax.h +++ b/octopi/library/tests_cromp/crompish_pax.h @@ -39,7 +39,7 @@ public: : infoton(bubble_classing()), _data() { reset(data_segment_size, boundaries, color); } - const structures::string_array &bubble_classing() { + const structures::string_array &bubble_classing() const { static basis::astring bubbs[2] = { "bubble", "rubble" }; static structures::string_array barray(2, bubbs); return barray; @@ -61,8 +61,9 @@ public: int non_data_overhead() const { return packed_size() - _data.length(); } virtual void text_form(basis::base_string &to_show) const { + const structures::string_array bubs = bubble_classing(); to_show.assign(basis::a_sprintf("classing=%s, seg size=%d, color=%d, bounds=%s", - bubble_classing().text_form().s(), _data.length(), _bounds.text_form().s(), _color)); + bubs.text_form().s(), _data.length(), _bounds.text_form().s(), _color)); } virtual void pack(basis::byte_array &packed_form) const { diff --git a/octopi/library/tests_cromp/test_cromp_client.cpp b/octopi/library/tests_cromp/test_cromp_client.cpp index e7ced1ee..e7f20784 100644 --- a/octopi/library/tests_cromp/test_cromp_client.cpp +++ b/octopi/library/tests_cromp/test_cromp_client.cpp @@ -21,20 +21,21 @@ #include #include #include -#include -#include -#include -#include -#include -#include +#include #include #include #include -#include +#include +#include +#include +#include +#include #include #include +#include #include #include +#include #include #include @@ -43,7 +44,7 @@ using namespace application; using namespace basis; using namespace configuration; using namespace cromp; -//using namespace mathematics; +using namespace mathematics; using namespace filesystem; using namespace loggers; using namespace octopi; diff --git a/scripts/buildor/upgrade_hoople_to_feistymeow.sh b/scripts/buildor/upgrade_hoople_to_feistymeow.sh index e9cf3f2f..c187b5f9 100644 --- a/scripts/buildor/upgrade_hoople_to_feistymeow.sh +++ b/scripts/buildor/upgrade_hoople_to_feistymeow.sh @@ -162,6 +162,7 @@ standards and usages." | sed -e 's/log_base::CRLF_AT_END/parser_bits::CRLF_AT_END/g' \ | sed -e 's/^#include *$/#include /g' \ | sed -e 's/^#include *$/#include /g' \ + | sed -e 's/\([[:space:]]\)*NIL\([^A-Za-z_\)/\1NULL_POINTER\2/g' \ | sed -e 's/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/[\/]*/\/\/\/\/\/\/\/\/\/\/\/\/\/\//g' \ >"$tempfile"