use 1-based indexing for ŒṬ atom

DennisMitchell · May 22, 2018 · 708d842 · 708d842
1 parent 936ea79
commit 708d842
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/jelly/interpreter.py b/jelly/interpreter.py
@@ -1197,9 +1197,9 @@ def untruth_md(indices, shape = None, upper_level = []):
  shape = [max(index_zipped) for index_zipped in zip(*indices)]
  upper_len = len(upper_level)
  if upper_len < len(shape) - 1:
- return [untruth_md(indices, shape = shape, upper_level = upper_level + [i]) for i in range(shape[upper_len] + 1)]
+ return [untruth_md(indices, shape = shape, upper_level = upper_level + [i + 1]) for i in range(shape[upper_len])]
  else:
- return [1 if (upper_level + [i] in indices) else 0 for i in range(shape[-1] + 1)]
+ return [1 if (upper_level + [i + 1] in indices) else 0 for i in range(shape[-1])]
 
 def variadic_chain(chain, args):
  args = list(filter(None.__ne__, args))
@@ -2659,14 +2659,6 @@ def zip_ragged(array):
  arity = 0,
  call = lambda: list(str_digit + str_upper + str_lower)
  ),
- 'ØC': attrdict(
- arity = 0,
- call = lambda: list('BCDFGHJKLMNPQRSTVWXYZbcdfghjklmnpqrstvwxyz')
- ),
- 'ØD': attrdict(
- arity = 0,
- call = lambda: list(str_digit)
- ),
  'ØḄ': attrdict(
  arity = 0,
  call = lambda: list('bcdfghjklmnpqrstvwxyz')
@@ -2675,6 +2667,14 @@ def zip_ragged(array):
  arity = 0,
  call = lambda: list('BCDFGHJKLMNPQRSTVWXYZ')
  ),
+ 'ØC': attrdict(
+ arity = 0,
+ call = lambda: list('BCDFGHJKLMNPQRSTVWXYZbcdfghjklmnpqrstvwxyz')
+ ),
+ 'ØD': attrdict(
+ arity = 0,
+ call = lambda: list(str_digit)
+ ),
  'ØH': attrdict(
  arity = 0,
  call = lambda: list(str_digit + 'ABCDEF')

diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
  name = 'jellylanguage',
- version = '0.1.20',
+ version = '0.1.21',
  packages = [
  'jelly'
  ],