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

support pure type hints

Browse Source
This commit is contained in:
blueloveTH 2023-09-07 23:07:04 +08:00
parent 8271eb79c2
commit bf6aaa66fb
4 changed files with 41 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/pocketpy/expr.h
View File

@ -22,6 +22,7 @@ struct Expr{
virtual bool is_compare() const { return false; } virtual bool is_compare() const { return false; }
virtual int star_level() const { return 0; } virtual int star_level() const { return 0; }
virtual bool is_tuple() const { return false; } virtual bool is_tuple() const { return false; }
virtual bool is_name() const { return false; }
bool is_starred() const { return star_level() > 0; } bool is_starred() const { return star_level() > 0; }
std::string str() const { PK_ASSERT(false); } std::string str() const { PK_ASSERT(false); }
@ -73,6 +74,7 @@ struct NameExpr: Expr{
void emit(CodeEmitContext* ctx) override; void emit(CodeEmitContext* ctx) override;
bool emit_del(CodeEmitContext* ctx) override; bool emit_del(CodeEmitContext* ctx) override;
bool emit_store(CodeEmitContext* ctx) override; bool emit_store(CodeEmitContext* ctx) override;
bool is_name() const override { return true; }
}; };
struct InvertExpr: Expr{ struct InvertExpr: Expr{

24
src/compiler.cpp
View File

@ -862,17 +862,29 @@ __EAT_DOTS_END:
default: { default: {
advance(-1); // do revert since we have pre-called advance() at the beginning advance(-1); // do revert since we have pre-called advance() at the beginning
EXPR_TUPLE(); EXPR_TUPLE();
// eat variable's type hint
if(match(TK(":"))) consume_type_hints(); bool is_typed_name = false; // e.g. x: int
// eat variable's type hint if it is a single name
if(ctx()->s_expr.top()->is_name()){
if(match(TK(":"))){
consume_type_hints();
is_typed_name = true;
}
}
if(!try_compile_assignment()){ if(!try_compile_assignment()){
if(!ctx()->s_expr.empty() && ctx()->s_expr.top()->is_starred()){ if(!ctx()->s_expr.empty() && ctx()->s_expr.top()->is_starred()){
SyntaxError(); SyntaxError();
} }
ctx()->emit_expr(); if(!is_typed_name){
if((mode()==CELL_MODE || mode()==REPL_MODE) && name_scope()==NAME_GLOBAL){ ctx()->emit_expr();
ctx()->emit(OP_PRINT_EXPR, BC_NOARG, BC_KEEPLINE); if((mode()==CELL_MODE || mode()==REPL_MODE) && name_scope()==NAME_GLOBAL){
ctx()->emit(OP_PRINT_EXPR, BC_NOARG, BC_KEEPLINE);
}else{
ctx()->emit(OP_POP_TOP, BC_NOARG, BC_KEEPLINE);
}
}else{ }else{
ctx()->emit(OP_POP_TOP, BC_NOARG, BC_KEEPLINE); PK_ASSERT(ctx()->s_expr.size() == 1)
ctx()->s_expr.pop();
} }
} }
consume_end_stmt(); consume_end_stmt();

2
tests/40_class.py
View File

@ -98,4 +98,4 @@ class A(c.void_p):
pass pass
a = A() a = A()
assert repr(a).startswith('<void* at') assert repr(a).startswith('<void* at')

20
tests/80_typing.py
View File

@ -72,3 +72,23 @@ def is_success(value) -> bool:
resp = {'code': 0, 'message': 'OK', 'data': []} resp = {'code': 0, 'message': 'OK', 'data': []}
successed: bool = converter(resp['message'], mapper=is_success, default=False) successed: bool = converter(resp['message'], mapper=is_success, default=False)
class A:
x: List[Callable[[int], Any]]
y: Dict[str, int]
a = A()
assert not hasattr(a, 'x')
assert not hasattr(a, 'y')
class B:
x: List[Callable[[int], Any]] = []
y: Dict[str, int] = {}
b = B()
assert hasattr(b, 'x')
assert hasattr(b, 'y')
abc123: int
assert 'abc123' not in globals()