Zxc200611/pocketpy
1
0
Fork 0
mirror of https://github.com/pocketpy/pocketpy synced 2025-10-20 03:20:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

bug workaround on MacOS

Browse Source 
Number::stoi may raise std::out_of_range but it cannot be caught via catch(std::exception&). We use catch(...) for now. Note that catch(...) may catch pkpy::Exception or any others.
This commit is contained in:
BLUELOVETH 2023-07-03 15:02:58 +08:00
parent e0c7b33434
commit d4696d6931
4 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -27,4 +27,6 @@ main.obj
pocketpy.exp pocketpy.exp
pocketpy.lib pocketpy.lib
APPS APPS
build build
pocketpy.dSYM

2
build.py
View File

@ -15,7 +15,7 @@ main_src_arg = " ".join(src_file_list+["src2/main.cpp"])
print(main_src_arg) print(main_src_arg)
linux_common = " -Wfatal-errors --std=c++17 -O2 -Wall -fno-rtti -stdlib=libc++ -Iinclude/ " linux_common = " -Wfatal-errors --std=c++17 -O1 -Wall -fno-rtti -stdlib=libc++ -Iinclude/ "
linux_cmd = "clang++ -o pocketpy " + main_src_arg + linux_common linux_cmd = "clang++ -o pocketpy " + main_src_arg + linux_common
if "web" in sys.argv: if "web" in sys.argv:

13
src/lexer.cpp
View File

@ -217,7 +217,7 @@ namespace pkpy{
char code; char code;
try{ try{
code = (char)Number::stoi(hex, &parsed, 16); code = (char)Number::stoi(hex, &parsed, 16);
}catch(std::invalid_argument&){ }catch(...){
SyntaxError("invalid hex char"); SyntaxError("invalid hex char");
} }
if (parsed != 2) SyntaxError("invalid hex char"); if (parsed != 2) SyntaxError("invalid hex char");
@ -259,21 +259,24 @@ namespace pkpy{
return; return;
} }
if(m[1].matched && m[2].matched){
SyntaxError("hex literal should not contain a dot");
}
try{ try{
int base = 10; int base = 10;
size_t size; size_t size;
if (m[1].matched) base = 16; if (m[1].matched) base = 16;
if (m[2].matched) { if (m[2].matched) {
if(base == 16) SyntaxError("hex literal should not contain a dot"); PK_ASSERT(base == 10);
add_token(TK("@num"), Number::stof(m[0], &size)); add_token(TK("@num"), Number::stof(m[0], &size));
} else { } else {
add_token(TK("@num"), Number::stoi(m[0], &size, base)); add_token(TK("@num"), Number::stoi(m[0], &size, base));
} }
PK_ASSERT((int)size == (int)m.length()); PK_ASSERT((int)size == (int)m.length());
}catch(std::exception& e){ }catch(...){
PK_UNUSED(e);
SyntaxError("invalid number literal"); SyntaxError("invalid number literal");
} }
} }
bool Lexer::lex_one_token() { bool Lexer::lex_one_token() {

6
src/pocketpy.cpp
View File

@ -308,9 +308,9 @@ void init_builtins(VM* _vm) {
try{ try{
size_t parsed = 0; size_t parsed = 0;
i64 val = Number::stoi(s.str(), &parsed, base); i64 val = Number::stoi(s.str(), &parsed, base);
if(parsed != s.length()) throw std::invalid_argument("<?>"); PK_ASSERT(parsed == s.length());
return VAR(val); return VAR(val);
}catch(std::invalid_argument&){ }catch(...){
vm->ValueError("invalid literal for int(): " + s.escape()); vm->ValueError("invalid literal for int(): " + s.escape());
} }
} }
@ -368,7 +368,7 @@ void init_builtins(VM* _vm) {
try{ try{
f64 val = Number::stof(s.str()); f64 val = Number::stof(s.str());
return VAR(val); return VAR(val);
}catch(std::invalid_argument&){ }catch(...){
vm->ValueError("invalid literal for float(): " + s.escape()); vm->ValueError("invalid literal for float(): " + s.escape());
} }
} }