Changeset 11493 for trunk/source/library/parse-ffi.lisp

Timestamp:

Dec 9, 2008, 2:37:54 AM (11 years ago)

Author:

gb

Message:

Ignore forms in the .ffi file that don't start with a #\( on the first
character of a line. (Inline assembler and some other things may
output assembler directives.)

Don't even try to expand macros that contain apparent C function calls.
(Not sure if this fixes a problem or a symptom, but some of the stdio
macros on FreeBSD expand into this kind of thing, and now that we
handle conditional expressions more correctly we can stack overflow
wandering around in the expansions.)

File:

• trunk/source/library/parse-ffi.lisp (modified) (3 diffs)

trunk/source/library/parse-ffi.lisp

@@ -721 +721 @@
 
 
+(defun read-ffi-toplevel-form (stream eof-value)
+  (loop
+    (let* ((ch (peek-char  nil stream nil eof-value)))
+      (cond ((eq ch eof-value) (return eof-value))
+            ((eql ch #\() (return (read stream nil eof-value)))
+            (t (read-line stream))))))
 
 (defun parse-ffi (inpath)
@@ -737 +743 @@
         (let* ((*ffi-ordinal* -1))
           (let* ((*package* (find-package "KEYWORD")))
-            (do* ((form (read in nil :eof) (read in nil :eof)))
+            (do* ((form (read-ffi-toplevel-form in :eof)
+                        (read-ffi-toplevel-form in :eof)))
                  ((eq form :eof))
               (case (car form)
@@ -1293 +1300 @@
                                          `(c::cast ,(evaluate-type-name (list left))
                                            ,@(parse-argument-list)))
-                                        (t `(c::call ,left ,@(parse-argument-list))))))
+                                        (t nil #|`(c::call ,left ,@(parse-argument-list))|#))))
                                ((memq right '(c::|.| c::|->|))
                                 (next)          ; swallow operator