The R Project SVN – R – Diff – /trunk/src/library/methods/R/is.R

 #  File src/library/methods/R/is.R
 #  Part of the R package, https://www.R-project.org
+#
-#  Copyright (C) 1995-2015 The R Core Team
+#  Copyright (C) 1995-2019 The R Core Team
+#
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  the Free Software Foundation; either version 2 of the License, or
 #  (at your option) any later version.
         stop(gettextf("class %s is sealed; new superclasses can not be defined, except by 'setClassUnion'",
                       dQuote(class1)),
              domain = NA)
     prevIs <- !identical(possibleExtends(class1, class2,classDef, classDef2),
                          FALSE) # used in checking for previous coerce
-    if(is.null(extensionObject))
+    obj <- if(is.null(extensionObject))
-        obj <- makeExtends(class1, class2, coerce, test, replace, by,
+               makeExtends(class1, class2, coerce, test, replace, by,
                            classDef1 = classDef, classDef2 = classDef2,
                            package = getPackageName(where))
-    else
+           else
-        obj <- extensionObject
+               extensionObject
     ## revise the superclass/subclass info in the stored class definition
     ok <- .validExtends(class1, class2, classDef,  classDef2, obj@simple)
     if(!isTRUE(ok))
-      stop(ok)
+        stop(ok)
     where2 <- .findOrCopyClass(class2, classDef2, where, "subclass")
     classDef2@subclasses[[class1]] <- obj
     if(doComplete)
         classDef2@subclasses <- completeSubclasses(classDef2, class1, obj, where)
     ## try to provide a valid prototype for virtual classes
         ## prototype is an element of class1 or its prototype if VIRTUAL
         if(extends(classDef, "NULL"))
             classDef2@prototype <- NULL
         else if(is.null(classDef2@prototype)
                 && is.na(match("NULL", names(classDef2@subclasses)))) {
+            classDef2@prototype <-
-            if(classDef@virtual)
+                if(classDef@virtual)
-                classDef2@prototype <- classDef@prototype
+                    classDef@prototype
-            else # new(), but without intialize(), which may require an arg.
+                else # new(), but without intialize(), which may require an arg.
-                classDef2@prototype <- .Call(C_new_object, classDef)
+                    .Call(C_new_object, classDef)
+        }
+    }
     assignClassDef(class2, classDef2, where2, TRUE)
     .removePreviousCoerce(class1, class2, where, prevIs)
     where1 <- .findOrCopyClass(class1, classDef, where, "superClass")
     ## insert the direct contains information in a valid spot
     .newDirectSuperclass(classDef@contains, class2, names(classDef2@contains)) <- obj
     if(doComplete) {
       classDef@contains <- completeExtends(classDef, class2, obj, where = where)
+      ## is needed at least during byte compilation of 'methods' itself :
       if(!is(classDef, "ClassUnionRepresentation")) #unions are handled in assignClassDef
         .checkSubclasses(class1, classDef, class2, classDef2, where1, where2)
+    }
     assignClassDef(class1, classDef, where1, TRUE)
     invisible(classDef)

The R Project SVN R

(root)/trunk/src/library/methods/R/is.R – Rev 75606 → 76048