Skip to content

allow ident's in array dimension #234

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

Merged
arun3688 merged 3 commits into from
Dec 6, 2024
Merged

allow ident's in array dimension #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a44f0ab
allow ident's in array dimension
arun3688 Dec 6, 2024
3af0318
fix test
arun3688 Dec 6, 2024
74a6c16
fix test
arun3688 Dec 6, 2024
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
7 changes: 3 additions & 4 deletions OMPython/OMTypedParser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,13 +97,12 @@ def evaluateExpression(s, loc, toks):
try:
# Evaluate the expression safely
return eval(expr)
except Exception as e:
print(f"Error evaluating expression: {expr}")
return None
except NameError:
return expr

# Number parsing (supports arithmetic expressions in dimensions) (e.g., {1 + 1, 1})
arrayDimension = infixNotation(
Word(nums),
Word(alphas + "_", alphanums + "_") | Word(nums),
[
(Word("+-", exact=1), 1, opAssoc.RIGHT),
(Word("*/", exact=1), 2, opAssoc.LEFT),
Expand Down
6 changes: 6 additions & 0 deletions tests/test_ArrayDimension.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,12 @@ def test_ArrayDimension(self):
result = omc.sendExpression("getComponents(A)")
assert result[0][-1] == (6,7), f"array dimension does not match the expected value. Got: {result[0][-1]}, Expected: {(6, 7)}"

omc.sendExpression("loadString(\"model A Integer y = 5; Integer x[y+1,1+9]; end A;\")")
omc.sendExpression("getErrorString()")

result = omc.sendExpression("getComponents(A)")
assert result[-1][-1] == ('y + 1', 10), f"array dimension does not match the expected value. Got: {result[-1][-1]}, Expected: {('y + 1', 10)}"

omc.__del__()
shutil.rmtree(tempdir, ignore_errors= True)

Loading