Changeset 15143 in project for chicken

Timestamp:

07/03/09 10:46:56 (10 years ago)

Author:

felix

Message:

foreign-code accepts symbol argument

Location:

chicken/trunk

Files:

• chicken-ffi-syntax.scm (modified) (1 diff)
• eval.scm (modified) (1 diff)
• manual/Accessing external objects (modified) (1 diff)

chicken/trunk/chicken-ffi-syntax.scm

@@ -138 +138 @@
  (##sys#er-transformer
   (lambda (form r c)
-    (##sys#check-syntax 'foreign-value form '(_ string _))
-    (let ([tmp (gensym 'code_)])
+    (##sys#check-syntax 'foreign-value form '(_ _ _))
+    (let ((tmp (gensym 'code_))
+          (code (cadr form)))
       `(,(r 'begin)
-        (,(r 'define-foreign-variable) ,tmp ,(caddr form) ,(cadr form))
+        (,(r 'define-foreign-variable) ,tmp
+         ,(cond ((string? code) code)
+                ((symbol? code) (symbol->string code))
+                (else (syntax-error 'foreign-value "bad argument type - not a string or symbol" code)))
+         ,(cadr form))
         ,tmp) ) ) ) )
 

chicken/trunk/eval.scm

@@ -712 +712 @@
                                    (let-values ([(exp _)
                                                  (##sys#do-the-right-thing (car ids) #f imp?)])
-                                     `(,(rename 'begin se) ,exp ,(loop (cdr ids))) ) ) )
+                                     `(##core#begin ,exp ,(loop (cdr ids))) ) ) )
                              e #f tf cntr se) ) ]
 

chicken/trunk/manual/Accessing external objects

@@ -21 +21 @@
 === foreign-value
 
- [syntax] (foreign-value STRING TYPE)
+ [syntax] (foreign-value CODE TYPE)
 
-Evaluates the embedded C/C++ expression {{STRING}}, returning a value of type given
+Evaluates the embedded C/C++ expression {{CODE}} (which may be a string or symbol), returning a value of type given
 in the foreign-type specifier {{TYPE}}.