fix issue with comments before }

Author: prohde

DeTrusty/Sparql/Parser/queryParser.py

@@ -193,7 +193,6 @@ def t_ID(t):
 t_UNSIGNEDBYTE = r"xsd\:unsignedByte"
 t_POSITIVEINT = r"xsd\:positiveInteger"
 t_ignore = ' \t\n'
-t_ignore_comment = r'[ ]*\#.*'
 
 xsd = "http://www.w3.org/2001/XMLSchema#"
 
@@ -210,6 +209,18 @@ def t_newline(t):
     t.lexer.lineno += len(t.value)
 
 
+def t_COMMENT(t):
+    # r'[ ]*\#.*'
+    r'(\s*\#.*)|(\.[\s\n]*\#.*\n[\s\n]*\})'
+    if (t.value[0] == '.') and (t.value[-1] == '}'):
+        # Special case when comment in last line before a '}' and the line is terminated with '.'
+        t.value = '}'
+        t.type = 'RKEY'
+        return t
+        pass
+    else:
+        pass
+
 lexer = lex.lex()
 
 

README.md

@@ -29,9 +29,6 @@ This list might not be exhaustive. Please, let us know if we missed something.
 
 If you want to know more, check out the [documentation](https://sdm-tib.github.io/DeTrusty/).
 
-Known issues:
-- Query parser throws an error if the last line before a `}` includes a comment
-
 ## Running DeTrusty
 You can use DeTrusty as a Python3 library or a Web-based service using Docker.
 The documentation includes detailed examples and explanations for both scenarios.

docs/index.rst

@@ -40,9 +40,6 @@ Please, let us know if we missed something.
 * Built-in functions, e.g., ``isIRI``, ``STRLEN``, ``abs``, ``floor``, ``now``, ``month``, ``MD5``
 * Specifying RDF datasets using ``FROM``, ``FROM NAMES``, or ``GRAPH``
 
-Known issues:
-- Query parser throws an error if the last line before a ``}`` includes a comment
-
 .. toctree::
    :hidden: