Split mudsync.scm out into multiple files

[mudsync.git] / mudsync / parser.scm

diff --git a/mudsync/parser.scm b/mudsync/parser.scm
index fb88210a41ed67052ceba5818b7048287169ef01..3ad5b73fe757905cce8f12de2da968a0c05a68f8 100644 (file)
--- a/mudsync/parser.scm
+++ b/mudsync/parser.scm
@@ -1,5 +1,25 @@
-(use-modules (rx irregex)
-             (ice-9 match))
+;;; Mudsync --- Live hackable MUD
+;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org>
+;;;
+;;; This file is part of Mudsync.
+;;;
+;;; Mudsync is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or
+;;; (at your option) any later version.
+;;;
+;;; Mudsync is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;;; General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with Mudsync.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (mudsync parser)
+  #:use-module (rx irregex)
+  #:use-module (ice-9 match)
+  #:use-module (srfi srfi-9))
 
 
 (define (match-to-kwargs irx string)
@@ -13,18 +33,6 @@
              (irregex-match-names rx-match))
         #f)))
 
-
-;; definite and indefinite, but not partitive articles
-(define article '(or "the" "a" "an"))
-(define preposition '(or "with" "in" "on" "out of" "at"))
-
-(define split-verb-and-rest-irx
-  (sre->irregex
-   `(: (* space) (=> verb (+ alphanum))
-       (? (+ space) (=> rest (* any))))))
-
-;; TODO: we could make this MUCH FASTER if we didn't use irregex
-;;   for this step!
 (define (split-verb-and-rest string)
   (let* ((trimmed (string-trim-both string))
          (first-space (string-index trimmed #\space)))
@@ -39,20 +47,44 @@
 (define match-string
   '(seq #\" (* (or (~ #\\ #\") (seq #\\ any))) #\"))
 
+;; definite and indefinite, but not partitive articles
+(define article '(or "the" "a" "an"))
+(define preposition '(or "with" "in" "on" "out of" "at"))
+
 (define indirect-irx
   (sre->irregex
-   `(: (? (: ,article (+ space)))  ; possibly an article (ignored)
-       (=> direct-object (* any))  ; direct object
-       (+ space) (=> preposition ,preposition) (+ space)
-       (? (: ,article (+ space)))
-       (=> indirect-object (+ any)))))
+   `(: (? (: ,preposition (+ space)))  ; possibly a preposition (ignored)
+       (? (: ,article (+ space)))      ; possibly an article (ignored)
+       (=> direct-object (* any))      ; direct object (kept)
+       (+ space)
+       (=> preposition ,preposition)   ; main preposition (kept)
+       (+ space)
+       (? (: ,article (+ space)))      ; possibly an article (ignored)
+       (=> indirect-object (+ any))))) ; indirect object (kept)
+
+(define (indirect-matcher phrase)
+  (match-to-kwargs indirect-irx phrase))
 
 (define direct-irx
-  `(: (? (: ,article (+ space)))    ; possibly an article (ignored)
-      (=> direct-object (* any))))  ; direct object
+  (sre->irregex
+   `(: (? (: ,preposition (+ space)))  ; possibly a preposition (ignored)
+       (? (: ,article (+ space)))     ; possibly an article (ignored)
+       (=> direct-object (* any)))))  ; direct object (kept)
 
+(define (direct-matcher phrase)
+  (match-to-kwargs direct-irx phrase))
 
 (define say-example "say I really need to get going.")
 (define attack-sword-example "hit goblin with sword")
 (define attack-simple-example "hit goblin")
 (define put-book-on-desk "put the book on the desk")
+
+(define-record-type <command-handler>
+  (make-command-handler matcher should-handle action)
+  command-handler?
+  (matcher command-handler-matcher)
+  (should-handle command-handler-should-handle?)
+  (action command-handler-action))
+
+(define command-handler make-command-handler)
+