Changeset 22051 in project


Ignore:
Timestamp:
12/17/10 14:08:30 (10 years ago)
Author:
Alan Post
Message:

genturfa'i: simply rodavalsi-val-filter, fixing the tests.

I did not notice that jonai-naselci was broken until now.

Location:
release/4/genturfahi/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • release/4/genturfahi/trunk/javni-valsi.scm

    r22049 r22051  
    6464
    6565(define (javni-rodavalsi-val-filter valsi)
    66   ; if the only result was a predicate marker, don't return it.
     66  ; if the only result was a predicate marker, return the empty
     67  ; list instead.
    6768  ;
    68   (if (javni-valsi? valsi)
    69       (let ((val (javni-valsi-val valsi)))
    70         (if (javni-nastura? val)
    71             '()
    72             val))
    73       (remove javni-nastura? (map javni-rodavalsi-val valsi))))
    74 
     69  (let ((val (javni-rodavalsi-val valsi)))
     70    (if (javni-nastura? val)
     71        '()
     72        val)))
    7573
    7674(define (javni-valsi->string valsi)
  • release/4/genturfahi/trunk/nunjavni.scm

    r21975 r22051  
    452452                         cmesumti))
    453453                  (rest (javni-rodavalsi-val-filter sumti)))
    454               (append! rest key)))))
     454              (append! (if (list? rest) rest `(,rest)) key)))))
    455455
    456456      (define (nunvalsi-samselpla)
Note: See TracChangeset for help on using the changeset viewer.