You can now kiss the frog!

[mudsync.git] / mudsync / parser.scm

diff --git a/mudsync/parser.scm b/mudsync/parser.scm
index e9c4096c1b3a298cb1ce1683e366d4eda8b1d2f9..918d090ebdf40493094da8186c2807b5aa40ff38 100644 (file)
--- a/mudsync/parser.scm
+++ b/mudsync/parser.scm
@@ -1,5 +1,5 @@
 ;;; 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.
 ;;;
@@ -61,11 +61,12 @@
 
 ;; 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)
@@ -100,7 +101,7 @@
     (#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")