[perl #59222] [PATCH] string to number radix support
# New Ticket Created by jason switzer
# Please include the string: [perl #59222]
# in the subject line of all future correspondence about this issue.
# URL: http://rt.perl.org/rt3/Ticket/Display.html?id=59222
This patch adds radix notation (:\d...) to the string-to-number conversion
routine Perl6Str::get_number. The tests haven't been written and
incorporated to test specifically the string conversion but the spectest
suite passes as of r31354 (parrot) and r22313 (t/spec). Cordination with
moritz_ will take place to determine the location and the extent of the
tests that will be created.
Not all radix constructs are supported yet (in the works). Currently does
not support nested notation, such as :1012*23**3 or functional forms such
as :10('1234').
Thanks,
Jason s1n Switzer
Index: perl6str.pmc
===
--- perl6str.pmc (revision 31353)
+++ perl6str.pmc (working copy)
@@ -23,6 +23,58 @@
#include ctype.h
#include math.h
+FLOATVAL parse_number(const char** start, const char* stop, FLOATVAL radix) {
+FLOATVAL number = 0.0;
+//continue until the end or until we've hit a non-digit
+while (*start stop isxdigit((unsigned char)**start)) {
+/* number must not contain values less than the radix */
+unsigned int current;
+if (isdigit(**start)) current = (**start) - '0';
+else current = tolower(**start) - 'a' + 10;
+//number += ((*start) - '0') * frac;
+if (current = radix)
+return number;
+
+number = number * radix + current;
+(*start)++;
+
+/* skip past the digit seperator _ */
+if (*start stop **start == '_') {
+if(!isxdigit((unsigned char)*((*start) + 1))) {
+return number;
+}
+(*start)++;
+}
+}
+return number;
+}
+
+FLOATVAL parse_fraction(const char** start, const char* stop, FLOATVAL radix) {
+FLOATVAL frac = 1.0;
+FLOATVAL number = 0.0;
+while (*start stop isxdigit((unsigned char)**start)) {
+frac /= radix;
+unsigned int current;
+if (isdigit(**start)) current = (**start) - '0';
+else current = tolower(**start) - 'a' + 10;
+
+/* if we discover scientific notation, stop parsing */
+if (tolower(**start) == 'e' radix == 10)
+return number;
+if (current = radix)
+return 0;
+
+number += current * frac;
+(*start)++;
+
+/* skip past the digit seperator _ */
+if (*start stop **start == '_'
+ isdigit((unsigned char)**(start + 1)))
+(*start)++;
+}
+return number;
+}
+
pmclass Perl6Str
extends String
provides string
@@ -63,12 +115,14 @@
FLOATVAL get_number() {
STRING *s= (STRING *)PMC_str_val(SELF);
-FLOATVAL sign = 1.0;
-FLOATVAL f= 0.0;
+FLOATVAL sign = 1.0;
+FLOATVAL f= 0.0;
+FLOATVAL radix = 10.0;
+int radfound = 0;
-if (s) {
+if (s s-strstart) {
const char *s1 = s-strstart;
-const char * const end = s1 + s-bufused;
+const char * const end = s1 + strlen(s1);
/* skip leading whitespace */
while (s1 end isspace((unsigned char)*s1))
@@ -92,92 +146,59 @@
case 'x':
case 'X':
s1++;
-while (s1 end isxdigit((unsigned char)*s1)) {
-f *= 16;
-if (isdigit((unsigned char)*s1))
-f += (*s1) - '0';
-else
-f += tolower((unsigned char)*s1) - 'a' + 10;
-
-s1++;
-
-if (s1 end *s1 == '_')
-s1++;
-}
-return sign * f;
+return parse_number(s1, end, 16);
case 'd':
case 'D':
s1++;
-while (s1 end isdigit((unsigned char)*s1)) {
-f = f * 10 + (*s1) - '0';
-s1++;
-
-if (s1 end *s1 == '_')
-s1++;
-}
-
-return sign * f;
+return parse_number(s1, end, 10);
case 'o':
case 'O':
s1++;
-while (s1 end isdigit((unsigned char)*s1)
- *s1 = '7') {
-f = f * 8 + (*s1) - '0';
-
-s1++;
-
-if (s1 end *s1 == '_')
-s1++;
-
Re: [perl #59222] [PATCH] string to number radix support
jason switzer (via RT) wrote:
# New Ticket Created by jason switzer
# Please include the string: [perl #59222]
# in the subject line of all future correspondence about this issue.
# URL: http://rt.perl.org/rt3/Ticket/Display.html?id=59222
This patch adds radix notation (:\d...) to the string-to-number conversion
routine Perl6Str::get_number. The tests haven't been written and
incorporated to test specifically the string conversion but the spectest
suite passes as of r31354 (parrot) and r22313 (t/spec). Cordination with
moritz_ will take place to determine the location and the extent of the
tests that will be created.
The tests should go into t/spec/S02-literals/radix.t if they aren't
there yet.
Not all radix constructs are supported yet (in the works). Currently does
not support nested notation, such as :1012*23**3 or functional forms such
as :10('1234').
If such things are to be supported in string-to-number conversions (is
that specced? where?), it should really take the way through the
grammar. In the end the user could change what he considers a number by
modifying the grammar. Also note that these expressions could grow
arbitrarily complex.
Index: perl6str.pmc
===
--- perl6str.pmc (revision 31353)
+++ perl6str.pmc (working copy)
@@ -23,6 +23,58 @@
#include ctype.h
#include math.h
+FLOATVAL parse_number(const char** start, const char* stop, FLOATVAL radix) {
+FLOATVAL number = 0.0;
+//continue until the end or until we've hit a non-digit
+while (*start stop isxdigit((unsigned char)**start)) {
Your usage of isxdigit() makes me wonder - will that work for bases 16?
Moritz
--
Moritz Lenz
http://moritz.faui2k3.org/ | http://perl-6.de/
Re: [perl #59222] [PATCH] string to number radix support
On Tue, Sep 23, 2008 at 12:05:18PM +0200, Moritz Lenz wrote:
jason switzer (via RT) wrote:
Not all radix constructs are supported yet (in the works). Currently does
not support nested notation, such as :1012*23**3 or functional forms such
as :10('1234').
If such things are to be supported in string-to-number conversions (is
that specced? where?), ...
S02:2156:
The generic string-to-number converter will recognize all of these
forms (including the * form, since constant folding is not available
to the run time). Also allowed in strings are leading plus or minus,
and maybe a trailing Units type for an implied scaling. Leading and
trailing whitespace is ignored.
... it should really take the way through the
grammar. In the end the user could change what he considers a number by
modifying the grammar.
The spec doesn't mention anything about string-to-number conversion
following changes to the the grammar, so Rakudo has taken the opposite
approach -- i.e., the compiler uses the generic string-to-number converter
to evaluate the forms recognized by the grammar. If this is backwards
then the spec likely needs an update.
Also note that these expressions could grow arbitrarily complex.
I think the recogized expression are (currently) limited to the
specific forms outlined in S02.
Index: perl6str.pmc
===
--- perl6str.pmc(revision 31353)
+++ perl6str.pmc(working copy)
@@ -23,6 +23,58 @@
#include ctype.h
#include math.h
+FLOATVAL parse_number(const char** start, const char* stop, FLOATVAL
radix) {
+FLOATVAL number = 0.0;
+//continue until the end or until we've hit a non-digit
+while (*start stop isxdigit((unsigned char)**start)) {
Your usage of isxdigit() makes me wonder - will that work for bases 16?
Correct, that should probably be isalnum() instead.
Pm
[perl #59242] [PATCH] ord and chr functions
# New Ticket Created by Carl Mäsak # Please include the string: [perl #59242] # in the subject line of all future correspondence about this issue. # URL: http://rt.perl.org/rt3/Ticket/Display.html?id=59242 The attached patch makes t/spec/S29-conversions/ord_and_chr.t pass. ord-and-chr.patch Description: Binary data
