Recursive lists

6df982b4 · Thierry Martinez · 7a1000e0 · 6df982b4
Commit 6df982b4 authored Oct 20, 2015 by Thierry Martinez
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 2 deletions

models.pl models.pl +13 -2

No files found.
--- a/models.pl
+++ b/models.pl
@@ -435,6 +435,17 @@ item(Options) :-
  ;
    Parent0 = Parent
  ),
+  (
+    var(Kind)
+  ->
+    true
+  ;
+    list(Kind)
+  ->
+    member(Kind0, Kind)
+  ;
+    Kind0 = Kind
+  ),
  (
    var(Key)
  ->
@@ -447,7 +458,7 @@ item(Options) :-
  ;
    key(Key, Id)
  ),
-  item(Id, Parent0, Kind, Item).
+  item(Id, Parent0, Kind0, Item).


 find_item(Options) :-
@@ -522,7 +533,7 @@ list_ids(Options, Ids) :-
        Recursive = yes
      ->
        SubIndent is Indent + 1,
-        list_items([indent: SubIndent, recursive, parent: Id])
+        list_items([indent: SubIndent, recursive, parent: Id | Options])
      ;
        true
      )