Introduce Clozure-CL-like method call syntax.

darcs-hash:9b1645d06112b61bd4e85f23a7a6725f89e2564b

2 files changed, 85 insertions, 3 deletions

diff --git a/Lisp/defpackage.lisp b/Lisp/defpackage.lisp
index 3c2444b..17a81c8 100644
--- a/Lisp/defpackage.lisp
+++ b/Lisp/defpackage.lisp
@@ -23,7 +23,8 @@
            ;; Functions
   (:export #:initialise-runtime
            #:shutdown-runtime
-           #:install-reader-syntax
+           #:enable-method-syntax
+           #:enable-objective-c-syntax
            #:invoke-by-name
            #:invoke
            #:find-objc-class
@@ -33,14 +34,17 @@
            #:selector
            #:define-returns-boolean-exception
            #:undefine-returns-boolean-exception
+           #:collect-classes
 
            ;; Generic functions
            #:objc-eql
            #:objc-equal
+           #:foreign-value-lisp-managed-p
 
            ;; Macros
            #+(or) #:define-objc-struct
            #+(or) #:define-objc-union
+           #:define-objective-c-method
 
            ;; Special variables
            #:*trace-method-calls*
@@ -57,6 +61,8 @@
            #:foreign-value
            #:foreign-struct
            #:foreign-union
+           #:objective-c-generic-function
+           #:objective-c-method
 
            ;; Conditions
            #:message-not-understood
@@ -79,4 +85,9 @@
   (:use))
 
 
+(defpackage #:objective-c-methods
+  (:nicknames #:objc-methods #:objcm)
+  (:use))
+
+
 #-(or cmu sbcl) (declaim (declaration values))
diff --git a/Lisp/reader-syntax.lisp b/Lisp/reader-syntax.lisp
index 758d99a..56ae6db 100644
--- a/Lisp/reader-syntax.lisp
+++ b/Lisp/reader-syntax.lisp
@@ -18,13 +18,83 @@
 (in-package #:mulk.objective-cl)
 
 
+(defun enable-method-syntax ()
+  "Install a **reader macro** that makes method calls look nicer.
+
+## Description:
+
+The **reader macro** installed by __enable-method-syntax__ makes it
+easier to write method invocations as well as making them more readable
+alongside Lisp code by placing the method name in front.  At the same
+time, it is a more conservative syntax enhancement than that provided by
+__enable-objective-c-syntax__.
+
+The reader macro transforms any sequence of alphanumeric characters and
+characters that are __eql__ to one of #\:, #\- and #\_ into a symbol
+with that sequence as the **symbol name** and _objective-c-methods__ as
+the **symbol package**.  It also takes care to make a __selector__
+available as the __fdefinition__ of that symbol unless the symbol is
+already **fbound**.
+
+
+## Examples:
+
+    #.(enable-method-syntax)
+
+    (#/stringWithCString:encoding: \"Hi there!\" 0)
+      => 
+
+    (defvar *lock* (#/new (find-objc-class 'ns-lock)))
+      => *LOCK*
+
+    (#/lock lock)
+    (#/tryLock lock)
+    (#/unlock lock)
+
+    #.(disable-method-syntax)
+
+
+## Note:
+
+Absent manual changes by the user, the __fdefinition__ of any symbol
+read by this reader macro may point to either a __selector__ or an
+__objective-c-generic-function__, depending on whether a corresponding
+__defgeneric__ form has been executed.
+
+
+## See also:
+
+  __enable-objective-c-syntax__"
+
+  (set-dispatch-macro-character #\# #\/ #'(lambda (stream char arg)
+                                            (declare (ignore char arg))
+                                            (read-objective-c-method stream))))
+
+
+(defun read-objective-c-method (stream)
+  (loop for char = (read-char stream nil nil t)
+        while (or (alphanumericp char)
+                  (member char '(#\: #\- #\_)))
+        collect char into constituents
+        finally (progn
+                  (when char (unread-char char stream))
+                  (let ((symbol (intern (format nil "~{~A~}" constituents)
+                                        '#:objective-c-methods)))
+                    (return symbol)))))
+
+
 (defun install-reader-syntax ()
+  "This function is deprecated.  Use __enable-objective-c-syntax__ instead."
+  (enable-reader-syntax))
+
+
+(defun enable-objective-c-syntax ()
   "Install an Objective-C-like **reader macro** for Objective-C method
  calls.
 
 ## Description:
 
-The **reader macro** installed by __install-reader-syntax__ closely
+The **reader macro** installed by __enable-objective-c-syntax__ closely
 resembles the conventional method call syntax of Objective-C.  In fact,
 any differences between standard Objective-C method call syntax and this
 **reader macro** that are not documented here are probably bugs and
@@ -126,7 +196,8 @@ conciseness.
 
 ## See also:
 
-  __invoke__, __invoke-by-name__"
+  __invoke__, __invoke-by-name__, __disable-objective-c-syntax__,
+__enable-method-syntax__"
 
   (set-macro-character #\] (get-macro-character #\)))