Merge pull request rsbivand#90 from rsbivand/restyle

Restyle code
stevenpawley · Jun 14, 2024 · 756ff8f · 756ff8f
2 parents 3c33552 + 9405d68
commit 756ff8f
Show file tree

Hide file tree

Showing 12 changed files with 2,430 additions and 1,965 deletions.
diff --git a/R/AAA.R b/R/AAA.R
@@ -1,80 +1,86 @@
-.GRASS_CACHE <- new.env(FALSE, parent=globalenv())
+.GRASS_CACHE <- new.env(FALSE, parent = globalenv())
 
-if(!exists("Sys.setenv", envir = baseenv())) Sys.setenv <- Sys.putenv
+if (!exists("Sys.setenv", envir = baseenv())) Sys.setenv <- Sys.putenv
 
 .onLoad <- function(lib, pkg) {
-  assign(".GRASS_old.GRASS_PAGER", Sys.getenv("GRASS_PAGER"), envir=.GRASS_CACHE)
-  Sys.setenv("GRASS_PAGER"="cat")
+  assign(".GRASS_old.GRASS_PAGER", Sys.getenv("GRASS_PAGER"), envir = .GRASS_CACHE)
+  Sys.setenv("GRASS_PAGER" = "cat")
   assign(".GRASS_old.GRASS_MESSAGE_FORMAT", Sys.getenv("GRASS_MESSAGE_FORMAT"),
-    envir=.GRASS_CACHE)
-  assign("INIT_USED", FALSE, envir=.GRASS_CACHE)
-  assign("remove_GISRC", FALSE, envir=.GRASS_CACHE)
-
-  Sys.setenv("GRASS_MESSAGE_FORMAT"="text")
+    envir = .GRASS_CACHE
+  )
+  assign("INIT_USED", FALSE, envir = .GRASS_CACHE)
+  assign("remove_GISRC", FALSE, envir = .GRASS_CACHE)
+
+  Sys.setenv("GRASS_MESSAGE_FORMAT" = "text")
 
   gisrc <- Sys.getenv("GISRC")
   loc <- Sys.getenv("LOCATION_NAME")
 
-  assign("cmdCACHE", list(), envir=.GRASS_CACHE)
-  assign("override_encoding", "", envir=.GRASS_CACHE)
+  assign("cmdCACHE", list(), envir = .GRASS_CACHE)
+  assign("override_encoding", "", envir = .GRASS_CACHE)
   SYS <- ""
-  if (.Platform$OS.type == "windows") SYS <- "WinNat"
-  else if (.Platform$OS.type == "unix") SYS <- "unix"
-  else SYS <- "unknown"
-  assign("SYS", SYS, envir=.GRASS_CACHE)
+  if (.Platform$OS.type == "windows") {
+    SYS <- "WinNat"
+  } else if (.Platform$OS.type == "unix") {
+    SYS <- "unix"
+  } else {
+    SYS <- "unknown"
+  }
+  assign("SYS", SYS, envir = .GRASS_CACHE)
   res <- ""
-  if (SYS == "WinNat") res =".exe"
-  assign("addEXE", res, envir=.GRASS_CACHE)
-  assign("WN_bat", "", envir=.GRASS_CACHE)
+  if (SYS == "WinNat") res <- ".exe"
+  assign("addEXE", res, envir = .GRASS_CACHE)
+  assign("WN_bat", "", envir = .GRASS_CACHE)
 
-  assign("ignore.stderr", FALSE, envir=.GRASS_CACHE)
-  assign("stop_on_no_flags_paras", TRUE, envir=.GRASS_CACHE)
-  assign("echoCmd", FALSE, envir=.GRASS_CACHE)
-  assign("GV", "", envir=.GRASS_CACHE)
-  assign("useIntern", FALSE, envir=.GRASS_CACHE)
-  assign("legacyExec", .Platform$OS.type == "windows", envir=.GRASS_CACHE)
-  assign("defaultFlags", NULL, envir=.GRASS_CACHE)
-  assign("suppressEchoCmdInFunc", TRUE, envir=.GRASS_CACHE)
-  assign("R_interface", NULL, envir=.GRASS_CACHE)
+  assign("ignore.stderr", FALSE, envir = .GRASS_CACHE)
+  assign("stop_on_no_flags_paras", TRUE, envir = .GRASS_CACHE)
+  assign("echoCmd", FALSE, envir = .GRASS_CACHE)
+  assign("GV", "", envir = .GRASS_CACHE)
+  assign("useIntern", FALSE, envir = .GRASS_CACHE)
+  assign("legacyExec", .Platform$OS.type == "windows", envir = .GRASS_CACHE)
+  assign("defaultFlags", NULL, envir = .GRASS_CACHE)
+  assign("suppressEchoCmdInFunc", TRUE, envir = .GRASS_CACHE)
+  assign("R_interface", NULL, envir = .GRASS_CACHE)
 }
 
 .onAttach <- function(lib, pkg) {
   gisrc <- Sys.getenv("GISRC")
   loc <- Sys.getenv("LOCATION_NAME")
-  if (nchar(gisrc) == 0) gv <- "(GRASS not running)"
-  else {
+  if (nchar(gisrc) == 0) {
+    gv <- "(GRASS not running)"
+  } else {
     gv <- .grassVersion()
     comp <- .compatibleGRASSVersion(gv)
-    if (!is.na(comp) && !comp ){
-        stop( attr(comp, "message") )
+    if (!is.na(comp) && !comp) {
+      stop(attr(comp, "message"))
+    }
+    assign("GV", gv, envir = .GRASS_CACHE)
+    if (nchar(loc) == 0) {
+      loc <- read.dcf(gisrc)[1, "LOCATION_NAME"]
     }
-    assign("GV", gv, envir=.GRASS_CACHE)
-    if(nchar(loc) == 0) {
-      loc <- read.dcf(gisrc)[1,"LOCATION_NAME"]
-  }
-
   }
 
-  Smess <- paste('GRASS GIS interface loaded ',
-    'with GRASS version: ', gv, '\n',
-    ifelse(nchar(loc) == 0, '', paste('and location: ', loc, '\n', sep="")),
-      sep="")
+  Smess <- paste("GRASS GIS interface loaded ",
+    "with GRASS version: ", gv, "\n",
+    ifelse(nchar(loc) == 0, "", paste("and location: ", loc, "\n", sep = "")),
+    sep = ""
+  )
   packageStartupMessage(Smess, appendLF = FALSE)
 }
 
 .onUnload <- function(lib, pkg) {
-    if (get("INIT_USED", envir=.GRASS_CACHE)) {
-        if (get("remove_GISRC", envir=.GRASS_CACHE)) {
-            gisrc <- Sys.getenv("GISRC")
-            if (file.exists(gisrc)) unlink(gisrc)
-            Sys.unsetenv("GISRC")
-        }
-        unlink_.gislock()
-        unset.GIS_LOCK()
+  if (get("INIT_USED", envir = .GRASS_CACHE)) {
+    if (get("remove_GISRC", envir = .GRASS_CACHE)) {
+      gisrc <- Sys.getenv("GISRC")
+      if (file.exists(gisrc)) unlink(gisrc)
+      Sys.unsetenv("GISRC")
     }
-    Sys.setenv("GRASS_PAGER"=get(".GRASS_old.GRASS_PAGER", envir=.GRASS_CACHE))
-    Sys.setenv("GRASS_MESSAGE_FORMAT"=get(".GRASS_old.GRASS_MESSAGE_FORMAT",
-        envir=.GRASS_CACHE))
-    rm(.GRASS_CACHE)
+    unlink_.gislock()
+    unset.GIS_LOCK()
+  }
+  Sys.setenv("GRASS_PAGER" = get(".GRASS_old.GRASS_PAGER", envir = .GRASS_CACHE))
+  Sys.setenv("GRASS_MESSAGE_FORMAT" = get(".GRASS_old.GRASS_MESSAGE_FORMAT",
+    envir = .GRASS_CACHE
+  ))
+  rm(.GRASS_CACHE)
 }
-