Skip to content

Accept filename and fileName in omc messages #487

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

Open
adrpo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Accept filename and fileName in omc messages #487

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion OMPython/om_session_omc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,7 @@ def sendExpression(self, expr: str, parsed: bool = True, raise_on_error: bool =
if not self._re_log_raw:
self._re_log_raw = re.compile(
pattern=r"\s*info = record OpenModelica\.Scripting\.SourceInfo\n"
r"\s*filename = \"(.*?)\",\n"
r"\s*file[nN]ame = \"(.*?)\",\n" # older omc: filename, newer: fileName
r"\s*readonly = (.*?),\n"
r"\s*lineStart = (\d+),\n"
r"\s*columnStart = (\d+),\n"
Expand Down
9 changes: 9 additions & 0 deletions tests/test_OMSessionCmd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import pytest

import OMPython


Expand All @@ -18,3 +20,10 @@ def test_isPackage2():


# TODO: add more checks ...


def test_error_message_file():
# omc names the file field of a message filename or fileName (OpenModelica issue 17891)
omcs = OMPython.OMCSessionLocal()
with pytest.raises(OMPython.OMSessionException, match=r"\[bad\.mo:"):
omcs.sendExpression('loadString("model M Real x = ; end M;", "bad.mo")')
Loading