From ec27289f558e73b40c3d90f599cf392a9d03e864 Mon Sep 17 00:00:00 2001 From: "Arnold D. Robbins" Date: Sun, 15 Jun 2014 20:36:33 +0300 Subject: Finish up summaries. Improvements in mystrtonum(). --- awklib/eg/lib/strtonum.awk | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'awklib/eg/lib/strtonum.awk') diff --git a/awklib/eg/lib/strtonum.awk b/awklib/eg/lib/strtonum.awk index a56ab50c..9342e789 100644 --- a/awklib/eg/lib/strtonum.awk +++ b/awklib/eg/lib/strtonum.awk @@ -3,8 +3,9 @@ # # Arnold Robbins, arnold@skeeve.com, Public Domain # February, 2004 +# Revised June, 2014 -function mystrtonum(str, ret, chars, n, i, k, c) +function mystrtonum(str, ret, n, i, k, c) { if (str ~ /^0[0-7]*$/) { # octal @@ -17,7 +18,7 @@ function mystrtonum(str, ret, chars, n, i, k, c) ret = ret * 8 + k } - } else if (str ~ /^0[xX][[:xdigit:]]+/) { + } else if (str ~ /^0[xX][[:xdigit:]]+$/) { # hexadecimal str = substr(str, 3) # lop off leading 0x n = length(str) @@ -25,10 +26,7 @@ function mystrtonum(str, ret, chars, n, i, k, c) for (i = 1; i <= n; i++) { c = substr(str, i, 1) c = tolower(c) - if ((k = index("0123456789", c)) > 0) - k-- # adjust for 1-basing in awk - else if ((k = index("abcdef", c)) > 0) - k += 9 + k = index("123456789abcdef", c) ret = ret * 16 + k } -- cgit v1.2.3 From 6c541fd0f75cd328dd80afec757ecccc833719af Mon Sep 17 00:00:00 2001 From: "Arnold D. Robbins" Date: Fri, 29 Aug 2014 13:11:45 +0300 Subject: More doc updates. --- awklib/eg/lib/strtonum.awk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'awklib/eg/lib/strtonum.awk') diff --git a/awklib/eg/lib/strtonum.awk b/awklib/eg/lib/strtonum.awk index 9342e789..5e20626b 100644 --- a/awklib/eg/lib/strtonum.awk +++ b/awklib/eg/lib/strtonum.awk @@ -13,8 +13,9 @@ function mystrtonum(str, ret, n, i, k, c) ret = 0 for (i = 1; i <= n; i++) { c = substr(str, i, 1) - if ((k = index("01234567", c)) > 0) - k-- # adjust for 1-basing in awk + # index() returns 0 if c not in string, + # includes c == "0" + k = index("1234567", c) ret = ret * 8 + k } @@ -26,6 +27,8 @@ function mystrtonum(str, ret, n, i, k, c) for (i = 1; i <= n; i++) { c = substr(str, i, 1) c = tolower(c) + # index() returns 0 if c not in string, + # includes c == "0" k = index("123456789abcdef", c) ret = ret * 16 + k -- cgit v1.2.3 From 8a1df492afae19d544fa5e5b636ed427b2d1c3f5 Mon Sep 17 00:00:00 2001 From: "Arnold D. Robbins" Date: Sun, 14 Sep 2014 19:28:50 +0300 Subject: Doc edits. --- awklib/eg/lib/strtonum.awk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'awklib/eg/lib/strtonum.awk') diff --git a/awklib/eg/lib/strtonum.awk b/awklib/eg/lib/strtonum.awk index 5e20626b..f82c89c5 100644 --- a/awklib/eg/lib/strtonum.awk +++ b/awklib/eg/lib/strtonum.awk @@ -13,8 +13,8 @@ function mystrtonum(str, ret, n, i, k, c) ret = 0 for (i = 1; i <= n; i++) { c = substr(str, i, 1) - # index() returns 0 if c not in string, - # includes c == "0" + # index() returns 0 if c not in string, + # includes c == "0" k = index("1234567", c) ret = ret * 8 + k @@ -27,8 +27,8 @@ function mystrtonum(str, ret, n, i, k, c) for (i = 1; i <= n; i++) { c = substr(str, i, 1) c = tolower(c) - # index() returns 0 if c not in string, - # includes c == "0" + # index() returns 0 if c not in string, + # includes c == "0" k = index("123456789abcdef", c) ret = ret * 16 + k -- cgit v1.2.3