Commit7093be8

committed

removed redundant file checks

1 parentc19f575 commit7093be8Copy full SHA for 7093be8

File tree

-10

lines changed

-10

lines changed

Lines changed: 0 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -610,15 +610,7 @@ Container <- R6::R6Class(`
`610`	`610`	`}`
`611`	`611`
`612`	`612`	`if (is.character(loadFrom)) {`
`613`		`-namesplit<- strsplit(loadFrom,"\\.")`
`614`		`-ext<-utils::tail(unlist(namesplit),1)`
`615`		`-if (ext!="gdx") {`
`616`		`- stop("check filename extension, must be .gdx\n")`
`617`		`- }`
`618`	`613`	`loadFrom<-R.utils::getAbsolutePath(path.expand(loadFrom))`
`619`		`-if (!file.exists(loadFrom)) {`
`620`		`- stop(paste0("File",loadFrom," doesn't exist\n"))`
`621`		`- }`
`622`	`614`	`private$.gdxRead(loadFrom,symbols,records)`
`623`	`615`	`}elseif (inherits(loadFrom,"Container")) {`
`624`	`616`	`private$.containerRead(loadFrom,symbols,records)`

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -365,8 +365,12 @@ List CPP_readSuper(Nullable<CharacterVector> symNames_, CharacterVector gdxName,`
`365`	`365`
`366`	`366`	`int err_nr;`
`367`	`367`	`gdxobj.gdx.gdxOpenRead(gdx_name.c_str(), err_nr);`
`368`		`-if (err_nr)`
`369`		`-stop("CPP_readSuper:gdxOpenRead GDX error with error code %i", err_nr);`
	`368`	`+`
	`369`	`+ std::string msg;`
	`370`	`+if (err_nr) {`
	`371`	`+ gdxobj.gdx.gdxErrorStr(err_nr, msg.data());`
	`372`	`+stop("CPP_readSuper:gdxOpenRead"s + msg.data() +".");`
	`373`	`+ }`
`370`	`374`
`371`	`375`	`std::array<char, GMS_SSSIZE> Msg {}, Producer {};`
`372`	`376`	`gdxobj.gdx.gdxFileVersion(Msg.data(), Producer.data());`

Comments

(0)