X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=mudsync%2Fparser.scm;h=efda86e3b26c536bd5662355912dd2bd7101bf78;hb=e16f5c202440d4091b54b1b45d7e023b4fcd4a6d;hp=e9c4096c1b3a298cb1ce1683e366d4eda8b1d2f9;hpb=d539213774955a5593ec760f06022aeecf4e1abc;p=mudsync.git

diff --git a/mudsync/parser.scm b/mudsync/parser.scm
index e9c4096..efda86e 100644
--- a/mudsync/parser.scm
+++ b/mudsync/parser.scm
@@ -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")