Skip to content

Commit d27fa15

Browse files
author
Gareth Aneurin Tribello
committed
Fixed bug with inputs that have:
KEYWORD=whatever# comment
1 parent 7d9fc48 commit d27fa15

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

PlumedToHTML/PlumedLexer.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ class PlumedLexer(RegexLexer):
3030
(r'(\w+)(=)(@\S+:)(\S+\b)', bygroups(Name.Attribute, Text, Name.Constant, Generic)),
3131
# Find KEYWORD with {} brackets around value
3232
(r'(\w+)(=)((?s)\{.*?\})', bygroups(Name.Attribute, Text, Generic)),
33+
# Find KEYWORD=whatever with comment immediately after end of whatever
34+
(r'(\w+)(=)(\S+)(#.*$)', bygroups(Name.Attribute, Text, Generic, Comment)),
3335
# Find KEYWORD=whatever
3436
(r'(\w+)(=)(\S+)(\s*)', bygroups(Name.Attribute, Text, Generic, Text))
3537
],

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
setuptools.setup(
88
name='PlumedToHTML',
9-
version='0.85',
9+
version='0.86',
1010
author="Gareth Tribello",
1111
author_email="gareth.tribello@gmail.com",
1212
description="A package for creating pretified HTML for PLUMED files",

tdata/lexertests.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,10 @@
103103
{
104104
"input": "RESTRAINT ... \n ARG=d,t \n AT=@replicas:{\n {1.0,2.0}\n {3.0,4.0}\n {5.0,6.0}\n}\n KAPPA=1.0,3.0\n ...",
105105
"output": "<div class=\"highlight\"><pre><span></span><span class=\"k\">RESTRAINT</span> ... \n <span class=\"na\">ARG</span>=<span class=\"g\">d,t</span> \n <span class=\"na\">AT</span>=<span class=\"no\">@replicas:</span><span class=\"g\">{</span>\n<span class=\"g\"> {1.0,2.0}</span>\n<span class=\"g\"> {3.0,4.0}</span>\n<span class=\"g\"> {5.0,6.0}</span>\n<span class=\"g\">}</span>\n <span class=\"na\">KAPPA</span>=<span class=\"g\">1.0,3.0</span>\n ...\n</pre></div>\n"
106+
},
107+
{
108+
"input": "p1: FIXEDATOM AT=2.696525,2.75872,13.5# Identify",
109+
"output": "<div class=\"highlight\"><pre><span></span><span class=\"s\">p1</span>: <span class=\"k\">FIXEDATOM</span> <span class=\"na\">AT</span>=<span class=\"g\">2.696525,2.75872,13.5</span><span class=\"c\"># Identify</span>\n</pre></div>\n"
106110
}
107111
]
108112
}

0 commit comments

Comments
 (0)