=== modified file 'bin/aat.awk'
--- bin/aat.awk	2014-06-29 04:36:59 +0000
+++ bin/aat.awk	2014-06-25 11:06:56 +0000
@@ -8,15 +8,6 @@
 	T_AWK  = 3; type_names[3] = "awk"
 	T_FUNC = 4; type_names[4] = "func"
 	tok_type = T_TEXT
-
-	# get current directory
-	"pwd" | getline PWD
-	close("pwd")
-
-	# empty the depency file
-	if ("AAT_DEP" in ENVIRON) {
-		printf "" >ENVIRON["AAT_DEP"]
-	}
 }
 
 # Append 'content' to array of tokens. Token type is taken from current value
@@ -38,9 +29,6 @@
 
 # Print file dependencies for makefile usage
 function print_dep(str) {
-	if(str !~ /^\//) {
-		str = PWD "/" str
-	}
 	if ("AAT_DEP" in ENVIRON) {
 		print str >>ENVIRON["AAT_DEP"]
 	} else {
@@ -48,98 +36,33 @@
 	}
 }
 
-function die(msg) {
-	print msg >>"/dev/stderr"
-	exit 1
-}
-
-function sh_escape(str) {
-	gsub(/["$\\]/, "\\&", str)
-	return "\"" str "\""
-}
-
-# find a file relative to current filename and overwrite that variable
-function find_file(name) {
-	# TODO: include search path
-	if(name ~ /^\//) {
-		# absolute path
-		filename = name
-	} else {
-		# relative path
-		if(match(filename, "/[^/]*$")) {
-			filename = substr(filename, 1, RSTART) name
-		} else {
-			filename = name
-		}
-	}
-
-	if(system("test -f " sh_escape(filename)) != 0)
-	{
-		die("could not find requested file: " sh_escape(filename) " (" name ") PWD: " PWD)
-	}
-
-	print_dep(filename)
-}
-
-function macro_readinto(args,    varname) {
-	varname = sub(/[ \t].*$/, "", args)
-	find_file(sub(/^[^ \t]+[ \t]+/, "", args))
-	tok_type=T_AWK
-	while(getline <filename) {
-		gsub(/["\\]/, "\\&", $0)
-		token(varname " = \"" $0 "\\n\"\n")
-	}
-	close(filename)
-	filename = file_old
-}
-
-function call_macro(name, args,    file_old) {
+function call_macro(name, args) {
 	# Macro to recursively parse another template
 	if(name == "include"){
-		file_old = filename
-		find_file(args)
-		while(getline <filename) {
+		# TODO: resolve relative filenames
+		# TODO: include search path
+		print_dep(args)
+		while(getline <args) {
 			parse_line($0)
 		}
-		close(filename)
-		filename = file_old
 	}
 
 	# Macro to insert another file as verbatim code
 	else if(name == "awk"){
-		file_old = filename
-		find_file(args)
+		print_dep(args)
 		tok_type=T_AWK
-		while(getline <filename) {
+		while(getline <args) {
 			token($0 "\n")
 		}
-		close(filename)
-		filename = file_old
 	}
 
 	# Macro to insert another file as text
 	else if(name == "text"){
-		file_old = filename
-		find_file(args)
+		print_dep(args)
 		tok_type=T_TEXT
-		while(getline <filename) {
+		while(getline <args) {
 			token($0 "\n")
 		}
-		close(filename)
-		filename = file_old
-	}
-
-	# Macro to insert source filename as a variable into produced code
-	else if(name == "filename"){
-		tok_type=T_AWK
-		token("filename = \"" gsub(/["\\]/, "\\&", args) "\n")
-		close(filename)
-		filename = file_old
-	}
-
-	# Macro to read content of a file into a variable
-	else if(name == "readinto"){
-		macro_readinto(args)
 	}
 
 	# Assign a variable with query expression
@@ -387,16 +310,8 @@
 	return processed
 }
 
-# for every line in files in ARGV
-{
-	# current filename being read
-	filename = FILENAME
-
-	# parse the line
-	parse_line($0)
-}
-
-# print the output
+{ parse_line($0) }
+
 END {
 	nl = 1  # are we on new line?
 	for(tok_n=1; tok_types[tok_n]; tok_n++) {