yml2/yml2.py
changeset 58 a218553807ab
parent 57 2f4ad3800a3f
child 60 b19d0a86651b
--- a/yml2/yml2.py	Wed Feb 27 14:43:35 2019 +0100
+++ b/yml2/yml2.py	Wed Mar 18 19:20:01 2020 +0100
@@ -1,4 +1,4 @@
-# YML 2.5.10 language definition
+# YML 2.6.0 language definition
 
 # written by VB.
 
@@ -44,12 +44,12 @@
 macro = r(r"\%" + _symbol, re.U)
 reference = r(r"\&" + _symbol, re.U)
 
-NameStartChar = ur''':|[A-Z]|_|[a-z]|[\u00C0-\u00D6]|[\u00D8-\u00F6]|[\u00F8-\u02FF]|[\u0370-\u037D]|[\u037F-\u1FFF]|[\u200C-\u200D]|[\u2070-\u218F]|[\u2C00-\u2FEF]|[\u3001-\uD7FF]|[\uF900-\uFDCF]|[\uFDF0-\uFFFD]'''
-NameChar = NameStartChar + ur'''|-|\.|[0-9]|\u00B7|[\u0300-\u036F]|[\u203F-\u2040]'''
+NameStartChar = r''':|[A-Z]|_|[a-z]|[\u00C0-\u00D6]|[\u00D8-\u00F6]|[\u00F8-\u02FF]|[\u0370-\u037D]|[\u037F-\u1FFF]|[\u200C-\u200D]|[\u2070-\u218F]|[\u2C00-\u2FEF]|[\u3001-\uD7FF]|[\uF900-\uFDCF]|[\uFDF0-\uFFFD]'''
+NameChar = NameStartChar + r'''|-|\.|[0-9]|\u00B7|[\u0300-\u036F]|[\u203F-\u2040]'''
 
-_xmlSymbol = u"(" + NameStartChar + u")(" + NameChar + u")*"
+_xmlSymbol = "(" + NameStartChar + ")(" + NameChar + ")*"
 xmlSymbol = r(_xmlSymbol)
-aliasSymbol = r(ur"-|(" + _xmlSymbol + ur")")
+aliasSymbol = r(r"-|(" + _xmlSymbol + r")")
 
 literal = [r(r'""".*?"""', re.S), r(r"'''.*?'''", re.S), r(r"""0x[a-f0-9]+|-?\d+\.\d*|-?\.\d+|-?\d+|".*?"|'.*?'""")]
 filename = [("'", r(r"[^']*"), "'"), ('"', r(r'[^"]*'), '"'), r(r"[^\s;]+")]