aat

commit 237f7d9ab209abf97fa539be34e358f2048c39a2
parent dfdb0682e325c4b12d2fbfba1ff1a3cf5e9be6b5
Author: Jan Pobrislo <ccx@webprojekty.cz>
Date:   Mon, 14 Oct 2013 00:19:07 +0200

make aat produce <> enclosed strings for postprocessing with query.awk
Diffstat:
M
bin/aat.awk
 | 
30
+++++++-----------------------

1 file changed, 7 insertions(+), 23 deletions(-)
diff --git a/bin/aat.awk b/bin/aat.awk
@@ -242,9 +242,8 @@ function aat_process(str) {
 		} else if(match(str, /^[a-zA-Z_.<>'][a-zA-Z0-9_.<>']*/)) {
 			# a query
 			match_dbg("query", str)
-			expand_remaining=substr(str, 1, RLENGTH)
+			processed = processed "<" substr(str, 1, RLENGTH) ">"
 			str = substr(str, RLENGTH+1)
-			processed = processed expand_query()
 		} else if(match(str, /^\|[a-zA-Z]/)) {
 			# filters ahead
 			match_dbg("filter", str)
@@ -284,27 +283,12 @@ function aat_process(str) {
 		str = substr(str, RLENGTH+1)
 		if(str == "") {
 			args = ""
-		} else if(match(str, /^</)) {
-			expand_remaining = substr(str, 2)
-			args = ", " expand_query()
-			str = expand_remaining
-			while(match(str, /^,</)) {
-				expand_remaining = substr(str, 3)
-				args = args ", " expand_query()
-				str = expand_remaining
-			}
-			if(match(str, /^[^|]+/)) {
-				args = args substr(str, 1, RLENGTH)
-				str = substr(str, RLENGTH+1)
-			}
-		} else if(match(str, /^ /)) {
-			if(match(str, /\|[a-zA-Z_]/)) {
-				args = ", " substr(str, 1, RLENGTH-1)
-				str = substr(str, RSTART)
-			} else {
-				args = ", " str
-				str = ""
-			}
+		} else if(match(str, /\|[a-zA-Z_][a-zA-Z0-9_.]* /)) {
+			args = "," substr(str, 1, RSTART-1)
+			str = substr(str, RSTART)
+		} else {
+			args = "," str
+			str = ""
 		}
 		processed = filter_name "(" processed args ")"
 	}