Skip to content

[Lang] Explicit new variable and hide variable #8662

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions python/taichi/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
# Issue#2223: Do not reorder, or we're busted with partially initialized module
from taichi import aot # isort:skip

from taichi.lang.ast.hint import new, hide


def __getattr__(attr):
if attr == "cfg":
Expand Down
28 changes: 18 additions & 10 deletions python/taichi/lang/ast/ast_transformer.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
from taichi.lang._ndrange import _Ndrange, ndrange
from taichi.lang.argpack import ArgPackType
from taichi.lang.ast.ast_transformer_utils import Builder, LoopStatus, ReturnStatus
from taichi.lang.ast import hint
from taichi.lang.ast.symbol_resolver import ASTResolver
from taichi.lang.exception import (
TaichiIndexError,
Expand Down Expand Up @@ -105,18 +106,25 @@ def build_assign_annotated(ctx, target, value, is_static_assign, annotation):
f'Kernel argument "{target.id}" is immutable in the kernel. '
f"If you want to change its value, please create a new variable."
)
anno = impl.expr_init(annotation)
if is_static_assign:
raise TaichiSyntaxError("Static assign cannot be used on annotated assignment")
if is_local and not ctx.is_var_declared(target.id):
var = ti_ops.cast(value, anno)
var = impl.expr_init(var)
if annotation is hint.new:
var = impl.expr_init(value)
ctx.create_variable(target.id, var)
elif annotation is hint.hide:
var = impl.expr_init(value)
ctx.hide_variable(target.id, var)
else:
var = build_stmt(ctx, target)
if var.ptr.get_rvalue_type() != anno:
raise TaichiSyntaxError("Static assign cannot have type overloading")
var._assign(value)
anno = impl.expr_init(annotation)
if is_static_assign:
raise TaichiSyntaxError("Static assign cannot be used on annotated assignment")
if is_local and not ctx.is_var_declared(target.id):
var = ti_ops.cast(value, anno)
var = impl.expr_init(var)
ctx.create_variable(target.id, var)
else:
var = build_stmt(ctx, target)
if var.ptr.get_rvalue_type() != anno:
raise TaichiSyntaxError("Static assign cannot have type overloading")
var._assign(value)
return var

@staticmethod
Expand Down
9 changes: 7 additions & 2 deletions python/taichi/lang/ast/ast_transformer_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -240,10 +240,15 @@ def is_var_declared(self, name):
return False

def create_variable(self, name, var):
if name in self.current_scope():
raise TaichiSyntaxError("Recreating variables is not allowed")
# if name in self.current_scope():
# raise TaichiSyntaxError("Recreating variables is not allowed")
self.current_scope()[name] = var

def hide_variable(self, name, var):
for s in reversed(self.local_scopes):
if name in s:
s[name] = var

def check_loop_var(self, loop_var):
if self.is_var_declared(loop_var):
raise TaichiSyntaxError(
Expand Down
5 changes: 5 additions & 0 deletions python/taichi/lang/ast/hint.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
from typing import Any


type new = Any
type hide = Any
Loading