str->num: ignore leading and trailing whitespace

Sigrid Solveig Haflínudóttir committed 3 months ago

Commit fa39cec1 parent 09b46d94 files · +34 −17Browse files

Showing the changes to src (3 of 4 files). Show all

Unified · Split

3 files

src/docs.sl +2 −2
src/read.c +22 −14
src/str.c +9 −0

@@ -482,8 +482,8 @@ · 481 unmodified lines
482	(defdoc (str->num s (:base NIL))	482	(defdoc (str->num s (:base NIL))
483	«Return the number using the radix `base` in the string `s`.	483	«Return the number using the radix `base` in the string `s`.
484		484
485	Returns `NIL` if the number could not be parsed or there were	485	Returns `NIL` if the number could not be parsed. Any number of leading
486	left-over trailing characters.»	486	and/or trailing whitespace runes is allowed and those will be ignored.»
487	:doc-example	487	:doc-example
488	«(str->num "1.2")	488	«(str->num "1.2")
489	; ↳ 1.2»	489	; ↳ 1.2»

src/read.c+22−14

 	s64int i64;
 	double d;
-	if(sl_unlikely(*tok == '\0'))
+	if(sl_unlikely(*tok == 0))
 		return false;
 	if(!((tok[0] == '0' && tok[1] == 'x') || (base >= 15)) && strpbrk(tok, ".eEpP") != nil){
 		d = strtod(tok, &end);
-		if(sl_unlikely(*end == '\0')){
+		if(sl_unlikely(*end == 0)){
 			if(pval != nil)
 				*pval = mk_f64(d);
 			return true;
 		}
 		// floats can end in f or f0
 		if(end > tok && end[0] == 'f' &&
-			(end[1] == '\0' ||
+			(end[1] == 0 ||
-			 (end[1] == '0' && end[2] == '\0'))){
+			 (end[1] == '0' && end[2] == 0))){
 			if(pval != nil)
 				*pval = mk_f32((float)d);
 			return true;
 		i64 = INT64_MAX;
 	else{
 		i64 = strtoll(tok, &end, base);
-		if(*end != '\0')
+		if(*end != 0){
-			return false;
+			Rune r;
+			chartorune(&r, end);
+			if(!isspacerune(r))
+				return false;
+		}
 	}
 	if(sl_unlikely(pval == nil))
 		return true;
 	mpint *m = strtomp(tok, &end, base, nil);
 	if(m == nil)
 		return false;
-	if(end != tok+strlen(tok)){
+	if(*end != 0){
-		mpfree(m);
+		Rune r;
-		return false;
+		chartorune(&r, end);
+		if(!isspacerune(r)){
+			mpfree(m);
+			return false;
+		}
 	}
 	if(mpsignif(m) >= FIXNUM_BITS){
 		*pval = mk_bignum(m);
 	if(sl_unlikely(nc == 0))
 		cthrow(parse_error("unexpected char: #x%"PRIx32, c), c);
 terminate:
-	RS->buf[i++] = '\0';
+	RS->buf[i++] = 0;
 	return issym;
 }
 			}else
 				cthrow(parse_error( "invalid label: #%s%c", RS->buf, ch), dummy);
 			x = strtoll(RS->buf, &end, 10);
-			if(*end != '\0')
+			if(*end != 0)
 				cthrow(parse_error("invalid label: #%s%c", RS->buf, ch), dummy);
 			RS->tokval = fixnum(x);
 		}else if(sl_unlikely(c == '!')){
 				RS->tokval = mk_sym(RS->buf, true);
 			}else{
 				x = strtol(RS->buf, &end, 10);
-				if(*end != '\0' || RS->buf[0] == '\0')
+				if(*end != 0 || RS->buf[0] == 0)
 					cthrow(parse_error("invalid gensym label: #%s", RS->buf), dummy);
 				RS->tokval = fixnum(x);
 			}
 						break;
 					ios_getc(IO);
 				}
-				eseq[j] = '\0';
+				eseq[j] = 0;
 				r = strtol(eseq, nil, 8);
 				// \DDD and \xXX read bytes, not runes
 				buf[i++] = r;
 					eseq[j++] = c;
 					ios_getc(IO);
 				}
-				eseq[j] = '\0';
+				eseq[j] = 0;
 				if(j)
 					r = strtol(eseq, nil, 16);
 				if(!j || r > Runemax){

src/str.c+9−0

@@ -724,6 +724,15 @@ BUILTIN("str->num", str_2_num) · 723 unmodified lines
724	if(nargs != 1)	724	if(nargs != 1)
725	argcount(1);	725	argcount(1);
726	char s = tostr(args[0]), e;	726	char s = tostr(args[0]), e;
		727	for(;;){
		728	Rune r;
		729	int n = chartorune(&r, s);
		730	if(r == Runeerror)
		731	return sl_nil;
		732	if(!isspacerune(r))
		733	break;
		734	s += n;
		735	}
727	sl_v n;	736	sl_v n;
728	int base = 10;	737	int base = 10;
729	if(nonnil(values[0]))	738	if(nonnil(values[0]))

str->num: ignore leading and trailing whitespace

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code