1 files changed, 28 insertions, 24 deletions
diff --git a/old-tests/variable/override/buildfile b/old-tests/variable/override/buildfile
index 2889f69..c0330cb 100644
--- a/old-tests/variable/override/buildfile
+++ b/old-tests/variable/override/buildfile
@@ -1,57 +1,61 @@
-if ($t != [null])
+if ($p.t != [null])
 {
-  [$t] v = [null]
+  [$p.t] p.v = [null]
 }
 
-print "/     :" $(/: v)
+/:
 
-if ($a == as)
+print "/     :" $(/: p.v)
+
+if ($p.a == as)
 {
-  v = x
+  p.v = x
 }
-elif ($a == ap)
+elif ($p.a == ap)
 {
-  v += s
+  p.v += s
 }
-elif ($a == pr)
+elif ($p.a == pr)
 {
-  v =+ p
+  p.v =+ p
 }
 
-print ".     :" $v
+print ".     :" $p.v
 
 d/
 {
-  if ($d_a == as)
+  file{t}:
+
+  if ($p.d_a == as)
   {
-    v = x
+    p.v = x
   }
-  elif ($d_a == ap)
+  elif ($p.d_a == ap)
   {
-    v += s
+    p.v += s
   }
-  elif ($d_a == pr)
+  elif ($p.d_a == pr)
   {
-    v =+ p
+    p.v =+ p
   }
 
-  print "d     :" $v
+  print "d     :" $p.v
 
 
-  if ($d_t_a == as)
+  if ($p.d_t_a == as)
   {
-    file{t}: v = x
+    file{t}: p.v = x
   }
-  elif ($d_t_a == ap)
+  elif ($p.d_t_a == ap)
   {
-    file{t}: v += s
+    file{t}: p.v += s
   }
-  elif ($d_t_a == pr)
+  elif ($p.d_t_a == pr)
   {
-    file{t}: v =+ p
+    file{t}: p.v =+ p
   }
 
-  print "d/t   :" $(file{t}: v)
+  print "d/t   :" $(file{t}: p.v)
 }
 
 include p/