X-Git-Url: https://jxself.org/git/?p=mudsync.git;a=blobdiff_plain;f=mudsync%2Fparser.scm;h=ab5a5d7d61dc2328f3e41b48b2385d48c9fa9f2b;hp=3d84195206cce90e0923c7fb40420691d3574f5a;hb=43b6ac4e8ceff7aad909294b1b00ebdd6a38ec15;hpb=1c65eb772aaa7c3a4278b95bc02660dc79c25438 diff --git a/mudsync/parser.scm b/mudsync/parser.scm index 3d84195..ab5a5d7 100644 --- a/mudsync/parser.scm +++ b/mudsync/parser.scm @@ -61,7 +61,7 @@ ;; 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")) (define indirect-irx (sre->irregex @@ -93,14 +93,14 @@ (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")