Restructure block layout to be simpler

Author: ingydotnet

src/bash/bin/lingy-to-bash

@@ -234,9 +234,10 @@ sub make_data {
     for my $block (@{$ast->{data}}) {
         $i++;
         push @bash, '';
-        push @bash, "TestML.block:$i:Label() { echo '$block->{label}'; }";
-        for my $point (sort keys %{$block->{point}}) {
-            my $value = $block->{point}{$point};
+        push @bash, "TestML.block:$i:Label() { echo '$block->{Label}'; }";
+        for my $point (sort keys %$block) {
+            next if $point =~ /^[A-Z]/;
+            my $value = $block->{$point};
             $value =~ s/([\\\"\`\$])/\\$1/g;
             if ($value =~ /\n/) {
                 push @bash, qq<TestML.block:$i:$point() { echo \\\n"$value"; }>;

src/coffee/lib/testml/run.coffee

@@ -290,7 +290,7 @@ class TestML.Run
     for block in @data
       @block = block
 
-      if block.point.ONLY and not @warned_only
+      if block.ONLY and not @warned_only
         @err "Warning: TestML 'ONLY' in use."
         @warned_only = true
 
@@ -303,8 +303,8 @@ class TestML.Run
   pick_exec: (list, expr)->
     pick = true
     for point in list
-      if (point.match(/^\*/) and not @block.point[point[1..]]?) or
-          (point.match(/^\!\*/) and @block.point[point[2..]]?)
+      if (point.match(/^\*/) and not @block[point[1..]]?) or
+          (point.match(/^\!\*/) and @block[point[2..]]?)
         pick = false
         break
 
@@ -355,7 +355,7 @@ class TestML.Run
   #----------------------------------------------------------------------------
   getp: (name)->
     return unless @block
-    value = @block.point[name]
+    value = @block[name]
     value = @exec value if value?
     value
 
@@ -429,7 +429,7 @@ class TestML.Run
     label = @exec label_expr
 
     label ||= @getv('Label') || ''
-    block_label = if @block? then @block.label else ''
+    block_label = if @block? then @block.Label else ''
 
     if label
       label = label.replace /^\+/, block_label
@@ -461,5 +461,5 @@ class TestML.Run
     @transform value, label
 
   transform2: (name, label)=>
-    return '' unless (value = @block?.point[name])?
+    return '' unless (value = @block?[name])?
     @transform value, label

src/coffee/lib/testml/stdlib.coffee

@@ -24,7 +24,7 @@ class TestML.StdLib
   block: (selector)->
     return @run.block if not selector?
     for block in @run.data
-      if block.label == selector
+      if block.Label == selector
         return block
     null
 

src/perl/lib/TestML/Run.pm

@@ -410,6 +410,11 @@ sub each_pick {
   for my $block (@{$self->{ast}{data}}) {
     $self->{block} = $block;
 
+    if (defined $block->{ONLY} and not $self->{warned_only}) {
+      $self->err("Warning: TestML 'ONLY' in use.");
+      $self->{warned_only} = true;
+    }
+
     $self->exec_expr(['<>', $list, $expr]);
   }
 
@@ -422,7 +427,7 @@ sub pick_exec {
   my ($self, $list, $expr) = @_;
 
   my $pick = 1;
-  if (my $when = $self->{block}{point}{WHEN}) {
+  if (my $when = $self->{block}{WHEN}) {
     if ($when =~ /^Env:(\w+)$/) {
       $pick = 0 unless $ENV{$1};
     }
@@ -432,9 +437,9 @@ sub pick_exec {
     for my $point (@$list) {
       if (
         ($point =~ /^\*/ and
-          not exists $self->{block}{point}{substr($point, 1)}) or
+          not exists $self->{block}{substr($point, 1)}) or
         ($point =~ /^!*/) and
-          exists $self->{block}{point}{substr($point, 2)}
+          exists $self->{block}{substr($point, 2)}
       ) {
         $pick = 0;
         last;
@@ -512,7 +517,7 @@ sub or_set_var {
 sub getp {
   my ($self, $name) = @_;
   return unless $self->{block};
-  my $value = $self->{block}{point}{$name};
+  my $value = $self->{block}{$name};
   $self->exec($value) if defined $value;
 }
 
@@ -607,8 +612,8 @@ sub get_label {
 
   my $block_label = (
     defined($self->{block}) and
-    defined($self->{block}{label})
-  ) ? $self->{block}{label}
+    defined($self->{block}{Label})
+  ) ? $self->{block}{Label}
     : '';
 
   if ($label) {
@@ -668,7 +673,7 @@ sub transform1 {
 sub transform2 {
   my ($self, $name, $label) = @_;
   return '' unless $self->{block};
-  my $value = $self->{block}{point}{$name};
+  my $value = $self->{block}{$name};
   return '' unless defined $value;
   $self->transform($value, $label);
 }

src/perl/lib/TestML/StdLib.pm

@@ -16,7 +16,7 @@ sub block {
   return $self->{run}{block}
     if not defined $selector;
   for my $block (@{$self->{run}{ast}{data}}) {
-    if ($block->{label} eq $selector) {
+    if ($block->{Label} eq $selector) {
       return $block;
     }
   }

src/python/lib/testml/run/__init__.py

@@ -1,5 +1,6 @@
 # -*- coding: utf8 -*-
 
+from __future__ import print_function
 import json, os, re, sys
 
 from testml.util import *
@@ -303,7 +304,7 @@ def each_pick(self, list_, expr):
     for block in self.ast.get('data', []):
       self.block = block
 
-      if block['point'].get('ONLY') and not self.warned_only:
+      if block.get('ONLY') and not self.warned_only:
         self.err("Warning: TestML 'ONLY' in use.")
         self.warned_only = True
 
@@ -315,9 +316,9 @@ def pick_exec(self, list_, expr):
     pick = True
     for point in list_:
       if (re.match(r'\*', point) and
-          self.block['point'].get(point[1:])) == None or \
+          self.block.get(point[1:])) == None or \
          (re.match(r'\!\*', point) and
-          self.block['point'].get(point[2:])):
+          self.block.get(point[2:])):
         pick = False
         break
 
@@ -380,7 +381,7 @@ def or_set_var(self, name, expr):
   def getp(self, name):
     if not self.block:
       return
-    value = self.block['point'].get(name)
+    value = self.block.get(name)
     if value is not None:
       value = self.exec_(value)
     return value
@@ -453,7 +454,7 @@ def get_label(self, label_expr=''):
       if not label:
         label = ''
 
-    block_label = self.block['label'] if self.block else ''
+    block_label = self.block['Label'] if self.block else ''
 
     if label:
       label = re.sub(r'^\+', block_label, label)
@@ -490,7 +491,10 @@ def transform1(self, m, label):
 
   def transform2(self, m, label):
     if not self.block: return ''
-    value = self.block['point'].get(m.group(1))
+    value = self.block.get(m.group(1))
     return self.transform(value, label) if value != None else ''
 
+  def err(self, msg):
+    print(msg, file=sys.stderr)
+
 # vim: sw=2:

src/python/lib/testml/stdlib.py

@@ -18,7 +18,7 @@ def block(self, selector=None):
       return self.run.block
 
     for block in self.run.ast.get('data', []):
-      if block['label'] == selector:
+      if block['Label'] == selector:
         return block
 
   def blocks(self):

src/raku/lib/TestML/Run.pm6

@@ -345,6 +345,11 @@ method each-pick($list, $expr) {
   for |$!data -> $block {
     $!block = $block;
 
+    if defined $!block<ONLY> and not self.warned-only {
+      self.err("Warning: TestML 'ONLY' in use.");
+      self.warned-only = True;
+    }
+
     self.exec-expr(['<>', $list, $expr]);
   }
 
@@ -357,9 +362,9 @@ method pick-exec($list, $expr) {
   my $pick = True;
   for |$list -> $point {
     if ($point ~~ /^\*/ and
-        not $!block<point>{substr($point, 1)}:exists) or
+        not $!block{substr($point, 1)}:exists) or
        ($point ~~ /^\!\*/ and
-        $!block<point>{substr($point, 2)}:exists
+        $!block{substr($point, 2)}:exists
     ) {
       $pick = False;
       last;
@@ -427,7 +432,7 @@ method or-set-var($name, $expr) {
 #------------------------------------------------------------------------------
 method getp($name) {
   return unless $!block;
-  my $value = $!block<point>{$name};
+  my $value = $!block{$name};
   self.exec($value) if $value.defined;
 }
 
@@ -504,7 +509,7 @@ method get-label($label-expr='') {
 
   $label ||= self.getv('Label') || '';
 
-  my $block-label = $!block ?? $!block<label> !! '';
+  my $block-label = $!block ?? $!block<Label> !! '';
 
   if $label {
     $label ~~ s/^\+/$block-label/;
@@ -553,7 +558,7 @@ method transform1($name, $label) {
 
 method transform2($name, $label) {
   return '' unless $.block;
-  my $value = $.block<point>{$name} // return '';
+  my $value = $.block{$name} // return '';
   self.transform($value, $label);
 }
 

src/raku/lib/TestML/StdLib.pm6

@@ -14,7 +14,7 @@ method block($selector=Nil) {
   return $.run.block
     if not defined $selector;
   for $.run.data -> $block {
-    if $block<label> eq $selector {
+    if $block<Label> eq $selector {
       return $block;
     }
   }

src/ruby/lib/testml/run.rb

@@ -412,6 +412,12 @@ def each_pick(list, expr)
 
     @ast["data"].each do |block|
       @block = block
+
+      if @block["ONLY"] and not @warned_only
+        self.err("Warning: TestML 'ONLY' in use")
+        @warned_only = true
+      end
+
       self.exec_expr ['<>', list, expr]
     end
 
@@ -424,8 +430,8 @@ def pick_exec(list, expr)
     pick = true
 
     list.each do |point|
-      if point.match /^\*/ and not @block["point"].key? point[1..-1] or
-         point.match /^!*/ and @block["point"].key? point[2..-1]
+      if point.match /^\*/ and not @block.key? point[1..-1] or
+         point.match /^!*/ and @block.key? point[2..-1]
         throw point
         pick = false
         break
@@ -499,7 +505,7 @@ def get_point(name)
 # #------------------------------------------------------------------------------
   def getp(name)
     return unless @block
-    value = @block["point"][name]
+    value = @block[name]
     value = self.exec value if defined? value
     return value
   end
@@ -597,7 +603,7 @@ def get_label(label_expr)
 
 #   $label ||= $self->getv('Label') || '';
 
-    block_label = @block ? @block['label'] : ''
+    block_label = @block ? @block['Label'] : ''
 
     if label
 #     $label =~ s/^\+/$block_label/;