Parse EXTENDS/RESTRICTS with shape references; fix chardet decode crash

pyshexc/ShExC.py

@@ -116,7 +116,7 @@ def shapeDecl(self, shapeDecl: ShExJ.ShapeDecl) -> list[str]:
         rval .append(self.shapeExprLabel(shapeDecl.id))
         if shapeDecl.restricts:
             for lbl in shapeDecl.restricts:
-                rval += ['RESTRICTS ' + self.shapeExprLabel(lbl)]
+                rval += ["RESTRICTS @" + self.shapeExprLabel(lbl)]
         rval += self.shapeExpr(shapeDecl.shapeExpr)
         return rval
 
@@ -155,7 +155,7 @@ def shape(self, shape: ShExJ.Shape) -> list[str]:
         rval = [self.shapeExprLabel(shape.id)]
         if shape.extends is not None:
             for lbl in shape.extends:
-                rval += ['EXTENDS ' + self.shapeExprLabel(lbl)]
+                rval += ["EXTENDS @" + self.shapeExprLabel(lbl)]
         if shape.extra is not None:
             rval += ['EXTRA'] + [self.iriref(e) for e in shape.extra]
         if shape.closed:

pyshexc/parser/ShExDocLexer.py

@@ -1,8 +1,11 @@
-# Generated from ShExDoc.g4 by ANTLR 4.9
+# Generated from ShExDoc.g4 by ANTLR 4.9.3
 from antlr4 import *
 from io import StringIO
-from typing import TextIO
 import sys
+if sys.version_info[1] > 5:
+    from typing import TextIO
+else:
+    from typing.io import TextIO
 
 
 
@@ -572,7 +575,7 @@ class ShExDocLexer(Lexer):
 
     def __init__(self, input=None, output:TextIO = sys.stdout):
         super().__init__(input, output)
-        self.checkVersion("4.9")
+        self.checkVersion("4.9.3")
         self._interp = LexerATNSimulator(self, self.atn, self.decisionsToDFA, PredictionContextCache())
         self._actions = None
         self._predicates = None