Skip to content

Partial fix for quoting issue for strings (mis-interpreted ; in NCrystal cfg-string) #74

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
willend wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Partial fix for quoting issue for strings (mis-interpreted ; in NCrystal cfg-string) #74

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94ffe43
Partial fix for quoting issue for strings (mis-interpreted ; in ncrys…
willend Sep 14, 2023
b19c071
Merge branch 'PaNOSC-ViNYL:master' into master
willend Feb 10, 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
10 changes: 10 additions & 0 deletions mcstasscript/interface/instr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import subprocess
import copy
import warnings
import re

from IPython.display import IFrame

Expand Down Expand Up @@ -731,6 +732,15 @@ def add_parameter(self, *args, **kwargs):
raise NameError(f"A parameter or variable with name '{par.name}'"
f" already exists!")

# Sanitize and quote strings
if par.type == 'string':
if not par.value[0]=='"':
par.value = '"' + par.value
if not par.value[-1]=='"':
par.value = par.value + '"'
par.value = re.sub(";","\;",par.value);
par.value = re.sub("\n","\\n;",par.value);

self.parameters.add(par)

return par
Expand Down