X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=toke.c;h=817747630c9937faa30160b9f93d6bf3a1fd1e9b;hb=c22a0cd5b5367764e384c02fc6f17451ad760484;hp=ac74ba089f5e852ffae480d95ecc06c302ac48ee;hpb=65f190625df5c430dbe5dc68ccef865b33839973;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/toke.c b/toke.c
index ac74ba0..8177476 100644
--- a/toke.c
+++ b/toke.c
@@ -3958,7 +3958,8 @@ Perl_yylex(pTHX)
 		s += 2;
 		d = s;
 		s = scan_word(s, PL_tokenbuf, sizeof PL_tokenbuf, FALSE, &len);
-		tmp = keyword(PL_tokenbuf, len);
+		if (!(tmp = keyword(PL_tokenbuf, len)))
+		    Perl_croak(aTHX_ "CORE::%s is not a keyword", PL_tokenbuf);
 		if (tmp < 0)
 		    tmp = -tmp;
 		goto reserved_word;
@@ -6978,22 +6979,14 @@ Perl_scan_num(pTHX_ char *start)
 	 */
 
 	if (!floatit) {
-	    char *tp;
     	    IV iv;
     	    UV uv;
 	    errno = 0;
-#ifdef USE_64_BIT_INT
-	    if (*PL_tokenbuf == '-')
-		iv = strtoll(PL_tokenbuf,&tp,10);
-	    else
-		uv = strtoull(PL_tokenbuf,&tp,10);
-#else
 	    if (*PL_tokenbuf == '-')
-		iv = strtol(PL_tokenbuf,&tp,10);
+		iv = Atol(PL_tokenbuf);
 	    else
-		uv = strtoul(PL_tokenbuf,&tp,10);
-#endif
-	    if (*tp || errno)
+		uv = Atoul(PL_tokenbuf);
+	    if (errno)
 	    	floatit = TRUE; /* probably just too large */
 	    else if (*PL_tokenbuf == '-')
 	    	sv_setiv(sv, iv);
@@ -7003,12 +6996,8 @@ Perl_scan_num(pTHX_ char *start)
 	if (floatit) {
 	    char *tp;
 	    errno = 0;
-#ifdef USE_LONG_DOUBLE
-	    value = strtold(PL_tokenbuf,&tp);
-#else
-	    value = strtod(PL_tokenbuf,&tp);
-#endif
-	    if (*tp || errno)
+	    value = Atof(PL_tokenbuf);
+	    if (errno)
 		Perl_die(aTHX_ "unparseable float");
 	    else
 	    	sv_setnv(sv, value);