Changeset 1140:46c1f6a93b0d for src/f2cl1.l

Timestamp:

05/02/12 21:40:28 (13 months ago)

Author:

Raymond Toy <toy.raymond@…>

Branch:

default

Message:

Don't declare strings as (simple-array character). In general that's
incorrect for literal strings because they can be base-strings or
strings, depending on the implementation. (Ecl does this).

Thus, just declare them as simple-strings which includes all string
types.

Files:

• src/f2cl1.l (modified) (3 diffs)

src/f2cl1.l

@@ -204 +204 @@
   (flet ((relax-1 (decl)
            (cond ((and *relaxed-array-decls* (subtypep decl 'array))
-                  (destructuring-bind (a n l)
+                  (destructuring-bind (a &optional n l)
                       decl
-                    `(,a ,n ,(mapcar (constantly '*) l))))
+                    (if (subtypep a 'string)
+                        `(a ,(mapcar (constantly '*) l))
+                        `(,a ,n ,(mapcar (constantly '*) l)))))
                  (t
                   decl))))
@@ -1076 +1078 @@
         (do-file)
         (do-output outport))))
-    
 
 (defun translate-and-write-subprog (prog-list outport output-path
@@ -1152 +1153 @@
        ;; external.
        (setf fun (fixup-f2cl-lib fun (cons (cadr fort-fun) *external-function-names*)))
-       
+
        (special-print fun outport)
        (format outport "~2&(in-package #-gcl #:cl-user #+gcl \"CL-USER\")~%#+#.(cl:if (cl:find-package '#:f2cl) '(and) '(or))~%")