diff options
Diffstat (limited to 'syntax')
| -rwxr-xr-x | syntax/def_Curie.py | 16 | ||||
| -rwxr-xr-x | syntax/def_PrefixDefinition.py | 16 | ||||
| -rwxr-xr-x | syntax/def_SEMPREFIX.py | 2 | ||||
| -rwxr-xr-x | syntax/def_SemWord.py | 4 | ||||
| -rwxr-xr-x | syntax/def_SemWords.py | 22 |
5 files changed, 33 insertions, 27 deletions
diff --git a/syntax/def_Curie.py b/syntax/def_Curie.py index 98a69c5..a78815b 100755 --- a/syntax/def_Curie.py +++ b/syntax/def_Curie.py @@ -6,13 +6,15 @@ from railroad import * Diagram( - Choice(0, - Sequence( - Choice(0, NonTerminal("CuriePrefix"), Skip() ), - (":") + Group(Sequence( + Choice(0, + Sequence( + Choice(0, NonTerminal("CuriePrefix"), Skip() ), + (":") + ), + Skip() ), - Skip() - ), - NonTerminal("CurieReference"), + NonTerminal("CurieReference") + )), type="complex" ).writeStandalone(sys.stdout.write) diff --git a/syntax/def_PrefixDefinition.py b/syntax/def_PrefixDefinition.py index c0e108a..d838c6b 100755 --- a/syntax/def_PrefixDefinition.py +++ b/syntax/def_PrefixDefinition.py @@ -6,12 +6,14 @@ from railroad import * Diagram( - "{", - NonTerminal("CuriePrefix"), - "}", - ":", - Choice(0, NonTerminal("_"), Skip()), - NonTerminal("SemWord"), - NonTerminal("NEWLINE"), + Group(Sequence( + "{", + NonTerminal("CuriePrefix"), + "}", + ":", + Choice(0, NonTerminal("_"), Skip()), + NonTerminal("SemWord"), + NonTerminal("NEWLINE") + )), type="complex" ).writeStandalone(sys.stdout.write) diff --git a/syntax/def_SEMPREFIX.py b/syntax/def_SEMPREFIX.py index cb7d555..c1048f0 100755 --- a/syntax/def_SEMPREFIX.py +++ b/syntax/def_SEMPREFIX.py @@ -6,6 +6,6 @@ from railroad import * Diagram( - "[.=]", + Group("[.=]"), type="complex" ).writeStandalone(sys.stdout.write) diff --git a/syntax/def_SemWord.py b/syntax/def_SemWord.py index d0768ad..243c707 100755 --- a/syntax/def_SemWord.py +++ b/syntax/def_SemWord.py @@ -6,7 +6,7 @@ from railroad import * Diagram( - Choice(0, + Group(Choice(0, Sequence( NonTerminal("SEMPREFIX"), "<", @@ -17,6 +17,6 @@ Diagram( NonTerminal("SEMPREFIX"), NonTerminal("CURIE"), ) - ), + )), type="complex" ).writeStandalone(sys.stdout.write) diff --git a/syntax/def_SemWords.py b/syntax/def_SemWords.py index dbf2a1d..83867ef 100755 --- a/syntax/def_SemWords.py +++ b/syntax/def_SemWords.py @@ -6,15 +6,17 @@ from railroad import * Diagram( - NonTerminal("SemWord"), - Choice(0, - OneOrMore( - Sequence( - NonTerminal("_"), - NonTerminal("SemWord") - ) - ), - Skip() - ), + Group(Sequence( + NonTerminal("SemWord"), + Choice(0, + OneOrMore( + Sequence( + NonTerminal("_"), + NonTerminal("SemWord") + ) + ), + Skip() + ) + )), type="complex" ).writeStandalone(sys.stdout.write) |