From: Jean Privat Date: Wed, 16 Dec 2015 05:16:38 +0000 (-0500) Subject: tests: update sav for AST-related tests X-Git-Tag: v0.8~34^2 X-Git-Url: http://nitlanguage.org tests: update sav for AST-related tests Signed-off-by: Jean Privat --- diff --git a/tests/sav/nitlight_args1.res b/tests/sav/nitlight_args1.res index 5a390f9..57a7829 100644 --- a/tests/sav/nitlight_args1.res +++ b/tests/sav/nitlight_args1.res @@ -16,22 +16,22 @@ import end -interface Object +interface Object end -enum Bool +enum Bool end -enum Int +enum Int fun output is intern end -class A +class A init do 5.output fun run do 6.output end -class B +class B var val: Int init(v: Int) do @@ -41,7 +41,7 @@ fun run do val.output end -class C +class C var val1: Int var val2: Int = 10 end diff --git a/tests/sav/nitmetrics_args1.res b/tests/sav/nitmetrics_args1.res index 7684a23..12430c7 100644 --- a/tests/sav/nitmetrics_args1.res +++ b/tests/sav/nitmetrics_args1.res @@ -1,41 +1,41 @@ *** METRICS *** --- AST Metrics --- ## All nodes of the AST - population: 51 + population: 52 minimum value: 1 maximum value: 40 - total value: 289 - average value: 5.66 + total value: 304 + average value: 5.84 distribution: - <=1: sub-population=16 (31.37%); cumulated value=16 (5.53%) - <=2: sub-population=5 (9.80%); cumulated value=10 (3.46%) - <=4: sub-population=9 (17.64%); cumulated value=28 (9.68%) - <=8: sub-population=12 (23.52%); cumulated value=76 (26.29%) - <=16: sub-population=4 (7.84%); cumulated value=44 (15.22%) - <=32: sub-population=4 (7.84%); cumulated value=75 (25.95%) - <=64: sub-population=1 (1.96%); cumulated value=40 (13.84%) + <=1: sub-population=16 (30.76%); cumulated value=16 (5.26%) + <=2: sub-population=5 (9.61%); cumulated value=10 (3.28%) + <=4: sub-population=9 (17.30%); cumulated value=28 (9.21%) + <=8: sub-population=12 (23.07%); cumulated value=76 (25.00%) + <=16: sub-population=5 (9.61%); cumulated value=59 (19.40%) + <=32: sub-population=4 (7.69%); cumulated value=75 (24.67%) + <=64: sub-population=1 (1.92%); cumulated value=40 (13.15%) list: - TId: 40 (13.84%) - APublicVisibility: 19 (6.57%) - AQid: 19 (6.57%) - AListExprs: 19 (6.57%) - ACallExpr: 18 (6.22%) - TClassid: 15 (5.19%) - TInteger: 10 (3.46%) - AIntegerExpr: 10 (3.46%) - AType: 9 (3.11%) - TKwend: 8 (2.76%) + TId: 40 (13.15%) + APublicVisibility: 19 (6.25%) + AListExprs: 19 (6.25%) + AQid: 19 (6.25%) + ACallExpr: 18 (5.92%) + TClassid: 15 (4.93%) + AQclassid: 15 (4.93%) + TInteger: 10 (3.28%) + AIntegerExpr: 10 (3.28%) + AType: 9 (2.96%) ... - ACallAssignExpr: 1 (0.34%) - AAnnotations: 1 (0.34%) - TKwreturn: 1 (0.34%) - AReturnExpr: 1 (0.34%) - AInterfaceClasskind: 1 (0.34%) - TKwinterface: 1 (0.34%) - ANoImport: 1 (0.34%) - AMainMethPropdef: 1 (0.34%) - AMainClassdef: 1 (0.34%) - TKwimport: 1 (0.34%) + AAnnotation: 1 (0.32%) + AAnnotations: 1 (0.32%) + AReturnExpr: 1 (0.32%) + TKwreturn: 1 (0.32%) + AInterfaceClasskind: 1 (0.32%) + TKwinterface: 1 (0.32%) + ANoImport: 1 (0.32%) + AMainMethPropdef: 1 (0.32%) + AMainClassdef: 1 (0.32%) + TKwimport: 1 (0.32%) ## All identifiers of the AST population: 20 minimum value: 1 diff --git a/tests/sav/test_highlight_args1.res b/tests/sav/test_highlight_args1.res index 7c2989f..0bd1e66 100644 --- a/tests/sav/test_highlight_args1.res +++ b/tests/sav/test_highlight_args1.res @@ -96,22 +96,22 @@

AST node: AModule at base_simple3.nit:17,1--66,13

import end
 
-interface Object
+interface Object
 end
 
-enum Bool
+enum Bool
 end
 
-enum Int
+enum Int
 	fun output is intern
 end
 
-class A
+class A
 	init do 5.output
 	fun run do 6.output
 end
 
-class B
+class B
 	var val: Int
 	init(v: Int)
 	do
@@ -121,7 +121,7 @@
 	fun run do val.output
 end
 
-class C
+class C
 	var val1: Int
 	var val2: Int = 10
 end
@@ -153,14 +153,16 @@
 
AST node: TKwend at base_simple3.nit:17,8--10

 
 end

 
AST node: AStdClassdef at base_simple3.nit:19,1--20,3

-
interface Object
+
interface Object
 end

 
AST node: AInterfaceClasskind at base_simple3.nit:19,1--9

 
interface

 
AST node: TKwinterface at base_simple3.nit:19,1--9

 
interface

+
AST node: AQclassid at base_simple3.nit:19,11--16

+
 Object

 
AST node: TClassid at base_simple3.nit:19,11--16

-
 Object

+
 Object

 
AST node: AEnumClasskind at base_simple3.nit:22,1--4

 
enum

 
AST node: TKwenum at base_simple3.nit:22,1--4

diff --git a/tests/sav/test_parser_args1.res b/tests/sav/test_parser_args1.res
index 70f5f3e..9124a05 100644
--- a/tests/sav/test_parser_args1.res
+++ b/tests/sav/test_parser_args1.res
@@ -28,19 +28,22 @@ Start ../src/test_parser.nit:17,1--156,1
       APublicVisibility ../src/test_parser.nit:25,1
       AConcreteClasskind ../src/test_parser.nit:25,1--5
         TKwclass "class" ../src/test_parser.nit:25,1--5
-      TClassid "PrintTreeVisitor" ../src/test_parser.nit:25,7--22
+      AQclassid ../src/test_parser.nit:25,7--22
+        TClassid "PrintTreeVisitor" ../src/test_parser.nit:25,7--22
       ASuperPropdef ../src/test_parser.nit:26,2--14
         APublicVisibility ../src/test_parser.nit:26,2
         TKwsuper "super" ../src/test_parser.nit:26,2--6
         AType ../src/test_parser.nit:26,8--14
-          TClassid "Visitor" ../src/test_parser.nit:26,8--14
+          AQclassid ../src/test_parser.nit:26,8--14
+            TClassid "Visitor" ../src/test_parser.nit:26,8--14
       AAttrPropdef ../src/test_parser.nit:27,2--26
         APrivateVisibility ../src/test_parser.nit:27,2--8
           TKwprivate "private" ../src/test_parser.nit:27,2--8
         TKwvar "var" ../src/test_parser.nit:27,10--12
         TId "rank" ../src/test_parser.nit:27,14--17
         AType ../src/test_parser.nit:27,20--22
-          TClassid "Int" ../src/test_parser.nit:27,20--22
+          AQclassid ../src/test_parser.nit:27,20--22
+            TClassid "Int" ../src/test_parser.nit:27,20--22
         TAssign "=" ../src/test_parser.nit:27,24
         AIntegerExpr ../src/test_parser.nit:27,26
           TInteger "0" ../src/test_parser.nit:27,26
@@ -67,7 +70,8 @@ Start ../src/test_parser.nit:17,1--156,1
                 AListExprs ../src/test_parser.nit:30,6
               TKwisa "isa" ../src/test_parser.nit:30,8--10
               AType ../src/test_parser.nit:30,12--16
-                TClassid "Token" ../src/test_parser.nit:30,12--16
+                AQclassid ../src/test_parser.nit:30,12--16
+                  TClassid "Token" ../src/test_parser.nit:30,12--16
             TKwthen "then" ../src/test_parser.nit:30,18--21
             ABlockExpr ../src/test_parser.nit:31,4--88
               ACallExpr ../src/test_parser.nit:31,4--88
@@ -765,7 +769,8 @@ Start ../src/test_parser.nit:17,1--156,1
                   ANewExpr ../src/test_parser.nit:95,11--25
                     TKwnew "new" ../src/test_parser.nit:95,11--13
                     AType ../src/test_parser.nit:95,15--25
-                      TClassid "ToolContext" ../src/test_parser.nit:95,15--25
+                      AQclassid ../src/test_parser.nit:95,15--25
+                        TClassid "ToolContext" ../src/test_parser.nit:95,15--25
                     AListExprs ../src/test_parser.nit:95,25
                 ALoopExpr ../src/test_parser.nit:97,2--117,4
                   TKwloop "loop" ../src/test_parser.nit:97,2--5
@@ -797,7 +802,8 @@ Start ../src/test_parser.nit:17,1--156,1
                           AListExprs ../src/test_parser.nit:99,6
                         TKwisa "isa" ../src/test_parser.nit:99,8--10
                         AType ../src/test_parser.nit:99,12--18
-                          TClassid "TString" ../src/test_parser.nit:99,12--18
+                          AQclassid ../src/test_parser.nit:99,12--18
+                            TClassid "TString" ../src/test_parser.nit:99,12--18
                       TKwthen "then" ../src/test_parser.nit:99,20--23
                       ABlockExpr ../src/test_parser.nit:100,4--106,11
                         AVardeclExpr ../src/test_parser.nit:100,4--17
@@ -852,7 +858,8 @@ Start ../src/test_parser.nit:17,1--156,1
                           AListExprs ../src/test_parser.nit:109,6
                         TKwisa "isa" ../src/test_parser.nit:109,8--10
                         AType ../src/test_parser.nit:109,12--17
-                          TClassid "AError" ../src/test_parser.nit:109,12--17
+                          AQclassid ../src/test_parser.nit:109,12--17
+                            TClassid "AError" ../src/test_parser.nit:109,12--17
                       TKwthen "then" ../src/test_parser.nit:109,19--22
                       ABlockExpr ../src/test_parser.nit:110,4--111,11
                         ACallExpr ../src/test_parser.nit:110,4--57
@@ -914,7 +921,8 @@ Start ../src/test_parser.nit:17,1--156,1
                             ANewExpr ../src/test_parser.nit:115,5--24
                               TKwnew "new" ../src/test_parser.nit:115,5--7
                               AType ../src/test_parser.nit:115,9--24
-                                TClassid "PrintTreeVisitor" ../src/test_parser.nit:115,9--24
+                                AQclassid ../src/test_parser.nit:115,9--24
+                                  TClassid "PrintTreeVisitor" ../src/test_parser.nit:115,9--24
                               AListExprs ../src/test_parser.nit:115,24
                             TCpar ")" ../src/test_parser.nit:115,25
                           AQid ../src/test_parser.nit:115,27--37
@@ -965,7 +973,8 @@ Start ../src/test_parser.nit:17,1--156,1
                           ANewExpr ../src/test_parser.nit:122,13--45
                             TKwnew "new" ../src/test_parser.nit:122,13--15
                             AType ../src/test_parser.nit:122,17--26
-                              TClassid "SourceFile" ../src/test_parser.nit:122,17--26
+                              AQclassid ../src/test_parser.nit:122,17--26
+                                TClassid "SourceFile" ../src/test_parser.nit:122,17--26
                             AQid ../src/test_parser.nit:122,28--38
                               TId "from_string" ../src/test_parser.nit:122,28--38
                             AParExprs ../src/test_parser.nit:122,39--45
@@ -987,7 +996,8 @@ Start ../src/test_parser.nit:17,1--156,1
                           ANewExpr ../src/test_parser.nit:124,12--33
                             TKwnew "new" ../src/test_parser.nit:124,12--14
                             AType ../src/test_parser.nit:124,16--25
-                              TClassid "FileReader" ../src/test_parser.nit:124,16--25
+                              AQclassid ../src/test_parser.nit:124,16--25
+                                TClassid "FileReader" ../src/test_parser.nit:124,16--25
                             AQid ../src/test_parser.nit:124,27--30
                               TId "open" ../src/test_parser.nit:124,27--30
                             AParExprs ../src/test_parser.nit:124,31--33
@@ -1007,7 +1017,8 @@ Start ../src/test_parser.nit:17,1--156,1
                           ANewExpr ../src/test_parser.nit:125,13--32
                             TKwnew "new" ../src/test_parser.nit:125,13--15
                             AType ../src/test_parser.nit:125,17--26
-                              TClassid "SourceFile" ../src/test_parser.nit:125,17--26
+                              AQclassid ../src/test_parser.nit:125,17--26
+                                TClassid "SourceFile" ../src/test_parser.nit:125,17--26
                             AParExprs ../src/test_parser.nit:125,27--32
                               TOpar "(" ../src/test_parser.nit:125,27
                               ACallExpr ../src/test_parser.nit:125,28
@@ -1038,7 +1049,8 @@ Start ../src/test_parser.nit:17,1--156,1
                       ANewExpr ../src/test_parser.nit:128,15--31
                         TKwnew "new" ../src/test_parser.nit:128,15--17
                         AType ../src/test_parser.nit:128,19--23
-                          TClassid "Lexer" ../src/test_parser.nit:128,19--23
+                          AQclassid ../src/test_parser.nit:128,19--23
+                            TClassid "Lexer" ../src/test_parser.nit:128,19--23
                         AParExprs ../src/test_parser.nit:128,24--31
                           TOpar "(" ../src/test_parser.nit:128,24
                           ACallExpr ../src/test_parser.nit:128,25--30
@@ -1081,7 +1093,8 @@ Start ../src/test_parser.nit:17,1--156,1
                                 AListExprs ../src/test_parser.nit:131,18
                               TKwisa "isa" ../src/test_parser.nit:131,20--22
                               AType ../src/test_parser.nit:131,24--26
-                                TClassid "EOF" ../src/test_parser.nit:131,24--26
+                                AQclassid ../src/test_parser.nit:131,24--26
+                                  TClassid "EOF" ../src/test_parser.nit:131,24--26
                           TKwdo "do" ../src/test_parser.nit:131,28--29
                           ABlockExpr ../src/test_parser.nit:132,5--136,6
                             AIfExpr ../src/test_parser.nit:132,5--134,7
@@ -1154,7 +1167,8 @@ Start ../src/test_parser.nit:17,1--156,1
                           ANewExpr ../src/test_parser.nit:138,17--33
                             TKwnew "new" ../src/test_parser.nit:138,17--19
                             AType ../src/test_parser.nit:138,21--26
-                              TClassid "Parser" ../src/test_parser.nit:138,21--26
+                              AQclassid ../src/test_parser.nit:138,21--26
+                                TClassid "Parser" ../src/test_parser.nit:138,21--26
                             AParExprs ../src/test_parser.nit:138,27--33
                               TOpar "(" ../src/test_parser.nit:138,27
                               ACallExpr ../src/test_parser.nit:138,28--32
@@ -1199,7 +1213,8 @@ Start ../src/test_parser.nit:17,1--156,1
                               AListExprs ../src/test_parser.nit:142,11
                             TKwisa "isa" ../src/test_parser.nit:142,13--15
                             AType ../src/test_parser.nit:142,17--22
-                              TClassid "AError" ../src/test_parser.nit:142,17--22
+                              AQclassid ../src/test_parser.nit:142,17--22
+                                TClassid "AError" ../src/test_parser.nit:142,17--22
                           TKwthen "then" ../src/test_parser.nit:142,24--27
                           ABlockExpr ../src/test_parser.nit:143,5--144,10
                             ACallExpr ../src/test_parser.nit:143,5--58
@@ -1294,7 +1309,8 @@ Start ../src/test_parser.nit:17,1--156,1
                                   ANewExpr ../src/test_parser.nit:151,6--25
                                     TKwnew "new" ../src/test_parser.nit:151,6--8
                                     AType ../src/test_parser.nit:151,10--25
-                                      TClassid "PrintTreeVisitor" ../src/test_parser.nit:151,10--25
+                                      AQclassid ../src/test_parser.nit:151,10--25
+                                        TClassid "PrintTreeVisitor" ../src/test_parser.nit:151,10--25
                                     AListExprs ../src/test_parser.nit:151,25
                                   TCpar ")" ../src/test_parser.nit:151,26
                                 AQid ../src/test_parser.nit:151,28--38
diff --git a/tests/sav/test_parser_args6.res b/tests/sav/test_parser_args6.res
index b48e525..65b6d2f 100644
--- a/tests/sav/test_parser_args6.res
+++ b/tests/sav/test_parser_args6.res
@@ -7,12 +7,14 @@ Start 1,1--42
             TKwvar "var" 1,1--3
             TId "toto" 1,5--8
             AType 1,11--14
-              TClassid "Toto" 1,11--14
+              AQclassid 1,11--14
+                TClassid "Toto" 1,11--14
             TAssign "=" 1,16
             ANewExpr 1,18--41
               TKwnew "new" 1,18--20
               AType 1,22--25
-                TClassid "Toto" 1,22--25
+                AQclassid 1,22--25
+                  TClassid "Toto" 1,22--25
               AQid 1,27--30
                 TId "toto" 1,27--30
               AParExprs 1,31--41