diff --git a/README.md b/README.md index 3423a2a3a34ac5a48c0fec91eb4a1bd3ede802aa..fcd6e1d92c15fe4d6e7dd611126867d76810f7ff 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ Dependencies | [matplotlib](http://matplotlib.org/) | 1.4.3 | | [nibabel](http://nipy.org/nibabel/) | 1.3.0 | | [Pillow](https://python-pillow.github.io/) | 2.5.3 | -| [PyParsing](http://pyparsing.wikispaces.com/) | 2.0.3 | +| [PyParsing](http://pyparsing.wikispaces.com/) | 2.1.0 | | [Jinja2](http://jinja.pocoo.org/) | 2.8 | | [wxPython](http://wxpython.org/) | 3.0.2.0 | | [OSMesa](http://mesa3d.org/) | 8.0.5 | diff --git a/fsl/fsleyes/gl/shaders/glsl/parse.py b/fsl/fsleyes/gl/shaders/glsl/parse.py index 7fff5d14d908988a6455e18f6961473ebc1e2fe0..1b3ee4a64aa0cfa04f3fdb71afa701eafce7d5ff 100644 --- a/fsl/fsleyes/gl/shaders/glsl/parse.py +++ b/fsl/fsleyes/gl/shaders/glsl/parse.py @@ -127,7 +127,7 @@ def getDeclarations(code): # Value VALUE = (EXPRESSION | pp.Word(pp.alphanums + '_()+-/*')).setParseAction( - pp.keepOriginalText) + pp.originalTextFor) # Single declaration VARIABLE = (IDENTIFIER.setResultsName('name') +