move recurse_normalizeCalls after arg ordering and extracting compile-time args

perrydv · perrydv · commit f4a47b9fc233 · 2025-09-10T12:32:46.000+02:00
diff --git a/nCompiler/R/compile_normalizeCalls.R b/nCompiler/R/compile_normalizeCalls.R
@@ -69,8 +69,6 @@ compile_normalizeCalls <- function(code,
       }
     }
 
-    normalizeCallsEnv$recurse_normalizeCalls(code, symTab, auxEnv, handlingInfo)
-
     opDef <- cachedOpInfo$opDef
     matchDef <- opDef[["matchDef"]]
     if(is.null(matchDef))
@@ -79,6 +77,7 @@ compile_normalizeCalls <- function(code,
       exprClass_put_args_in_order(matchDef, code, opDef$compileArgs)
       # code <- replaceArgInCaller(code, matched_code)
     }
+    normalizeCallsEnv$recurse_normalizeCalls(code, symTab, auxEnv, handlingInfo)
   }
   nErrorEnv$stateInfo <- character()
   invisible(NULL)

Original file line number	Diff line number	Diff line change
`@@ -69,8 +69,6 @@ compile_normalizeCalls <- function(code,`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`
`72`		`- normalizeCallsEnv$recurse_normalizeCalls(code, symTab, auxEnv, handlingInfo)`
`73`		`-`
`74`	`72`	`opDef <- cachedOpInfo$opDef`
`75`	`73`	`matchDef <- opDef[["matchDef"]]`
`76`	`74`	`if(is.null(matchDef))`
`@@ -79,6 +77,7 @@ compile_normalizeCalls <- function(code,`
`79`	`77`	`exprClass_put_args_in_order(matchDef, code, opDef$compileArgs)`
`80`	`78`	`# code <- replaceArgInCaller(code, matched_code)`
`81`	`79`	`}`
	`80`	`+ normalizeCallsEnv$recurse_normalizeCalls(code, symTab, auxEnv, handlingInfo)`
`82`	`81`	`}`
`83`	`82`	`nErrorEnv$stateInfo <- character()`
`84`	`83`	`invisible(NULL)`