aridity 85__tar.gz → 86__tar.gz

{aridity-85 → aridity-86}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aridity
-Version: 85
+Version: 86
 Summary: DRY config and template system, easily extensible with Python
 Home-page: https://pypi.org/project/aridity/
 Author: foyono
@@ -354,57 +354,56 @@ Yield values only. Iterate over `-self` for keys and values.
 
 ### aridity.directives
 
-<a id="aridity.directives.Colon"></a>
+<a id="aridity.directives.colon"></a>
 
-#### Colon Objects
+###### colon
 
 ```python
-@_directive
-class Colon()
+def colon(prefix, suffix, scope)
 ```
 
 Ignore rest of logical line.
 
-<a id="aridity.directives.Source"></a>
+<a id="aridity.directives.source"></a>
 
-#### Source Objects
+###### source
 
 ```python
-@_directive
-class Source()
+@prime
+def source(prefix, suffix, scope)
 ```
 
 Include path or resource at prefix.
 
-<a id="aridity.directives.Equals"></a>
+<a id="aridity.directives.equals"></a>
 
-#### Equals Objects
+###### equals
 
 ```python
-@_directive
-class Equals()
+@prime
+def equals(prefix, suffix, scope)
 ```
 
 Assign expression to path.
 
-<a id="aridity.directives.ColonEquals"></a>
+<a id="aridity.directives.colonequals"></a>
 
-#### ColonEquals Objects
+###### colonequals
 
 ```python
-@_directive
-class ColonEquals()
+@prime
+def colonequals(prefix, suffix, scope)
 ```
 
 Evaluate expression and assign result to path.
 
-<a id="aridity.directives.PlusEquals"></a>
+<a id="aridity.directives.plusequals"></a>
 
-#### PlusEquals Objects
+###### plusequals
 
 ```python
-@_directive
-class PlusEquals()
+@prime
+def plusequals(prefix, suffix, scope)
 ```
 
 Assign expression to prefix plus an opaque key, i.e. add to list.
@@ -413,15 +412,7 @@ Assign expression to prefix plus an opaque key, i.e. add to list.
 
 ### aridity.functions
 
-<a id="aridity.functions.Functions"></a>
-
-#### Functions Objects
-
-```python
-class Functions()
-```
-
-<a id="aridity.functions.Functions.screenstr"></a>
+<a id="aridity.functions.screenstr"></a>
 
 ###### screenstr
 
@@ -431,7 +422,7 @@ def screenstr(scope, resolvable)
 
 GNU Screen string literal.
 
-<a id="aridity.functions.Functions.scstr"></a>
+<a id="aridity.functions.scstr"></a>
 
 ###### scstr
 
@@ -441,7 +432,7 @@ def scstr(scope, resolvable)
 
 SuperCollider string literal.
 
-<a id="aridity.functions.Functions.hclstr"></a>
+<a id="aridity.functions.hclstr"></a>
 
 ###### hclstr
 
@@ -451,7 +442,7 @@ def hclstr(scope, resolvable)
 
 HashiCorp configuration language string literal.
 
-<a id="aridity.functions.Functions.groovystr"></a>
+<a id="aridity.functions.groovystr"></a>
 
 ###### groovystr
 
@@ -461,7 +452,7 @@ def groovystr(scope, resolvable)
 
 Groovy string literal.
 
-<a id="aridity.functions.Functions.pystr"></a>
+<a id="aridity.functions.pystr"></a>
 
 ###### pystr
 
@@ -471,7 +462,7 @@ def pystr(scope, resolvable)
 
 Python literal.
 
-<a id="aridity.functions.Functions.shstr"></a>
+<a id="aridity.functions.shstr"></a>
 
 ###### shstr
 
@@ -481,7 +472,7 @@ def shstr(scope, resolvable)
 
 Shell string literal.
 
-<a id="aridity.functions.Functions.jsonquote"></a>
+<a id="aridity.functions.jsonquote"></a>
 
 ###### jsonquote
 
@@ -491,7 +482,7 @@ def jsonquote(scope, resolvable)
 
 JSON literal, also suitable for YAML.
 
-<a id="aridity.functions.Functions.xmlattr"></a>
+<a id="aridity.functions.xmlattr"></a>
 
 ###### xmlattr
 
@@ -501,7 +492,7 @@ def xmlattr(scope, resolvable)
 
 XML attribute literal (including quotes).
 
-<a id="aridity.functions.Functions.xmltext"></a>
+<a id="aridity.functions.xmltext"></a>
 
 ###### xmltext
 
@@ -511,7 +502,7 @@ def xmltext(scope, resolvable)
 
 XML content, suggest assigning this to & with xmlattr assigned to " as is convention.
 
-<a id="aridity.functions.Functions.tomlquote"></a>
+<a id="aridity.functions.tomlquote"></a>
 
 ###### tomlquote
 
@@ -521,7 +512,7 @@ def tomlquote(scope, resolvable)
 
 TOML string literal.
 
-<a id="aridity.functions.Functions.urlquote"></a>
+<a id="aridity.functions.urlquote"></a>
 
 ###### urlquote
 
@@ -531,19 +522,19 @@ def urlquote(scope, resolvable)
 
 Percent-encode all reserved characters.
 
-<a id="aridity.functions.Functions.map"></a>
+<a id="aridity.functions.map_"></a>
 
-###### map
+###### map\_
 
 ```python
-def map(scope, objsresolvable, *args)
+def map_(scope, objsresolvable, *args)
 ```
 
 If given 1 arg, evaluate it against every scope in `objsresolvable` and return that list.
 If given 2 args, the first is a variable name to which each scope is temporarily assigned.
 If given 3 args, the first two are variable names for scope key and scope respectively.
 
-<a id="aridity.functions.Functions.join"></a>
+<a id="aridity.functions.join"></a>
 
 ###### join
 
@@ -553,49 +544,47 @@ def join(scope, partsresolvable, sepresolvable=None)
 
 Concatenate the given list, using optional separator. Frequently used with `map`.
 
-<a id="aridity.functions.Functions.str"></a>
+<a id="aridity.functions.str_"></a>
 
-###### str
+###### str\_
 
 ```python
-def str(scope, resolvable)
+def str_(scope, resolvable)
 ```
 
 Coerce to string.
 
-<a id="aridity.functions.Functions.list"></a>
+<a id="aridity.functions.list_"></a>
 
-###### list
+###### list\_
 
 ```python
-def list(scope, *resolvables)
+def list_(scope, *resolvables)
 ```
 
 Create a list.
 
-<a id="aridity.functions.Functions.try_"></a>
+<a id="aridity.functions.try_"></a>
 
 ###### try\_
 
 ```python
-@realname('try')
 def try_(scope, *resolvables)
 ```
 
 Attempt to evaluate each resolvable, returning the first that succeeds.
 
-<a id="aridity.functions.Functions.hereslash"></a>
+<a id="aridity.functions.hereslash"></a>
 
 ###### hereslash
 
 ```python
-@realname('./')
 def hereslash(scope, *resolvables)
 ```
 
 Join the given path components with the directory of the current resource.
 
-<a id="aridity.functions.Functions.readfile"></a>
+<a id="aridity.functions.readfile"></a>
 
 ###### readfile
 
@@ -605,7 +594,7 @@ def readfile(scope, resolvable)
 
 Include the content of the given path.
 
-<a id="aridity.functions.Functions.processtemplate"></a>
+<a id="aridity.functions.processtemplate"></a>
 
 ###### processtemplate
 
@@ -615,7 +604,7 @@ def processtemplate(scope, resolvable)
 
 Evaluate the content of the given path as an expression.
 
-<a id="aridity.functions.Functions.pyref"></a>
+<a id="aridity.functions.pyref"></a>
 
 ###### pyref
 
@@ -625,7 +614,7 @@ def pyref(scope, moduleresolvable, qualnameresolvable)
 
 Python object in given module with given qualified name. Module may be relative to current resource, in which case assignment with `:=` is normally necessary. Typically used to import functions.
 
-<a id="aridity.functions.Functions.pyres"></a>
+<a id="aridity.functions.pyres"></a>
 
 ###### pyres
 

{aridity-85 → aridity-86}/README.md

@@ -344,57 +344,56 @@ Yield values only. Iterate over `-self` for keys and values.
 
 ### aridity.directives
 
-<a id="aridity.directives.Colon"></a>
+<a id="aridity.directives.colon"></a>
 
-#### Colon Objects
+###### colon
 
 ```python
-@_directive
-class Colon()
+def colon(prefix, suffix, scope)
 ```
 
 Ignore rest of logical line.
 
-<a id="aridity.directives.Source"></a>
+<a id="aridity.directives.source"></a>
 
-#### Source Objects
+###### source
 
 ```python
-@_directive
-class Source()
+@prime
+def source(prefix, suffix, scope)
 ```
 
 Include path or resource at prefix.
 
-<a id="aridity.directives.Equals"></a>
+<a id="aridity.directives.equals"></a>
 
-#### Equals Objects
+###### equals
 
 ```python
-@_directive
-class Equals()
+@prime
+def equals(prefix, suffix, scope)
 ```
 
 Assign expression to path.
 
-<a id="aridity.directives.ColonEquals"></a>
+<a id="aridity.directives.colonequals"></a>
 
-#### ColonEquals Objects
+###### colonequals
 
 ```python
-@_directive
-class ColonEquals()
+@prime
+def colonequals(prefix, suffix, scope)
 ```
 
 Evaluate expression and assign result to path.
 
-<a id="aridity.directives.PlusEquals"></a>
+<a id="aridity.directives.plusequals"></a>
 
-#### PlusEquals Objects
+###### plusequals
 
 ```python
-@_directive
-class PlusEquals()
+@prime
+def plusequals(prefix, suffix, scope)
 ```
 
 Assign expression to prefix plus an opaque key, i.e. add to list.
@@ -403,15 +402,7 @@ Assign expression to prefix plus an opaque key, i.e. add to list.
 
 ### aridity.functions
 
-<a id="aridity.functions.Functions"></a>
-
-#### Functions Objects
-
-```python
-class Functions()
-```
-
-<a id="aridity.functions.Functions.screenstr"></a>
+<a id="aridity.functions.screenstr"></a>
 
 ###### screenstr
 
@@ -421,7 +412,7 @@ def screenstr(scope, resolvable)
 
 GNU Screen string literal.
 
-<a id="aridity.functions.Functions.scstr"></a>
+<a id="aridity.functions.scstr"></a>
 
 ###### scstr
 
@@ -431,7 +422,7 @@ def scstr(scope, resolvable)
 
 SuperCollider string literal.
 
-<a id="aridity.functions.Functions.hclstr"></a>
+<a id="aridity.functions.hclstr"></a>
 
 ###### hclstr
 
@@ -441,7 +432,7 @@ def hclstr(scope, resolvable)
 
 HashiCorp configuration language string literal.
 
-<a id="aridity.functions.Functions.groovystr"></a>
+<a id="aridity.functions.groovystr"></a>
 
 ###### groovystr
 
@@ -451,7 +442,7 @@ def groovystr(scope, resolvable)
 
 Groovy string literal.
 
-<a id="aridity.functions.Functions.pystr"></a>
+<a id="aridity.functions.pystr"></a>
 
 ###### pystr
 
@@ -461,7 +452,7 @@ def pystr(scope, resolvable)
 
 Python literal.
 
-<a id="aridity.functions.Functions.shstr"></a>
+<a id="aridity.functions.shstr"></a>
 
 ###### shstr
 
@@ -471,7 +462,7 @@ def shstr(scope, resolvable)
 
 Shell string literal.
 
-<a id="aridity.functions.Functions.jsonquote"></a>
+<a id="aridity.functions.jsonquote"></a>
 
 ###### jsonquote
 
@@ -481,7 +472,7 @@ def jsonquote(scope, resolvable)
 
 JSON literal, also suitable for YAML.
 
-<a id="aridity.functions.Functions.xmlattr"></a>
+<a id="aridity.functions.xmlattr"></a>
 
 ###### xmlattr
 
@@ -491,7 +482,7 @@ def xmlattr(scope, resolvable)
 
 XML attribute literal (including quotes).
 
-<a id="aridity.functions.Functions.xmltext"></a>
+<a id="aridity.functions.xmltext"></a>
 
 ###### xmltext
 
@@ -501,7 +492,7 @@ def xmltext(scope, resolvable)
 
 XML content, suggest assigning this to & with xmlattr assigned to " as is convention.
 
-<a id="aridity.functions.Functions.tomlquote"></a>
+<a id="aridity.functions.tomlquote"></a>
 
 ###### tomlquote
 
@@ -511,7 +502,7 @@ def tomlquote(scope, resolvable)
 
 TOML string literal.
 
-<a id="aridity.functions.Functions.urlquote"></a>
+<a id="aridity.functions.urlquote"></a>
 
 ###### urlquote
 
@@ -521,19 +512,19 @@ def urlquote(scope, resolvable)
 
 Percent-encode all reserved characters.
 
-<a id="aridity.functions.Functions.map"></a>
+<a id="aridity.functions.map_"></a>
 
-###### map
+###### map\_
 
 ```python
-def map(scope, objsresolvable, *args)
+def map_(scope, objsresolvable, *args)
 ```
 
 If given 1 arg, evaluate it against every scope in `objsresolvable` and return that list.
 If given 2 args, the first is a variable name to which each scope is temporarily assigned.
 If given 3 args, the first two are variable names for scope key and scope respectively.
 
-<a id="aridity.functions.Functions.join"></a>
+<a id="aridity.functions.join"></a>
 
 ###### join
 
@@ -543,49 +534,47 @@ def join(scope, partsresolvable, sepresolvable=None)
 
 Concatenate the given list, using optional separator. Frequently used with `map`.
 
-<a id="aridity.functions.Functions.str"></a>
+<a id="aridity.functions.str_"></a>
 
-###### str
+###### str\_
 
 ```python
-def str(scope, resolvable)
+def str_(scope, resolvable)
 ```
 
 Coerce to string.
 
-<a id="aridity.functions.Functions.list"></a>
+<a id="aridity.functions.list_"></a>
 
-###### list
+###### list\_
 
 ```python
-def list(scope, *resolvables)
+def list_(scope, *resolvables)
 ```
 
 Create a list.
 
-<a id="aridity.functions.Functions.try_"></a>
+<a id="aridity.functions.try_"></a>
 
 ###### try\_
 
 ```python
-@realname('try')
 def try_(scope, *resolvables)
 ```
 
 Attempt to evaluate each resolvable, returning the first that succeeds.
 
-<a id="aridity.functions.Functions.hereslash"></a>
+<a id="aridity.functions.hereslash"></a>
 
 ###### hereslash
 
 ```python
-@realname('./')
 def hereslash(scope, *resolvables)
 ```
 
 Join the given path components with the directory of the current resource.
 
-<a id="aridity.functions.Functions.readfile"></a>
+<a id="aridity.functions.readfile"></a>
 
 ###### readfile
 
@@ -595,7 +584,7 @@ def readfile(scope, resolvable)
 
 Include the content of the given path.
 
-<a id="aridity.functions.Functions.processtemplate"></a>
+<a id="aridity.functions.processtemplate"></a>
 
 ###### processtemplate
 
@@ -605,7 +594,7 @@ def processtemplate(scope, resolvable)
 
 Evaluate the content of the given path as an expression.
 
-<a id="aridity.functions.Functions.pyref"></a>
+<a id="aridity.functions.pyref"></a>
 
 ###### pyref
 
@@ -615,7 +604,7 @@ def pyref(scope, moduleresolvable, qualnameresolvable)
 
 Python object in given module with given qualified name. Module may be relative to current resource, in which case assignment with `:=` is normally necessary. Typically used to import functions.
 
-<a id="aridity.functions.Functions.pyres"></a>
+<a id="aridity.functions.pyres"></a>
 
 ###### pyres
 

aridity-86/aridity/directives.py

@@ -0,0 +1,80 @@
+from .model import Stream
+from .search import resolvedscopeornone
+import os, sys, unicodedata
+
+def acceptdirectivename(word):
+    return word and unicodedata.category(word[0])[0] in 'PS'
+
+def prime(d):
+    def pd(prefix, suffix, scope):
+        if not prefix.directives:
+            return d(prefix, suffix, scope)
+    return pd
+
+def colon(prefix, suffix, scope):
+    'Ignore rest of logical line.'
+    return prefix
+
+@prime
+def _redirect(prefix, suffix, scope):
+    scope['stdout',] = Stream(suffix.tophrase().resolve(scope).openable(scope).open(True))
+
+@prime
+def _write(prefix, suffix, scope):
+    scope.resolved('stdout').flush(suffix.tophrase().resolve(scope).textvalue)
+
+@prime
+def source(prefix, suffix, scope):
+    'Include path or resource at prefix.'
+    # XXX: Use full algo to get phrasescope?
+    phrasescope = scope
+    for word in prefix.topath(scope):
+        s = resolvedscopeornone(phrasescope, [word])
+        if s is None:
+            break
+        phrasescope = s
+    suffix.tophrase().resolve(phrasescope).openable(phrasescope).source(scope, prefix)
+
+@prime
+def _cd(prefix, suffix, scope):
+    scope['cwd',] = suffix.tophrase().resolve(scope).openable(scope)
+
+@prime
+def _test(prefix, suffix, scope):
+    sys.stderr.write(str(suffix.tophrase().resolve(scope)))
+    sys.stderr.write(os.linesep)
+
+@prime
+def equals(prefix, suffix, scope):
+    'Assign expression to path.'
+    scope[prefix.topath(scope)] = suffix.tophrase()
+
+@prime
+def colonequals(prefix, suffix, scope):
+    'Evaluate expression and assign result to path.'
+    path = prefix.topath(scope)
+    scope[path] = suffix.tophrase().resolve(scope.getorcreatesubscope(path[:-1]))
+
+@prime
+def plusequals(prefix, suffix, scope):
+    'Assign expression to prefix plus an opaque key, i.e. add to list.'
+    from .functions import OpaqueKey
+    phrase = suffix.tophrase()
+    scope[prefix.topath(scope) + (OpaqueKey(),)] = phrase
+
+@prime
+def _cat(prefix, suffix, scope):
+    scope = scope.getorcreatesubscope(prefix.topath(scope))
+    scope.resolved('stdout').flush(suffix.tophrase().resolve(scope).openable(scope).processtemplate(scope).textvalue)
+
+def coredirectives():
+    yield ':', colon
+    yield '!redirect', _redirect
+    yield '!write', _write
+    yield '.', source
+    yield '!cd', _cd
+    yield '!test', _test
+    yield '=', equals
+    yield ':=', colonequals
+    yield '+=', plusequals
+    yield '<', _cat