| ... |
... |
@@ -386,7 +386,7 @@ class Loader(): |
|
386
|
386
|
|
|
387
|
387
|
# Cache it now, make sure it's already there before recursing
|
|
388
|
388
|
self._meta_elements[element.name] = meta_element
|
|
389
|
|
- # print("Created", meta_element.name, meta_element.first_pass, "on", id(self), "with kind", element_kind)
|
|
|
389
|
+ print("Created", meta_element.name, meta_element.first_pass, "on", id(self), "with kind", element_kind)
|
|
390
|
390
|
|
|
391
|
391
|
return meta_element
|
|
392
|
392
|
|
| ... |
... |
@@ -394,7 +394,7 @@ class Loader(): |
|
394
|
394
|
all_elements = set()
|
|
395
|
395
|
elements_to_process = set(elements)
|
|
396
|
396
|
|
|
397
|
|
- # print([e.name for e in elements_to_process])
|
|
|
397
|
+ print([e.name for e in elements_to_process])
|
|
398
|
398
|
|
|
399
|
399
|
while elements_to_process:
|
|
400
|
400
|
element = elements_to_process.pop()
|
| ... |
... |
@@ -435,13 +435,13 @@ class Loader(): |
|
435
|
435
|
|
|
436
|
436
|
all_elements = deque(sorted(all_elements, key=cmp_to_key(sorter)))
|
|
437
|
437
|
|
|
438
|
|
- # print([e.full_name for e in all_elements])
|
|
|
438
|
+ print([e.full_name for e in all_elements])
|
|
439
|
439
|
|
|
440
|
440
|
treated_elements = []
|
|
441
|
441
|
|
|
442
|
442
|
while all_elements:
|
|
443
|
443
|
current = all_elements.popleft()
|
|
444
|
|
- # print("Visiting", current.full_name)
|
|
|
444
|
+ print("Visiting", current.full_name)
|
|
445
|
445
|
|
|
446
|
446
|
if current.visited:
|
|
447
|
447
|
continue
|
| ... |
... |
@@ -460,7 +460,7 @@ class Loader(): |
|
460
|
460
|
treated_elements.append(current)
|
|
461
|
461
|
|
|
462
|
462
|
all_elements = deque(treated_elements)
|
|
463
|
|
- # print([e.full_name for e in all_elements])
|
|
|
463
|
+ print([e.full_name for e in all_elements])
|
|
464
|
464
|
|
|
465
|
465
|
# Filter out duplicated elements
|
|
466
|
466
|
for _ in range(len(all_elements)):
|
| ... |
... |
@@ -471,12 +471,12 @@ class Loader(): |
|
471
|
471
|
current.visited = False
|
|
472
|
472
|
all_elements.append(current)
|
|
473
|
473
|
|
|
474
|
|
- # print([e.full_name for e in all_elements])
|
|
|
474
|
+ print([e.full_name for e in all_elements])
|
|
475
|
475
|
|
|
476
|
476
|
for element in all_elements:
|
|
477
|
|
- # print("#" * 60)
|
|
478
|
|
- # print("Treating", element.full_name)
|
|
479
|
|
- # print("With deps:", [e.element.full_name for e in element.dependencies])
|
|
|
477
|
+ print("#" * 60)
|
|
|
478
|
+ print("Treating", element.full_name)
|
|
|
479
|
+ print("With deps:", [e.element.full_name for e in element.dependencies])
|
|
480
|
480
|
|
|
481
|
481
|
meta_element = element._loader._collect_element(element)
|
|
482
|
482
|
|
| ... |
... |
@@ -609,10 +609,10 @@ class Loader(): |
|
609
|
609
|
|
|
610
|
610
|
ret = [e._loader._collect_element(e) for e in elements]
|
|
611
|
611
|
|
|
612
|
|
- # for e in ret:
|
|
613
|
|
- # print(e.name, e.first_pass)
|
|
614
|
|
- # for d in e.dependencies:
|
|
615
|
|
- # print("\t", d.name)
|
|
|
612
|
+ for e in ret:
|
|
|
613
|
+ print(e.name, e.first_pass)
|
|
|
614
|
+ for d in e.dependencies:
|
|
|
615
|
+ print("\t", d.name)
|
|
616
|
616
|
|
|
617
|
617
|
return ret
|
|
618
|
618
|
|
