X-Git-Url: https://jxself.org/git/?p=mudsync.git;a=blobdiff_plain;f=mudsync%2Fparser.scm;h=16a811b9903fcb605b7ec2bad3b4904ffb62574f;hp=e9c4096c1b3a298cb1ce1683e366d4eda8b1d2f9;hb=ec50931b9a575c226804c1dccadbf5ad3bc8306b;hpb=d539213774955a5593ec760f06022aeecf4e1abc diff --git a/mudsync/parser.scm b/mudsync/parser.scm index e9c4096..16a811b 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" "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")