Merge pull request #89 from WebReflection/python-fix

Fixing recursion issue in Python too

Author: WebReflection

php/test.php

@@ -112,6 +112,26 @@ public static function assert($condition, $message) {
   'parse is correct'
 );
 
+$AMOUNT = 1000;
+
+$chain = array();
+$chain[] = 'leaf';
+
+for ($i = 0; $i < $AMOUNT; $i++) {
+    $curr = $chain;
+    $chain = array();
+    $chain[] = $curr;
+}
+
+$str = Flatted::stringify($chain);
+$parsed = Flatted::parse($str);
+
+for ($i = 0; $i < $AMOUNT; $i++) {
+    $chain = $chain[0];
+}
+
+var_dump($chain);
+
 echo "OK\n";
 
-?>
+?>

python/flatted.py

@@ -25,20 +25,13 @@ class _String:
     def __init__(self, value):
         self.value = value
 
-
 def _array_keys(value):
-    keys = []
-    i = 0
-    for _ in value:
-        keys.append(i)
-        i += 1
-    return keys
+    for i in range(len(value)):
+        yield i
 
 def _object_keys(value):
-    keys = []
     for key in value:
-        keys.append(key)
-    return keys
+        yield key
 
 def _is_array(value):
     return isinstance(value, (list, tuple))
@@ -56,24 +49,6 @@ def _index(known, input, value):
     known.value.append(index)
     return index
 
-def _loop(keys, input, known, output):
-    for key in keys:
-        value = output[key]
-        if isinstance(value, _String):
-            _ref(key, input[int(value.value)], input, known, output)
-
-    return output
-
-def _ref(key, value, input, known, output):
-    if _is_array(value) and value not in known:
-        known.append(value)
-        value = _loop(_array_keys(value), input, known, value)
-    elif _is_object(value) and value not in known:
-        known.append(value)
-        value = _loop(_object_keys(value), input, known, value)
-
-    output[key] = value
-
 def _relate(known, input, value):
     if _is_string(value) or _is_array(value) or _is_object(value):
         try:
@@ -83,6 +58,22 @@ def _relate(known, input, value):
 
     return value
 
+def _resolver(input, lazy, parsed):
+    def resolver(output):
+        keys = _array_keys(output) if _is_array(output) else _object_keys(output) if _is_object(output) else []
+        for key in keys:
+            value = output[key]
+            if isinstance(value, _String):
+                tmp = input[int(value.value)]
+                output[key] = tmp
+                if (_is_array(tmp) or _is_object(tmp)) and tmp not in parsed:
+                    parsed.append(tmp)
+                    lazy.append([output, key])
+
+        return output
+
+    return resolver
+
 def _transform(known, input, value):
     if _is_array(value):
         output = []
@@ -128,12 +119,16 @@ def parse(value, *args, **kwargs):
             input.append(value)
 
     value = input[0]
+    lazy = []
+    revive = _resolver(input, lazy, [value])
 
-    if _is_array(value):
-        return _loop(_array_keys(value), input, [value], value)
+    value = revive(value)
 
-    if _is_object(value):
-        return _loop(_object_keys(value), input, [value], value)
+    i = 0
+    while i < len(lazy):
+        o, k = lazy[i]
+        i += 1
+        o[k] = revive(o[k])
 
     return value
 

python/test.py

@@ -60,4 +60,22 @@ def stringify(value):
 oo = parse('[{"a":"1","b":"0","c":"2"},{"aa":"3"},{"ca":"4","cb":"5","cc":"6","cd":"7","ce":"8","cf":"9"},{"aaa":"10"},{"caa":"4"},{"cba":"5"},{"cca":"2"},{"cda":"4"},"value2","value3","value1"]');
 assert oo['a']['aa']['aaa'] == 'value1' and oo == oo['b'] and oo['c']['ca']['caa'] == oo['c']['ca']
 
+
+AMOUNT = 1500
+
+chain = ['leaf']
+for i in range(AMOUNT):
+    chain = [chain]
+
+str = stringify(chain)
+print('stringify', '✅')
+
+parsed = parse(str)
+
+for i in range(AMOUNT):
+    chain = chain[0]
+
+print(chain)
+print('parse', '✅')
+
 print('OK')