aat

commit 1d467244ca4b0479a65b2ee9665833c1011a3099
parent c9a2cd24c43b3c4571211b596d4967869bdfc826
Author: Jan Pobrislo <ccx@wpr.cz>
Date:   Thu,  3 Sep 2015 21:57:24 +0200

test for empty stderr, clarify regexp
Diffstat:
M
aat.test
 | 
5
+++++
M
aat_data.test
 | 
1
+
M
aat_simple.test
 | 
2
++
M
bin/query.awk
 | 
6
++++--
M
query.test
 | 
13
+++++++++++++
M
testloop
 | 
2
+-

6 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/aat.test b/aat.test
@@ -3,6 +3,7 @@
 Hello world!
 >>>
 printf "%s", "Hello world!\n"
+>>>2
 >>>= 0
 
 ./bin/aat.awk
@@ -10,6 +11,7 @@ printf "%s", "Hello world!\n"
 |BEGIN {print "Hello world!"}
 >>>
 BEGIN {print "Hello world!"}
+>>>2
 >>>= 0
 
 ./bin/aat.awk
@@ -17,6 +19,7 @@ BEGIN {print "Hello world!"}
 Hello {{name}}!
 >>>
 printf "%s", "Hello " (name) "!\n"
+>>>2
 >>>= 0
 
 ./bin/aat.awk
@@ -24,6 +27,7 @@ printf "%s", "Hello " (name) "!\n"
 Hello {<name>}!
 >>>
 printf "%s", "Hello " (<name>) "!\n"
+>>>2
 >>>= 0
 
 ./bin/aat.awk
@@ -31,4 +35,5 @@ printf "%s", "Hello " (<name>) "!\n"
 Hello {<a<b<c>>>}!
 >>>
 printf "%s", "Hello " (<a<b<c>>>) "!\n"
+>>>2
 >>>= 0
diff --git a/aat_data.test b/aat_data.test
@@ -8,4 +8,5 @@ Hello {<name>}!
 name=world
 >>>
 Hello world!
+>>>2
 >>>= 0
diff --git a/aat_simple.test b/aat_simple.test
@@ -5,6 +5,7 @@ Hello world!
 |}
 >>>
 Hello world!
+>>>2
 >>>= 0
 
 ./bin/aat -
@@ -15,4 +16,5 @@ Hello {{name}}!
 |}
 >>>
 Hello world!
+>>>2
 >>>= 0
diff --git a/bin/query.awk b/bin/query.awk
@@ -84,8 +84,10 @@ function parse_line(line) {
 				out("\"")
 			} else {
 				if(DEBUG) printf "q: →%s← →%s←\n", last_out, line >"/dev/stderr"
-				if(match(last_out, /[\n\t([ ]$/) && \
-				   match(line, /^<([a-zA-Z0-9._<>]|'[^']*')*>/)) {
+				if( \
+					match(last_out, /[[( \n\t]$/) && \
+					match(line, /^<([a-zA-Z0-9._<>]|'[^']*')*>/) \
+				) {
 					expand_remaining = substr(line, 2, RLENGTH-2)
 					line = substr(line, RLENGTH+1)
 					out(expand_query())
diff --git a/query.test b/query.test
@@ -5,6 +5,7 @@ BEGIN {
 >>>
 BEGIN {
 }
+>>>2
 >>>= 0
 
 ./q
@@ -12,6 +13,7 @@ BEGIN {
 	foo(<bar>)
 >>>
 	foo(get("bar"))
+>>>2
 >>>= 0
 
 ./q
@@ -19,6 +21,7 @@ BEGIN {
 	x[<y<z>>] = <a'b()'>
 >>>
 	x[get("y"get("z"))] = get("a"(b()))
+>>>2
 >>>= 0
 
 ./q
@@ -26,6 +29,7 @@ BEGIN {
 	y = ""
 >>>
 	y = ""
+>>>2
 >>>= 0
 
 ./q
@@ -33,6 +37,7 @@ BEGIN {
 	y = (y) (<c:>)
 >>>
 	y = (y) ((find("c")?found:""))
+>>>2
 >>>= 0
 
 ./q
@@ -40,6 +45,7 @@ BEGIN {
 	y = (y) (<d:'0'>)
 >>>
 	y = (y) ((find("d")?found:(0)))
+>>>2
 >>>= 0
 
 ./q
@@ -47,6 +53,7 @@ BEGIN {
 	y = (y) (<e:<f>>)
 >>>
 	y = (y) ((find("e")?found:get("f")))
+>>>2
 >>>= 0
 
 ./q
@@ -54,6 +61,7 @@ BEGIN {
 	y = (y) (<g:<h:<i>>>)
 >>>
 	y = (y) ((find("g")?found:(find("h")?found:get("i"))))
+>>>2
 >>>= 0
 
 ./q
@@ -61,6 +69,7 @@ BEGIN {
 	y = (y) (<g:<h:<i:'<j> - (<k:'0'>)'>>>)
 >>>
 	y = (y) ((find("g")?found:(find("h")?found:(find("i")?found:(get("j") - ((find("k")?found:(0))))))))
+>>>2
 >>>= 0
 
 ./q
@@ -68,6 +77,7 @@ BEGIN {
 	y = (y) (<g:<h:<i:'(<j>) - (<k:'0'>)'>>>)
 >>>
 	y = (y) ((find("g")?found:(find("h")?found:(find("i")?found:((get("j")) - ((find("k")?found:(0))))))))
+>>>2
 >>>= 0
 
 ./q
@@ -75,6 +85,7 @@ BEGIN {
 	y = (y) (<a|C:'"r\n"'>)
 >>>
 	y = (y) ((find("a")?C(found):("r\n")))
+>>>2
 >>>= 0
 
 ./q
@@ -82,6 +93,7 @@ BEGIN {
 	y = (y) (<a|C:"r\n">)
 >>>
 	y = (y) ((find("a")?C(found):"r\n"))
+>>>2
 >>>= 0
 
 ./q
@@ -89,4 +101,5 @@ BEGIN {
 	y = (y) (<a|C>)
 >>>
 	y = (y) (C(get("a")))
+>>>2
 >>>= 0
diff --git a/testloop b/testloop
@@ -12,7 +12,7 @@ typeset -g run evt fname
 test_args=( "$@" )
 
 do_test() {
-	shelltest -ap *.test -c "$test_args[@]" -- -j8 -o1
+	shelltest *.test -c "$test_args[@]"
 	# time py.test "$test_args"
 }