X-Git-Url: https://jxself.org/git/?p=mudsync.git;a=blobdiff_plain;f=mudsync%2Fparser.scm;h=034b22f3f2f04dc8f5e2bc609658241e5b9fbd43;hp=305f43d2ca49e6f7d080f0766a181f1e8de34a04;hb=bbf45570e7dfe20e132cc8e4601ccbf2de667ff3;hpb=136ce3b725c83af0b7e8be632e943de6b07b65c5

diff --git a/mudsync/parser.scm b/mudsync/parser.scm
index 305f43d..034b22f 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" "on" "out of" "at" "as" "to"
+                         "about"))
 
 (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)
@@ -81,26 +82,26 @@
   (sre->irregex
    `(: (? (: ,preposition (+ space)))  ; possibly a preposition (ignored)
        (? (: ,article (+ space)))     ; possibly an article (ignored)
-       (=> direct-obj (* any)))))  ; direct object (kept)
+       (=> direct-obj (+ any)))))  ; direct object (kept)
 
 (define (cmatch-direct-obj phrase)
   (match-to-kwargs direct-irx phrase))
 
 (define (cmatch-empty phrase)
-  (if (equal? (string-trim phrase) ")")
+  (if (equal? (string-trim phrase) "")
       '()
       #f))
 
 (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")