Partially revert "typo fixes in parse.scm"
authorDaniel Hartwig <mandyke@gmail.com>
Sat, 9 Feb 2013 01:05:19 +0000 (09:05 +0800)
committerDaniel Hartwig <mandyke@gmail.com>
Sat, 9 Feb 2013 01:09:38 +0000 (09:09 +0800)
This reverts commit 940b3bea6a7d1ac5f388bdb9a402aab94f211f0c.

* figl/parse.scm (string->directions, string->transfer-types): If
  input is not a wildcard it must be within the valid-directions
  (valid-transfer-types), "expansion" is unrelated to this.

figl/parse.scm

index 132615a..a31836f 100644 (file)
                              (expansion valid-directions))
   (let ((direction (string->symbol str)))
     (cond
-     ((eq? direction '*)
+     ((and (eq? direction '*) expansion)
       expansion)
-     ((memq direction expansion)
+     ((memq direction valid-directions)
       (list direction))
      (else
       (error "unknown direction" str)))))
                                  (expansion valid-transfer-types))
   (let ((trans (string->symbol str)))
     (cond
-     ((eq? trans '*)
+     ((and (eq? trans '*) expansion)
       expansion)
-     ((memq trans expansion)
+     ((memq trans valid-transfer-types)
       (list trans))
      (else
       (error "unknown transfer-type" str)))))