Skip to content

MADX sequence parser #62

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 4 commits into
base: main
Choose a base branch
from
Draft

MADX sequence parser #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1f10a91
initial sequence parser
felix-andreas Jun 19, 2020
1faf32f
Merge branch 'master' into madx-sequence
felix-andreas Jun 19, 2020
2989290
update
felix-andreas Jun 19, 2020
2cfc0ca
Merge branch 'main' into madx-sequence
felix-andreas May 18, 2021
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
6 changes: 4 additions & 2 deletions latticejson/madx.lark
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,19 @@ string : ESCAPED_STRING
word : /[\w\.]+/

start : (_statement ";")*
_statement : element | lattice | command | assignment
_statement : element | lattice | sequence | command | assignment

element : word ":" [word] ("," attribute)* ","?
attribute : word ("=" | ":=") (expr | string)


lattice : word ":" "LINE"i "=" arrangement
arrangement : [int "*"] [/-/] "(" object ("," object)* ")"
?object : ref_name | arrangement
ref_name : [int "*"] [/-/] word

sequence : word ":" "SEQUENCE"i ("," attribute)* ";" seq_elements "ENDSEQUENCE"i
seq_elements: (element ";")*

command : word ("," (word | string | attribute))*

// Arithmeitc Expressions
Expand Down
10 changes: 8 additions & 2 deletions latticejson/parse.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,8 @@ def transform(self, tree):
string = lambda self, item: item[1:-1]

def element(self, name, type_, *attributes):
self.elements[name.lower()] = type_.lower(), dict(attributes)
self.elements[name.upper()] = type_.upper(), dict(attributes)
return name

def attribute(self, name, value):
return name.lower(), value
Expand Down Expand Up @@ -150,7 +151,12 @@ def command(self, *items):

@v_args(inline=True)
class MADXTransformer(ArithmeticTransformer, AbstractLatticeFileTransformer):
pass
def sequence(self, name, *items):
*attributes, elements = items
self.lattices[name.upper()] = elements

def seq_elements(self, *elements):
return list(elements)


@v_args(inline=True)
Expand Down