Skip to content

EvaluationMapper: preserve Subscript #224

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.

Sign up for GitHub

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

EvaluationMapper: preserve Subscript #224

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 11 additions & 4 deletions pymbolic/mapper/evaluator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@

from __future__ import annotations

from pytools import ndindex


__copyright__ = "Copyright (C) 2009-2013 Andreas Kloeckner"

Expand Down Expand Up @@ -41,6 +39,8 @@

from typing_extensions import override

from pytools import ndindex

from pymbolic.mapper import CachedMapper, CSECachingMapperMixin, Mapper, ResultT


Expand All @@ -53,7 +53,7 @@
import pymbolic.primitives as p
from pymbolic.geometric_algebra import MultiVector
from pymbolic.rational import Rational
from pymbolic.typing import Expression
from pymbolic.typing import ArithmeticExpression, Expression


class UnknownVariableError(Exception):
Expand Down Expand Up @@ -116,7 +116,14 @@

@override
def map_subscript(self, expr: p.Subscript, /) -> ResultT:
return self.rec(expr.aggregate)[self.rec(expr.index)]
agg = self.rec(expr.aggregate)
index = self.rec(expr.index)
from pymbolic.primitives import EmptyOK, ExpressionNode
if isinstance(agg, ExpressionNode):
return cast("ResultT",
agg[EmptyOK(cast("ArithmeticExpression", index))])
else:
return agg[index] # pyright: ignore[reportIndexIssue]

Check warning on line 126 in pymbolic/mapper/evaluator.py

View workflow job for this annotation

GitHub Actions / basedpyright 

Return type is unknown (reportUnknownVariableType)

@override
def map_lookup(self, expr: p.Lookup, /) -> ResultT:
Expand Down
Loading