aridity 88__tar.gz → 90__tar.gz

{aridity-88 → aridity-90}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aridity
-Version: 88
+Version: 90
 Summary: DRY config and template system, easily extensible with Python
 Home-page: https://pypi.org/project/aridity/
 Author: foyono

{aridity-88 → aridity-90}/aridity/directives.py

@@ -1,5 +1,6 @@
 from .model import Stream
 from .search import resolvedscopeornone
+from itertools import chain
 import os, sys, unicodedata
 
 def acceptdirectivename(word):
@@ -27,13 +28,27 @@ def _write(prefix, suffix, scope):
 def source(prefix, suffix, scope):
     'Include path or resource at prefix.'
     # XXX: Use full algo to get phrasescope?
+    def rootscopes():
+        for s in chain.from_iterable(phrasescope.scopedepths()):
+            if [staticscope] == s.parents:
+                yield s
+    staticscope = scope.staticscope()
     phrasescope = scope
-    for word in prefix.topath(scope):
-        s = resolvedscopeornone(phrasescope, [word])
+    wordresolvables = prefix.words()
+    k = 0
+    n = len(wordresolvables)
+    for i, r in enumerate(wordresolvables):
+        wordobj = r.resolve(scope)
+        if staticscope.rootscopekey is wordobj.scalar:
+            scope, = rootscopes()
+            phrasescope = scope
+            k = i + 1
+            continue
+        s = resolvedscopeornone(phrasescope, [wordobj.totext().textvalue])
         if s is None:
             break
         phrasescope = s
-    suffix.tophrase().resolve(phrasescope).openable(phrasescope).source(scope, prefix)
+    suffix.tophrase().resolve(phrasescope).openable(phrasescope).source(scope, prefix.subentry(k, n))
 
 @prime
 def _cd(prefix, suffix, scope):

{aridity-88 → aridity-90}/aridity/functions.py

@@ -108,6 +108,12 @@ def map_(scope, objsresolvable, *args):
         result.resolvables.put(k, resolvable.resolve(context(k, v)))
     return result
 
+def map1(scope, contextresolvable, resultresolvable):
+    from .scope import ScalarScope, Scope
+    context = contextresolvable.resolve(scope)
+    # FIXME: In scalar context case we need to propagate its resolve context.
+    return resultresolvable.resolve(Scope([context, scope]) if hasattr(context, 'resolvables') else ScalarScope([scope], context))
+
 def _flat(scope, listsresolvable):
     from .scope import Scope
     s = Scope(islist = True) # XXX: Really no parent?
@@ -211,9 +217,6 @@ def pyres(scope, packageresolvable, nameresolvable, encoding = Text('ascii')):
 def _not(scope, resolvable):
     return Boolean(not resolvable.resolve(scope).truth())
 
-def _getfrom(scope, scoperesolvable, *resolvables):
-    return scoperesolvable.resolve(scope).resolved(*(r.resolve(scope).textvalue for r in resolvables))
-
 def _indentmorelines(scope, resolvable):
     indent = scope.resolved('indent').textvalue
     lines = resolvable.resolve(scope).textvalue.splitlines(True)
@@ -265,6 +268,7 @@ def corefunctions():
     yield 'tomlquote', tomlquote
     yield 'urlquote', urlquote
     yield 'map', map_
+    yield 'map1', map1
     yield 'flat', _flat
     yield 'label', _label
     yield 'join', join
@@ -283,7 +287,6 @@ def corefunctions():
     yield 'pyref', pyref
     yield 'pyres', pyres
     yield '\N{NOT SIGN}', _not
-    yield 'getfrom', _getfrom
     yield 'indentmorelines', _indentmorelines
     yield 'hole', _hole
     yield '', getimpl # TODO: Refer to the other one.

{aridity-88 → aridity-90}/aridity/scope.py

@@ -206,6 +206,7 @@ class AbstractScope(Resolvable): # TODO LATER: Some methods should probably be m
 
 class StaticScope(AbstractScope):
 
+    rootscopekey = OpaqueKey()
     stacktypes = dict(here = SimpleStack, indent = IndentStack)
 
     def __init__(self):
@@ -224,6 +225,7 @@ class StaticScope(AbstractScope):
         self['*',] = Star()
         self['None',] = Scalar(None)
         self['eolhole',] = Hole(Text(''), '\n')
+        self['^',] = Scalar(self.rootscopekey)
         for name in self.stacktypes:
             self[name,] = ThreadLocalResolvable(self.threadlocals, name)
 

{aridity-88 → aridity-90}/aridity.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aridity
-Version: 88
+Version: 90
 Summary: DRY config and template system, easily extensible with Python
 Home-page: https://pypi.org/project/aridity/
 Author: foyono

{aridity-88 → aridity-90}/setup.py

@@ -49,7 +49,7 @@ class SourceInfo:
 sourceinfo = SourceInfo('.')
 setup(
     name = 'aridity',
-    version = '88',
+    version = '90',
     description = 'DRY config and template system, easily extensible with Python',
     url = 'https://pypi.org/project/aridity/',
     author = 'foyono',