Changeset 14937


Ignore:
Timestamp:
12/28/16 09:19:44 (5 years ago)
Author:
Mark Evenson
Message:

abcl-introspect: get rid of duplicate file/ merge diffs (Alan Ruttenberg)

Location:
trunk/abcl/contrib
Files:
1 deleted
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/contrib/abcl-introspect/abcl-introspect.lisp

    r14934 r14937  
    7171  "fn-n gets called with top, internal function, not-fn-fn gets called with top anything-but"
    7272  (declare (optimize (speed 3) (safety 0)))
    73   (macrolet ((fields (c) `(java::jcall (setq @ ,(java::jmethod "java.lang.Class" "getDeclaredFields")) ,c))
    74        (get (f i) `(java::jcall (setq @ ,(java::jmethod "java.lang.reflect.Field" "get" "java.lang.Object")) ,f ,i))
    75        (access (f b) `(java::jcall (setq @ ,(java::jmethod "java.lang.reflect.AccessibleObject" "setAccessible" "boolean")) ,f ,b))
    76        (getclass (o) `(java::jcall (setq @ ,(java::jmethod "java.lang.Object" "getClass")) ,o))
    77        (name (o) `(java::jcall (setq @ ,(java::jmethod "org.armedbear.lisp.Operator" "getLambdaName")) ,o)))
     73  (macrolet ((fields (c) `(java::jcall ,(java::jmethod "java.lang.Class" "getDeclaredFields") ,c))
     74       (get (f i) `(java::jcall ,(java::jmethod "java.lang.reflect.Field" "get" "java.lang.Object") ,f ,i))
     75       (access (f b) `(java::jcall ,(java::jmethod "java.lang.reflect.AccessibleObject" "setAccessible" "boolean") ,f ,b))
     76       (getclass (o) `(java::jcall ,(java::jmethod "java.lang.Object" "getClass") ,o)))
    7877    (labels ((function-internal-fields (f)
    7978         (if (symbolp f)
     
    8887         (dolist (el (function-internal-fields f))
    8988     (if (functionp el)
    90          (let ((name? (name el)))
     89         (let ((name? (third (multiple-value-list (function-lambda-expression el)))))
    9190           (if (or (consp name?) (and name? (fboundp name?) (eq el (symbol-function name?))) )
    9291         (progn
Note: See TracChangeset for help on using the changeset viewer.