From 79ac2b651fd6b2a84a3767777c01062d02b730b7 Mon Sep 17 00:00:00 2001 From: Michael Mikonos <127171689+mknos@users.noreply.github.com> Date: Thu, 3 Aug 2023 14:35:17 +0800 Subject: [PATCH 1/4] Str2I64() octal prefix 0o * Comment at top of function hints that 0o18 is treated as an octal number but it is not * Adding the appropriate switch-case makes it work by adjusting radix * Update comment: this function is more like strtol() because it returns a signed result * This function doesn't behave like strtol() because "0" prefix can't be used for octal, e.g. "0777" (maybe it could be supported in future) --- src/Kernel/StrScan.ZC | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Kernel/StrScan.ZC b/src/Kernel/StrScan.ZC index d785e5a2..b008ec4b 100755 --- a/src/Kernel/StrScan.ZC +++ b/src/Kernel/StrScan.ZC @@ -1,5 +1,5 @@ I64 Str2I64(U8 *st, I64 radix=10, U8 **_end_ptr=NULL) -{//String to I64. Similar to strtoul(). +{//String to I64. Similar to strtol(). //Allows radix change with "0x20" "0b1010" "0d123" "0o18". //Be careful of Str2I64("0b101", 16)-->0xB101. Bool neg = FALSE; @@ -32,6 +32,7 @@ I64 Str2I64(U8 *st, I64 radix=10, U8 **_end_ptr=NULL) switch (ch) { case 'B': radix = 2; st++; break; + case 'O': radix = 8; st++; break; case 'D': radix = 10; st++; break; case 'X': radix = 16; st++; break; } @@ -86,13 +87,13 @@ to avoid this. } if (!StrNCompare(src - 1, "inf", 3)) { - d=ì; + d=ì; src += 3; goto a2f_end; } - if (*src == 'ì') + if (*src == 'ì') { - d = ì; + d = ì; src++; goto a2f_end; } From 0d82978c55ca4494ecb7b6fafe61818061f38865 Mon Sep 17 00:00:00 2001 From: Michael Mikonos Date: Mon, 7 Aug 2023 08:52:53 +0800 Subject: [PATCH 2/4] undo unintended file conversion --- src/Kernel/StrScan.ZC | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Kernel/StrScan.ZC b/src/Kernel/StrScan.ZC index b008ec4b..5dd2a2df 100755 --- a/src/Kernel/StrScan.ZC +++ b/src/Kernel/StrScan.ZC @@ -87,13 +87,13 @@ to avoid this. } if (!StrNCompare(src - 1, "inf", 3)) { - d=ì; + d=ì; src += 3; goto a2f_end; } - if (*src == 'ì') + if (*src == 'ì') { - d = ì; + d = ì; src++; goto a2f_end; } From 26e0304999a750f127f949f217827bd38f1809f3 Mon Sep 17 00:00:00 2001 From: Sharoy Veduchi <61427449+doodayev@users.noreply.github.com> Date: Mon, 2 Oct 2023 21:49:24 -0700 Subject: [PATCH 3/4] Remove "MagicISO" trademark. Maybe in the past the word "MagicISO" was used for something but I don't see it here. Therefore I suggest removing it. --- src/Doc/GuideLines.DD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Doc/GuideLines.DD b/src/Doc/GuideLines.DD index 1aafbff1..b0ae90c4 100755 --- a/src/Doc/GuideLines.DD +++ b/src/Doc/GuideLines.DD @@ -130,4 +130,4 @@ $FG$ * RAX holds function return values, of course. $FG,8$ -* "MagicISO" is a trademark owned by MagicISO Corp. + From 577d8979c37c16774b2aaf9ce0b1ee1666f9ae6b Mon Sep 17 00:00:00 2001 From: Arsenic Blood <127725014+GutPuncher@users.noreply.github.com> Date: Tue, 3 Oct 2023 02:29:16 -0400 Subject: [PATCH 4/4] Update GuideLines.DD --- src/Doc/GuideLines.DD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Doc/GuideLines.DD b/src/Doc/GuideLines.DD index b0ae90c4..e73e8843 100755 --- a/src/Doc/GuideLines.DD +++ b/src/Doc/GuideLines.DD @@ -129,5 +129,5 @@ $FG$ * No args are passed in registers. * RAX holds function return values, of course. -$FG,8$ +