Support t., o., and r. prefixes for assert data

src/jat.sh.skel

@@ -171,7 +171,7 @@ jat__cmd() {
         __jat__etype=FAIL
     fi
     __jat__assert $__jat__etype "$__jat__hint" "${__jat__beids[@]}" \
-        -- "CMDLINE=${__jat__cmd[*]}" "ES_EXPR=$__jat__o_es" "ES=$__jat__r_es"
+        -- "t.cmd=${__jat__cmd[*]}" "o.es_expr=$__jat__o_es" "r.es=$__jat__r_es"
     return "$__jat__r_es"
 }
 
@@ -217,11 +217,11 @@ jat__cmp() {
     case $cmpes in
         0)
             __jat__assert PASS "$hint" "${beids[@]}" \
-                -- "RVAL=$RVal" "OP=$Op" "OVAL=$OVal"
+                -- "r.val=$RVal" "t.op=$Op" "o.val=$OVal"
             ;;
         1)
             __jat__assert FAIL "$hint" "${beids[@]}" \
-                -- "RVAL=$RVal" "OP=$Op" "OVAL=$OVal"
+                -- "r.val=$RVal" "t.op=$Op" "o.val=$OVal"
             ;;
         *)
             __jat__usage "bad syntax: $RVal $Op $OVal"
@@ -301,7 +301,7 @@ jat__eval() {
         __jat__etype=FAIL
     fi
     __jat__assert $__jat__etype "$__jat__hint" "${__jat__beids[@]}" \
-        -- "CODE=$__jat__code" "ES_EXPR=$__jat__o_es" "ES=$__jat__r_es"
+        -- "t.code=$__jat__code" "o.es_expr=$__jat__o_es" "r.es=$__jat__r_es"
     return "$__jat__r_es"
 }
 
@@ -784,8 +784,9 @@ __jat__log_event() {
     # You can provide any amount of KEY=VALUE pairs, meaning of which
     # is specific to every assert function.  (The assert function name
     # is auto-detected and logged so that you can infer KEY meanings
-    # later.)
-    #
+    # later.)  Each KEY must be simple word, except that prefixes of
+    # `t.`, `r.`, and `o.` are allowed to signify that the value logged
+    # is relevant to test method, result or oracle, respectively.
     local etype=$1; shift
     local hint=$1;    shift
     local arg
@@ -1176,7 +1177,7 @@ __jat__valid_pair() {
     # True if $1 is a valid BEID
     #
     local tainted=$1
-    grep -qx '[[:alpha:]_][[:alnum:]_]*=.*' <<<"$tainted"
+    grep -qx '\([tor][.]\)\?[[:alpha:]_][[:alnum:]_]*=.*' <<<"$tainted"
 }
 
 __jat__yamls() {

tests/basic/oracle/ylog_both.stdout

@@ -48,11 +48,11 @@ events:
             true is true
         beids: []
         data:
-            CMDLINE: |
+            t.cmd: |
                 true
-            ES_EXPR: |
+            o.es_expr: |
                 0
-            ES: |
+            r.es: |
                 0
         phase:
             id: phasid-1
@@ -78,11 +78,11 @@ events:
             false is true
         beids: []
         data:
-            CMDLINE: |
+            t.cmd: |
                 false
-            ES_EXPR: |
+            o.es_expr: |
                 0
-            ES: |
+            r.es: |
                 1
         phase:
             id: phasid-1

tests/basic/oracle/ylog_fail.stdout

@@ -48,11 +48,11 @@ events:
             true is false
         beids: []
         data:
-            CMDLINE: |
+            t.cmd: |
                 true
-            ES_EXPR: |
+            o.es_expr: |
                 1
-            ES: |
+            r.es: |
                 0
         phase:
             id: phasid-1
@@ -78,11 +78,11 @@ events:
             false is true
         beids: []
         data:
-            CMDLINE: |
+            t.cmd: |
                 false
-            ES_EXPR: |
+            o.es_expr: |
                 0
-            ES: |
+            r.es: |
                 1
         phase:
             id: phasid-1

tests/basic/oracle/ylog_pass.stdout

@@ -48,11 +48,11 @@ events:
             true is true
         beids: []
         data:
-            CMDLINE: |
+            t.cmd: |
                 true
-            ES_EXPR: |
+            o.es_expr: |
                 0
-            ES: |
+            r.es: |
                 0
         phase:
             id: phasid-1
@@ -78,11 +78,11 @@ events:
             false is false
         beids: []
         data:
-            CMDLINE: |
+            t.cmd: |
                 false
-            ES_EXPR: |
+            o.es_expr: |
                 1
-            ES: |
+            r.es: |
                 1
         phase:
             id: phasid-1