max/ourMELONS
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

Improved lots of substutitions

Browse source
This commit is contained in:
Waldir Leoncio 2020-11-19 13:32:14 +01:00
parent ba5f9f2690
commit d835c10322
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
R/matlab2r.R
View file

@ -20,7 +20,7 @@
#' to `output = "save"` when you are confident that no important code will be #' to `output = "save"` when you are confident that no important code will be
#' lost (for shorter functions, a careful visual inspection should suffice). #' lost (for shorter functions, a careful visual inspection should suffice).
matlab2r <- function( matlab2r <- function(
filename, output = "clean", improve_formatting=TRUE, change_assignment=TRUE, filename, output = "diff", improve_formatting=TRUE, change_assignment=TRUE,
append=FALSE append=FALSE
) { ) {
# TODO: this function is too long! Split into subfunctions # TODO: this function is too long! Split into subfunctions
@ -34,6 +34,7 @@ matlab2r <- function(
# Reading file into R # # Reading file into R #
# ======================================================== # # ======================================================== #
txt <- readLines(filename) txt <- readLines(filename)
original <- txt
# ======================================================== # # ======================================================== #
# Replacing text # # Replacing text #
@ -42,12 +43,20 @@ matlab2r <- function(
# Uncommenting ------------------------------------------- # # Uncommenting ------------------------------------------- #
txt <- gsub("^#\\s?(.+)", "\\1", txt) txt <- gsub("^#\\s?(.+)", "\\1", txt)
# Function header ---------------------------------------- # # Output variable ---------------------------------------- #
out <- gsub( out <- gsub(
pattern = "\\t*function (\\S+)\\s*=\\s*(.+)\\((.+)\\)", pattern = "\\t*function ((\\S|\\,\\s)+)\\s?=\\s?(\\w+)\\((.+)\\)",
replacement = "\treturn(\\1)", replacement = "\\1",
x = txt[1] x = txt[1]
) # TODO: improve by detecting listed outputs ) # TODO: improve by detecting listed outputs
if (substring(out, 1, 1) == "[") {
out <- strsplit(out, "(\\,|\\[|\\]|\\s)")[[1]]
out <- out[which(out != "")]
out <- sapply(seq_along(out), function(x) paste(out[x], "=", out[x]))
out <- paste0("list(", paste(out, collapse=", "), ")")
}
# Function header ---------------------------------------- #
txt <- gsub( txt <- gsub(
pattern = "\\t*function (.+)\\s*=\\s*(.+)\\((.+)\\)", pattern = "\\t*function (.+)\\s*=\\s*(.+)\\((.+)\\)",
replacement = "\\2 <- function(\\3) {", replacement = "\\2 <- function(\\3) {",
@ -94,6 +103,7 @@ matlab2r <- function(
txt <- gsub("(\\S)\\+(\\S)", "\\1 + \\2", txt) txt <- gsub("(\\S)\\+(\\S)", "\\1 + \\2", txt)
txt <- gsub("(\\S)\\-(\\S)", "\\1 - \\2", txt) txt <- gsub("(\\S)\\-(\\S)", "\\1 - \\2", txt)
txt <- gsub("(\\S)\\*(\\S)", "\\1 * \\2", txt) txt <- gsub("(\\S)\\*(\\S)", "\\1 * \\2", txt)
txt <- gsub("(\\S)\\/(\\S)", "\\1 / \\2", txt)
# Logic operators # Logic operators
txt <- gsub("~", "!", txt) txt <- gsub("~", "!", txt)
txt <- gsub("(\\S)>=(\\S)", "\\1 >= \\2", txt) txt <- gsub("(\\S)>=(\\S)", "\\1 >= \\2", txt)
@ -110,10 +120,11 @@ matlab2r <- function(
# replacement = paste0("\\1 ", ass_op, "\\5"), # replacement = paste0("\\1 ", ass_op, "\\5"),
# x = txt # x = txt
# ) # )
txt <- gsub("%(\\s?)(\\w)", "# \\2", txt)
} }
# Adding output and end-of-file brace -------------------- # # Adding output and end-of-file brace -------------------- #
txt <- append(txt, paste(out, "\n}")) txt <- append(txt, paste0("\treturn(", out, ")\n}"))
# Returning converted code ------------------------------- # # Returning converted code ------------------------------- #
if (output == "asis") { if (output == "asis") {