;;; Mudsync --- Live hackable MUD
-;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org>
+;;; Copyright © 2016 Christine Lemmer-Webber <cwebber@dustycloud.org>
;;;
;;; This file is part of Mudsync.
;;;
;; definite and indefinite, but not partitive articles
(define article '(or "the" "a" "an"))
-(define preposition '(or "with" "in" "on" "out of" "at"))
+(define preposition '(or "with" "in" "inside" "into" "on" "out" "out of"
+ "at" "as" "to" "about" "from"))
(define indirect-irx
(sre->irregex
- `(: (? (: ,preposition (+ space))) ; possibly a preposition (ignored)
+ `(: (? (: ,preposition (+ space))) ; possibly a preposition
(? (: ,article (+ space))) ; possibly an article (ignored)
(=> direct-obj (* any)) ; direct object (kept)
(+ space)
(define (cmatch-direct-obj-greedy phrase)
;; Turns out this uses the same semantics as splitting verb/rest
- (match (split-verb-and-rest string)
+ (match (split-verb-and-rest phrase)
((direct-obj . rest)
(list #:direct-obj direct-obj
#:rest rest))
(#f #f)))
(define (cmatch-greedy phrase)
- `((line . ,phrase)))
+ `(#:phrase ,phrase))
;; (define say-example "say I really need to get going.")
;; (define attack-sword-example "hit goblin with sword")