aridity 64__tar.gz → 66__tar.gz

{aridity-64 → aridity-66}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aridity
-Version: 64
+Version: 66
 Summary: DRY config and template system, easily extensible with Python
 Home-page: https://github.com/combatopera/aridity
 Author: Andrzej Cichocki
@@ -148,10 +148,14 @@ home directory = $(~)
 
 : To get a literal dollar there is a special form for quoting:
 financial report = $'(We lost $100 on Friday.)
-: Be careful with nested brackets, the first matching bracket ends the special form:
+: Unlike in older versions, nested brackets (if any) do not end the special form early:
 behaviour
-    expected   = $'[Lunch cost $20 (worth it though).]
-    unexpected = $'(Lunch cost $20 (worth it though).)
+    expected = $'[Lunch cost $20 (worth it though).]
+    same     = $'(Lunch cost $20 (worth it though).)
+: Consequently, unbalanced brackets of the same kind as used by the special form must be avoided:
+interval
+    lower = $'[The interval ][$'[0, 1) includes 0 but not 1.]
+    upper = $'(The interval )($'(0, 1] includes 1 but not 0.)
 
 : Another special form can be used to preserve leading/trailing whitespace:
 padded bars = $.( $(foo) $(foo) )

{aridity-64 → aridity-66}/README.md

@@ -137,10 +137,14 @@ home directory = $(~)
 
 : To get a literal dollar there is a special form for quoting:
 financial report = $'(We lost $100 on Friday.)
-: Be careful with nested brackets, the first matching bracket ends the special form:
+: Unlike in older versions, nested brackets (if any) do not end the special form early:
 behaviour
-    expected   = $'[Lunch cost $20 (worth it though).]
-    unexpected = $'(Lunch cost $20 (worth it though).)
+    expected = $'[Lunch cost $20 (worth it though).]
+    same     = $'(Lunch cost $20 (worth it though).)
+: Consequently, unbalanced brackets of the same kind as used by the special form must be avoided:
+interval
+    lower = $'[The interval ][$'[0, 1) includes 0 but not 1.]
+    upper = $'(The interval )($'(0, 1] includes 1 but not 0.)
 
 : Another special form can be used to preserve leading/trailing whitespace:
 padded bars = $.( $(foo) $(foo) )

{aridity-64 → aridity-66}/aridity/grammar.py

@@ -17,13 +17,13 @@
 
 from .model import Blank, Boolean, Boundary, Call, Concat, Entry, nullmonitor, Number, Text
 from decimal import Decimal
-from functools import reduce
+from functools import partial, reduce
 from pyparsing import Forward, Literal, MatchFirst, NoMatch, OneOrMore, Optional, Regex, Suppress, ZeroOrMore
 import operator, re
 
 class AnyScalar:
 
-    numberpattern = re.compile('^-?(?:[0-9]+|[0-9]*[.][0-9]+)$')
+    numberpattern = re.compile('^-?(?:0|[1-9][0-9]*)([.][0-9]+)?$')
     booleans = {str(b).lower(): Boolean(b) for b in map(bool, range(2))}
 
     @classmethod
@@ -33,14 +33,33 @@ class AnyScalar:
             return cls.booleans[text]
         except KeyError:
             m = cls.numberpattern.search(text)
-            return Text(text) if m is None else Number((Decimal if '.' in text else int)(text))
+            return Text(text) if m is None or '-0' == text else Number((int if m.group(1) is None else Decimal)(text))
+
+def _gettext(notchars, pa):
+    return Regex(r"[^$\s%s]+" % re.escape(notchars)).leaveWhitespace().setParseAction(pa)
 
 def _getarg(callchain, scalarpa, boundarychars):
-    def gettext(pa):
-        return Regex(r"[^$\s%s]+" % re.escape(boundarychars)).leaveWhitespace().setParseAction(pa)
+    gettext = partial(_gettext, boundarychars)
     opttext = Optional(gettext(Text.pa))
     return (OneOrMore(opttext + callchain) + opttext | gettext(scalarpa)).setParseAction(Concat.smartpa)
 
+def _bracketed(callchain, blankpa, scalarpa, o, c):
+    gettext = partial(_gettext, o + c)
+    bracketed = Forward()
+    chainorbrackets = callchain | (Literal(o).setParseAction(Text.pa) + bracketed + Literal(c).setParseAction(Text.pa)).leaveWhitespace()
+    opttext = Optional(gettext(Text.pa))
+    concat = OneOrMore(opttext + chainorbrackets) + opttext
+    optblank = _getoptblank(blankpa, '')
+    bracketed << ZeroOrMore(optblank + (concat | gettext(scalarpa)).setParseAction(Concat.smartpa)) + optblank
+    return bracketed
+
+def _literalbracketed(o, c):
+    bracketed = Forward()
+    brackets = (Literal(o) + bracketed + Literal(c)).leaveWhitespace()
+    opttext = Regex("[^%s]*" % re.escape(o + c)).leaveWhitespace()
+    bracketed << ZeroOrMore(opttext + brackets) + opttext
+    return bracketed
+
 def _getoptblank(pa, boundarychars):
     return Optional(Regex(r"[^\S%s]+" % re.escape(boundarychars)).leaveWhitespace().setParseAction(pa))
 
@@ -82,10 +101,9 @@ class GFactory:
     def create(self, pa):
         def itercalls():
             def getbrackets(blankpa, scalarpa):
-                optblank = _getoptblank(blankpa, '')
-                return Literal(o) + ZeroOrMore(optblank + _getarg(callchain, scalarpa, c)) + optblank + Literal(c)
+                return Literal(o) + _bracketed(callchain, blankpa, scalarpa, o, c) + Literal(c)
             for o, c in self.bracketpairs:
-                yield (Suppress(Regex("[$](?:lit|')")) + Suppress(o) + Regex("[^%s]*" % re.escape(c)) + Suppress(c)).setParseAction(Text.pa)
+                yield (Suppress(Regex("[$](?:lit|')")) + Suppress(o) + _literalbracketed(o, c) + Suppress(c)).setParseAction(Text.joinpa)
                 yield (Suppress(Regex('[$](?:pass|[.])')) + getbrackets(Text.pa, Text.pa)).setParseAction(self._bracketspa)
                 yield (Suppress('$') + self.identifier + getbrackets(Blank.pa, AnyScalar.pa)).setParseAction(_principalcallpa)
                 yield (Suppress('$') + self.identifier + callchain).setParseAction(_additionalcallpa)

{aridity-64 → aridity-66}/aridity/model.py

@@ -132,6 +132,10 @@ class Scalar(BaseScalar):
 
 class Text(Cat, BaseScalar):
 
+    @classmethod
+    def joinpa(cls, s, l, t):
+        return cls(''.join(t))
+
     @classmethod
     def _of(cls, textvalue):
         return cls(textvalue)

{aridity-64 → aridity-66}/aridity/repl.py

@@ -28,7 +28,7 @@ class MalformedEntryException(Exception): pass
 
 class Repl:
 
-    quotablebysquare = re.compile('[$)]+')
+    quotablebysquare = re.compile('[$()]+')
 
     @classmethod
     def _quote(cls, obj): # TODO: Duplicates some wrap logic.

{aridity-64 → aridity-66}/aridity.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aridity
-Version: 64
+Version: 66
 Summary: DRY config and template system, easily extensible with Python
 Home-page: https://github.com/combatopera/aridity
 Author: Andrzej Cichocki
@@ -148,10 +148,14 @@ home directory = $(~)
 
 : To get a literal dollar there is a special form for quoting:
 financial report = $'(We lost $100 on Friday.)
-: Be careful with nested brackets, the first matching bracket ends the special form:
+: Unlike in older versions, nested brackets (if any) do not end the special form early:
 behaviour
-    expected   = $'[Lunch cost $20 (worth it though).]
-    unexpected = $'(Lunch cost $20 (worth it though).)
+    expected = $'[Lunch cost $20 (worth it though).]
+    same     = $'(Lunch cost $20 (worth it though).)
+: Consequently, unbalanced brackets of the same kind as used by the special form must be avoided:
+interval
+    lower = $'[The interval ][$'[0, 1) includes 0 but not 1.]
+    upper = $'(The interval )($'(0, 1] includes 1 but not 0.)
 
 : Another special form can be used to preserve leading/trailing whitespace:
 padded bars = $.( $(foo) $(foo) )

{aridity-64 → aridity-66}/setup.py

@@ -50,7 +50,7 @@ class SourceInfo:
 
         def buildrequires(self):
             if self.path.endswith('.pyx'):
-                yield 'Cython'
+                yield 'Cython<3'
 
         def make_ext(self):
             g = {}
@@ -136,7 +136,7 @@ def ext_modules():
 sourceinfo = SourceInfo('.')
 setuptools.setup(
         name = 'aridity',
-        version = '64',
+        version = '66',
         description = 'DRY config and template system, easily extensible with Python',
         long_description = long_description(),
         long_description_content_type = 'text/markdown',