=== modified file 'bin/aat.awk'
--- bin/aat.awk	2013-09-16 23:15:18 +0000
+++ bin/aat.awk	2013-09-16 21:20:41 +0000
@@ -36,6 +36,7 @@
 
 	# Macro to insert another file as verbatim code
 	else if(name == "awk"){
+		filename=substr(line, 6)
 		tok_type=T_AWK
 		while(getline <args) {
 			token($0 "\n")
@@ -44,6 +45,7 @@
 
 	# Macro to insert another file as text
 	else if(name == "text"){
+		filename=substr(line, 7)
 		while(getline <args) {
 			token($0 "\n")
 		}
@@ -52,7 +54,7 @@
 	# Leave the @ there for postprocessing with sed
 	else {
 		tok_type=T_AWK
-		token("@" name " " args "\n")
+		token("@" line "\n")
 	}
 }
 

=== modified file 'bin/aat_macros.sed'
--- bin/aat_macros.sed	2013-09-16 23:15:18 +0000
+++ bin/aat_macros.sed	2013-09-16 21:20:41 +0000
@@ -6,7 +6,7 @@
 s/^[[:space:]]*ELSE[[:space:]]*$/} else {/
 s/^[[:space:]]*ENDIF[[:space:]]*$/}/
 
-s/^[[:space:]]*@for[[:space:]]\+\([[:alnum:]]\+\)[[:space:]]\+in[[:space:]]\+\(.\+\)$/for(_loop_\1=loop_start("\2", "\1."); loop_iter(_loop_\1);) {/
+s/^[[:space:]]*@for[[:space:]]\+\([[:alnum:]]\+\)[[:space:]]\+in[[:space:]]\+\(.\+\)$/for(_loop_\1=loop_start("\2", "\1_"); loop_iter(_loop_\1);) {/
 s/^[[:space:]]*@endfor[[:space:]]*$/} loop_end()/
 s/^[[:space:]]*@if[[:space:]]\+\(.\+\)$/if(\1) {\n/
 s/^[[:space:]]*@elif[[:space:]]\+\(.\+\)$/} else if(\1) {\n/

=== modified file 'data'
--- data	2013-09-16 23:15:18 +0000
+++ data	2013-09-11 23:26:09 +0000
@@ -4,9 +4,3 @@
 hello	world	12
 fish	thanks	42
 ]
-names=[
-name
-Jack
-Joe
-Jonathan
-]

=== modified file 'data.awk'
--- data.awk	2013-09-16 23:15:18 +0000
+++ data.awk	2013-09-16 21:20:41 +0000
@@ -1,7 +1,7 @@
 #!/bin/awk -f
 BEGIN {
 	IFS="\t"
-	SUBSEP="."
+	SUBSEP=":"
 	state = 0
 	# 0 read normal variables
 	# 1 seen start of field list, read titles
@@ -17,12 +17,13 @@
 }
 
 state == 2 {
-	V[varname,++V[varname,"rows"]] = $0
+	V[varname,list_n++] = $0
 	next
 }
 
 state == 1 {
 	V[varname,"fields"] = $0
+	list_n = 1
 	state = 2
 	next
 }
@@ -74,41 +75,16 @@
 	loop_stack["depth"]--
 }
 
-function get(varname,   i, n, names, values, loopvar, looprow, prefix) {
+function get(varname,   i, n, names, values) {
 	for(i=loop_stack["depth"]; i>0; i--) {
-		prefix = loop_stack[i, "pre"]
-		if(prefix)
-			if(substr(varname, 1, length(prefix)) != prefix)
-				continue
-		loopvar = loop_stack[i, "var"]
-		looprow = loop_stack[i, "row"]
-		if(varname == prefix"_index")
-			return looprow
-		if(varname == prefix"_index0")
-			return looprow - 1
-		if(varname == prefix"_revindex")
-			return V[loopvar, "rows"] - looprow + 1
-		if(varname == prefix"_revindex0")
-			return V[loopvar, "rows"] - looprow
-		if(varname == prefix"_first")
-			return looprow == 1
-		if(varname == prefix"_last")
-			return looprow == V[loopvar, "rows"]
-		if(varname == prefix"_length")
-			return V[loopvar, "rows"]
-		split(V[loopvar, "fields"], names)
+		split(V[loop_stack[i, "var"], "fields"], names)
 		for(n in names) {
-			if(varname == (prefix names[n])) {
-				split(V[loopvar, looprow], values)
+			if(varname == (loop_stack[i, "pre"] names[n])) {
+				split(V[loop_stack[i, "var"], loop_stack[i, "row"]], values)
 				return values[n]
 			}
 		}
 	}
-	if(DEBUG) {
-		if(!(varname in V)) {
-			print "variable not found: " varname >"/dev/stderr"
-		}
-	}
 	return V[varname]
 }
 

=== modified file 'hello3.aat'
--- hello3.aat	2013-09-16 23:15:18 +0000
+++ hello3.aat	2013-09-16 21:20:41 +0000
@@ -1,15 +1,9 @@
+|!/bin/awk -f
 @awk data.awk
 |END {
-@for x in spam
-{{get("x.name")}} - {{get("x.value")}}
-@  for y in spam
-{{ get("x.eggs") + get("y.eggs") }}
+@  for name in names
+Hello {{get("name_v")}}{{get("name__last") ? "!" : ","}}
 @  endfor
-@endfor
---------------------
-@for n in names
-Hello {{get("n.name") (get("n._last") ? "!" : ",")}}
-@endfor
 
 Welcome to the world of {{toupper("awk")}} templating!
 |}