mawk/eval

sh/core/code.awk

@@ -123,21 +123,9 @@ BEGIN {
             doc = ""
             match_task = 0
         }
-    } else if (action == "aliases functions") {
-        if (match($0, re["alias"])) {
-            append(extract($0, "alias"))
-        } else if (match($0, re["function"])) {
-            split(doc, array, "\n")
-            for (item in array) {
-                alias_eval(array[item], extract($0, "function"), "function")
-            }
-            reset()
-        } else {
-            reset()
-        }
-    } else if (action == "commands functions") {
-        if (match($0, re["command"])) {
-            append(extract($0, "command"))
+    } else if (action == "eval") {
+        if (match($0, re[target])) {
+            append(extract($0, target))
         } else if (match($0, re["function"])) {
             split(doc, array, "\n")
             for (item in array) {

sh/core/code.sh

@@ -238,15 +238,15 @@ rwx_code_doc() {
 
 rwx_code_load() {
 	local line
-	# parse aliases functions
-	_rwx_code_aliases_functions="$(rwx_code_parse "aliases functions")"
+	# parse functions aliases
+	_rwx_code_aliases_functions="$(rwx_code_action_target "eval" "alias")"
 	while IFS= read -r line; do
 		eval "${line}"
 	done <<EOF
 ${_rwx_code_aliases_functions}
 EOF
-	# parse commands functions
-	_rwx_code_commands_functions="$(rwx_code_parse "commands functions")"
+	# parse functions commands
+	_rwx_code_commands_functions="$(rwx_code_action_target "eval" "command")"
 	while IFS= read -r line; do
 		eval "${line}"
 	done <<EOF