kjuulh/rhai
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects Releases Wiki Activity

Fix bug in hex parsing for negative numbers.

Browse Source
This commit is contained in:
Stephen Chung
2021-12-18 17:07:30 +08:00
parent 10fa6844c4
commit 9736171089
5 changed files with 48 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/tokenizer.rs
View File

@@ -5,7 +5,7 @@ use crate::engine::{
KEYWORD_FN_PTR_CURRY, KEYWORD_IS_DEF_VAR, KEYWORD_PRINT, KEYWORD_THIS, KEYWORD_TYPE_OF,
};
use crate::func::native::OnParseTokenCallback;
use crate::{Engine, LexError, StaticVec, INT};
use crate::{Engine, LexError, StaticVec, INT, INT_BASE};
#[cfg(feature = "no_std")]
use std::prelude::v1::*;
use std::{
@@ -1507,7 +1507,8 @@ fn get_next_token_inner(
.filter(|&&c| c != NUMBER_SEPARATOR)
.collect();
INT::from_str_radix(&out, radix)
INT_BASE::from_str_radix(&out, radix)
.map(|v| v as INT)
.map(Token::IntegerConstant)
.unwrap_or_else(|_| {
Token::LexError(LERR::MalformedNumber(result.into_iter().collect()))
@@ -1515,7 +1516,9 @@ fn get_next_token_inner(
} else {
let out: String =
result.iter().filter(|&&c| c != NUMBER_SEPARATOR).collect();
let num = INT::from_str(&out).map(Token::IntegerConstant);
let num = INT_BASE::from_str(&out)
.map(|v| v as INT)
.map(Token::IntegerConstant);
// If integer parsing is unnecessary, try float instead
#[cfg(not(feature = "no_float"))]