tests: update some AST-related sav/*.res files for tools

Signed-off-by: Jean Privat <jean@pryen.org>

diff --git a/tests/sav/nitlight_args1.res b/tests/sav/nitlight_args1.res
index 6a4d282..33325f6 100644 (file)
--- a/tests/sav/nitlight_args1.res
+++ b/tests/sav/nitlight_args1.res
@@ -23,7 +23,7 @@
 </span><span class="line" id="L23"><span class="nc_k">end</span>
 </span></span><span class="line" id="L24">
 </span><span class="nc_cdef foldable" id="base_simple3#Int"><span class="line" id="L25"><span class="nc_k">enum</span> <span class="nc_def nc_t popupable" title="class Int" data-title="&lt;a href=&quot;base_simple3.html#base_simple3#Int&quot;&gt;class Int&lt;/a&gt;" data-content="&lt;div&gt;&lt;b&gt;class&lt;/b&gt; &lt;span&gt;Int&lt;/span&gt;&lt;br/&gt;&lt;div class=&quot;dropdown&quot;&gt; &lt;a data-toggle=&quot;dropdown&quot; href=&quot;#&quot;&gt;&lt;b&gt;hier&lt;/b&gt; super-classes&lt;span class=&quot;caret&quot;&gt;&lt;/span&gt;&lt;/a&gt;&lt;ul class=&quot;dropdown-menu&quot; role=&quot;menu&quot; aria-labelledby=&quot;dLabel&quot;&gt;&lt;li&gt;&lt;a href=&quot;base_simple3.html#base_simple3#Object&quot;&gt;Object&lt;/a&gt;&lt;/li&gt;&lt;/ul&gt;&lt;/div&gt;&lt;/div&gt;" data-toggle="popover">Int</span>
-</span><span class="nc_pdef foldable" id="base_simple3#Int#output"><span class="line" id="L26">        <span class="nc_k">fun</span> <span class="nc_def popupable" title="base_simple3#Int#output" data-title="&lt;a href=&quot;base_simple3.html#base_simple3#Int#output&quot;&gt;base_simple3#Int#output&lt;/a&gt;" data-content="&lt;div&gt;&lt;b&gt;fun&lt;/b&gt; &lt;span&gt;output&lt;span&gt;&lt;/span&gt;&lt;/span&gt;&lt;br/&gt;&lt;/div&gt;" data-toggle="popover"><span class="nc_i">output</span></span> <span class="nc_k">is</span> <span class="nc_k">intern</span>
+</span><span class="nc_pdef foldable" id="base_simple3#Int#output"><span class="line" id="L26">        <span class="nc_k">fun</span> <span class="nc_def popupable" title="base_simple3#Int#output" data-title="&lt;a href=&quot;base_simple3.html#base_simple3#Int#output&quot;&gt;base_simple3#Int#output&lt;/a&gt;" data-content="&lt;div&gt;&lt;b&gt;fun&lt;/b&gt; &lt;span&gt;output&lt;span&gt;&lt;/span&gt;&lt;/span&gt;&lt;br/&gt;&lt;/div&gt;" data-toggle="popover"><span class="nc_i">output</span></span> <span class="nc_k">is</span> <span class="nc_i">intern</span>
 </span></span><span class="line" id="L27"><span class="nc_k">end</span>
 </span></span><span class="line" id="L28">
 </span><span class="nc_cdef foldable" id="base_simple3#A"><span class="line" id="L29"><span class="nc_k">class</span> <span class="nc_def nc_t popupable" title="class A" data-title="&lt;a href=&quot;base_simple3.html#base_simple3#A&quot;&gt;class A&lt;/a&gt;" data-content="&lt;div&gt;&lt;b&gt;class&lt;/b&gt; &lt;span&gt;A&lt;/span&gt;&lt;br/&gt;&lt;div class=&quot;dropdown&quot;&gt; &lt;a data-toggle=&quot;dropdown&quot; href=&quot;#&quot;&gt;&lt;b&gt;hier&lt;/b&gt; super-classes&lt;span class=&quot;caret&quot;&gt;&lt;/span&gt;&lt;/a&gt;&lt;ul class=&quot;dropdown-menu&quot; role=&quot;menu&quot; aria-labelledby=&quot;dLabel&quot;&gt;&lt;li&gt;&lt;a href=&quot;base_simple3.html#base_simple3#Object&quot;&gt;Object&lt;/a&gt;&lt;/li&gt;&lt;/ul&gt;&lt;/div&gt;&lt;/div&gt;" data-toggle="popover">A</span>

diff --git a/tests/sav/nitmetrics_args1.res b/tests/sav/nitmetrics_args1.res
index 979a95a..e706f2c 100644 (file)
--- a/tests/sav/nitmetrics_args1.res
+++ b/tests/sav/nitmetrics_args1.res
@@ -372,73 +372,74 @@ Distribution of direct smallers
   <=8: sub-population=1 (14.28%); cumulated value=6 (100.00%)
 --- AST Metrics ---
 ## All nodes of the AST
- population: 47
+ population: 48
  minimum value: 1
- maximum value: 39
- total value: 256
- average value: 5.44
+ maximum value: 40
+ total value: 261
+ average value: 5.43
  distribution:
-  <=1: sub-population=13 (27.65%); cumulated value=13 (5.07%)
-  <=2: sub-population=6 (12.76%); cumulated value=12 (4.68%)
-  <=4: sub-population=10 (21.27%); cumulated value=32 (12.50%)
-  <=8: sub-population=10 (21.27%); cumulated value=61 (23.82%)
-  <=16: sub-population=4 (8.51%); cumulated value=44 (17.18%)
-  <=32: sub-population=3 (6.38%); cumulated value=55 (21.48%)
-  <=64: sub-population=1 (2.12%); cumulated value=39 (15.23%)
+  <=1: sub-population=15 (31.25%); cumulated value=15 (5.74%)
+  <=2: sub-population=5 (10.41%); cumulated value=10 (3.83%)
+  <=4: sub-population=10 (20.83%); cumulated value=32 (12.26%)
+  <=8: sub-population=10 (20.83%); cumulated value=64 (24.52%)
+  <=16: sub-population=4 (8.33%); cumulated value=44 (16.85%)
+  <=32: sub-population=3 (6.25%); cumulated value=56 (21.45%)
+  <=64: sub-population=1 (2.08%); cumulated value=40 (15.32%)
  list:
-  TId: 39 (15.23%)
-  AListExprs: 19 (7.42%)
-  APublicVisibility: 18 (7.03%)
-  ACallExpr: 18 (7.03%)
-  TClassid: 15 (5.85%)
-  TNumber: 10 (3.90%)
-  ADecIntExpr: 10 (3.90%)
-  AType: 9 (3.51%)
-  TKwend: 8 (3.12%)
-  ASignature: 8 (3.12%)
+  TId: 40 (15.32%)
+  APublicVisibility: 19 (7.27%)
+  AListExprs: 19 (7.27%)
+  ACallExpr: 18 (6.89%)
+  TClassid: 15 (5.74%)
+  TNumber: 10 (3.83%)
+  ADecIntExpr: 10 (3.83%)
+  AType: 9 (3.44%)
+  TKwend: 8 (3.06%)
+  ASignature: 8 (3.06%)
   ...
-  AModule: 1 (0.39%)
-  ACallAssignExpr: 1 (0.39%)
-  AMainClassdef: 1 (0.39%)
-  AReturnExpr: 1 (0.39%)
-  TKwreturn: 1 (0.39%)
-  TKwinterface: 1 (0.39%)
-  ANoImport: 1 (0.39%)
-  AInterfaceClasskind: 1 (0.39%)
-  AMainMethPropdef: 1 (0.39%)
-  TKwimport: 1 (0.39%)
+  ACallAssignExpr: 1 (0.38%)
+  AAnnotations: 1 (0.38%)
+  AReturnExpr: 1 (0.38%)
+  TKwreturn: 1 (0.38%)
+  AInterfaceClasskind: 1 (0.38%)
+  TKwinterface: 1 (0.38%)
+  ANoImport: 1 (0.38%)
+  AMainMethPropdef: 1 (0.38%)
+  AMainClassdef: 1 (0.38%)
+  TKwimport: 1 (0.38%)
 ## All identifiers of the AST
- population: 19
+ population: 20
  minimum value: 1
  maximum value: 11
- total value: 54
- average value: 2.84
+ total value: 55
+ average value: 2.75
  distribution:
-  <=1: sub-population=2 (10.52%); cumulated value=2 (3.70%)
-  <=2: sub-population=12 (63.15%); cumulated value=24 (44.44%)
-  <=4: sub-population=3 (15.78%); cumulated value=10 (18.51%)
-  <=8: sub-population=1 (5.26%); cumulated value=7 (12.96%)
-  <=16: sub-population=1 (5.26%); cumulated value=11 (20.37%)
+  <=1: sub-population=3 (15.00%); cumulated value=3 (5.45%)
+  <=2: sub-population=12 (60.00%); cumulated value=24 (43.63%)
+  <=4: sub-population=3 (15.00%); cumulated value=10 (18.18%)
+  <=8: sub-population=1 (5.00%); cumulated value=7 (12.72%)
+  <=16: sub-population=1 (5.00%); cumulated value=11 (20.00%)
  list:
-  output: 11 (20.37%)
-  Int: 7 (12.96%)
-  run: 4 (7.40%)
-  c: 3 (5.55%)
-  val: 3 (5.55%)
-  i: 2 (3.70%)
-  bar: 2 (3.70%)
-  foo: 2 (3.70%)
-  val2: 2 (3.70%)
-  val1: 2 (3.70%)
-  C: 2 (3.70%)
-  v: 2 (3.70%)
-  baz: 2 (3.70%)
-  a: 2 (3.70%)
-  A: 2 (3.70%)
-  B: 2 (3.70%)
-  b: 2 (3.70%)
-  Object: 1 (1.85%)
-  Bool: 1 (1.85%)
+  output: 11 (20.00%)
+  Int: 7 (12.72%)
+  run: 4 (7.27%)
+  c: 3 (5.45%)
+  val: 3 (5.45%)
+  i: 2 (3.63%)
+  bar: 2 (3.63%)
+  foo: 2 (3.63%)
+  val2: 2 (3.63%)
+  val1: 2 (3.63%)
+  C: 2 (3.63%)
+  v: 2 (3.63%)
+  baz: 2 (3.63%)
+  a: 2 (3.63%)
+  A: 2 (3.63%)
+  B: 2 (3.63%)
+  b: 2 (3.63%)
+  intern: 1 (1.81%)
+  Object: 1 (1.81%)
+  Bool: 1 (1.81%)
 --- Metrics of refinement usage ---
 Number of modules: 1
 

diff --git a/tests/sav/test_parser_args1.res b/tests/sav/test_parser_args1.res
index 3134b52..d5ff252 100644 (file)
--- a/tests/sav/test_parser_args1.res
+++ b/tests/sav/test_parser_args1.res
@@ -35,7 +35,7 @@ Start ../src/test_parser.nit:17,1--147,1
           TClassid "Int" ../src/test_parser.nit:25,20--22
         ADecIntExpr ../src/test_parser.nit:25,26
           TNumber "0" ../src/test_parser.nit:25,26
-      AConcreteMethPropdef ../src/test_parser.nit:26,2--36,4
+      AMethPropdef ../src/test_parser.nit:26,2--36,4
         TKwredef "redef" ../src/test_parser.nit:26,2--6
         APublicVisibility ../src/test_parser.nit:26,8
         TKwmeth "fun" ../src/test_parser.nit:26,8--10

diff --git a/tests/sav/test_parser_args7.res b/tests/sav/test_parser_args7.res
index 10b0795..fdfc9f0 100644 (file)
--- a/tests/sav/test_parser_args7.res
+++ b/tests/sav/test_parser_args7.res
@@ -26,7 +26,7 @@
       AListExprs 1,15
 --> AModule 1,1--12
   ATopClassdef 1,1--12
-    AConcreteMethPropdef 1,1--12
+    AMethPropdef 1,1--12
       APublicVisibility 1,1
       TKwmeth "fun" 1,1--3
       AIdMethid 1,5--7
@@ -53,7 +53,7 @@
       TKwend "end" 3,1--3
 --> ... ... ... ... AModule 1,1--5,3
   ATopClassdef 1,1--5,3
-    AConcreteMethPropdef 1,1--5,3
+    AMethPropdef 1,1--5,3
       APublicVisibility 1,1
       TKwmeth "fun" 1,1--3
       AIdMethid 1,5--7