X-Git-Url: http://nitlanguage.org

diff --git a/tests/sav/neo_doxygen_dump_args6.res b/tests/sav/neo_doxygen_dump_args6.res
index 3f1f05e..295b6a9 100644
--- a/tests/sav/neo_doxygen_dump_args6.res
+++ b/tests/sav/neo_doxygen_dump_args6.res
@@ -22,8 +22,8 @@ Edge
 14:root-namespace
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"root-namespace"}
+=properties=JsonObject(1):
+{"name":"root-namespace"}
 
 
 Edge
@@ -36,8 +36,8 @@ Edge
 14:root-namespace
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"root-namespace"}
+=properties=JsonObject(1):
+{"name":"root-namespace"}
 ----
 =to=Node
 =labels=Array(3):
@@ -49,51 +49,53 @@ Edge
 
 
 Edge
-=type=8:DECLARES
+=type=9:CLASSTYPE
 =properties=JsonObject(0):
 {}
 ----
-=from=Entity#0:
+=from=Entity#9:class_foo
 =labels=Array(3):
 14:root-namespace
 7:MEntity
-6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"root-namespace"}
+6:MClass
+=properties=JsonObject(5):
+{"kind":"class","visibility":"package","name":"Foo","location":"%SOURCE_DIRECTORY%/Foo.java:19,1--19,1","mdoc":["A class in the root namespace."]}
 ----
 =to=Entity#0:
-=labels=Array(3):
+=labels=Array(4):
 14:root-namespace
 7:MEntity
-7:MModule
-=properties=JsonObject(3):
-{"location":"%SOURCE_DIRECTORY%\/Foo.java:1,1--1,1","full_name":"Foo","name":"Foo"}
+5:MType
+10:MClassType
+=properties=JsonObject(1):
+{"name":"Foo"}
 
 
 Edge
-=type=10:INTRODUCES
+=type=5:CLASS
 =properties=JsonObject(0):
 {}
 ----
 =from=Entity#0:
-=labels=Array(3):
+=labels=Array(4):
 14:root-namespace
 7:MEntity
-7:MModule
-=properties=JsonObject(3):
-{"location":"%SOURCE_DIRECTORY%\/Foo.java:1,1--1,1","full_name":"Foo","name":"Foo"}
+5:MType
+10:MClassType
+=properties=JsonObject(1):
+{"name":"Foo"}
 ----
 =to=Entity#9:class_foo
 =labels=Array(3):
 14:root-namespace
 7:MEntity
 6:MClass
-=properties=JsonObject(6):
-{"kind":"class","visibility":"package","full_name":"Foo","name":"Foo","location":"%SOURCE_DIRECTORY%\/Foo.java:19,1--19,1","mdoc":["A class in the root namespace"]}
+=properties=JsonObject(5):
+{"kind":"class","visibility":"package","name":"Foo","location":"%SOURCE_DIRECTORY%/Foo.java:19,1--19,1","mdoc":["A class in the root namespace."]}
 
 
 Edge
-=type=7:DEFINES
+=type=9:BOUNDTYPE
 =properties=JsonObject(0):
 {}
 ----
@@ -101,67 +103,66 @@ Edge
 =labels=Array(3):
 14:root-namespace
 7:MEntity
-7:MModule
-=properties=JsonObject(3):
-{"location":"%SOURCE_DIRECTORY%\/Foo.java:1,1--1,1","full_name":"Foo","name":"Foo"}
+9:MClassDef
+=properties=JsonObject(4):
+{"location":"%SOURCE_DIRECTORY%/Foo.java:19,1--19,1","is_intro":true,"name":"Foo","mdoc":["A class in the root namespace."]}
 ----
 =to=Entity#0:
-=labels=Array(3):
+=labels=Array(4):
 14:root-namespace
 7:MEntity
-9:MClassDef
-=properties=JsonObject(5):
-{"location":"%SOURCE_DIRECTORY%\/Foo.java:19,1--19,1","is_intro":true,"name":"Foo","full_name":"Foo","mdoc":["A class in the root namespace"]}
+5:MType
+10:MClassType
+=properties=JsonObject(1):
+{"name":"Foo"}
 
 
 Edge
-=type=9:CLASSTYPE
+=type=6:MCLASS
 =properties=JsonObject(0):
 {}
 ----
-=from=Entity#9:class_foo
+=from=Entity#0:
 =labels=Array(3):
 14:root-namespace
 7:MEntity
-6:MClass
-=properties=JsonObject(6):
-{"kind":"class","visibility":"package","full_name":"Foo","name":"Foo","location":"%SOURCE_DIRECTORY%\/Foo.java:19,1--19,1","mdoc":["A class in the root namespace"]}
+9:MClassDef
+=properties=JsonObject(4):
+{"location":"%SOURCE_DIRECTORY%/Foo.java:19,1--19,1","is_intro":true,"name":"Foo","mdoc":["A class in the root namespace."]}
 ----
-=to=Entity#0:
-=labels=Array(4):
+=to=Entity#9:class_foo
+=labels=Array(3):
 14:root-namespace
 7:MEntity
-5:MType
-10:MClassType
-=properties=JsonObject(2):
-{"name":"Foo","full_name":"Foo"}
+6:MClass
+=properties=JsonObject(5):
+{"kind":"class","visibility":"package","name":"Foo","location":"%SOURCE_DIRECTORY%/Foo.java:19,1--19,1","mdoc":["A class in the root namespace."]}
 
 
 Edge
-=type=5:CLASS
+=type=8:DECLARES
 =properties=JsonObject(0):
 {}
 ----
 =from=Entity#0:
-=labels=Array(4):
+=labels=Array(3):
 14:root-namespace
 7:MEntity
-5:MType
-10:MClassType
-=properties=JsonObject(2):
-{"name":"Foo","full_name":"Foo"}
+6:MGroup
+=properties=JsonObject(1):
+{"name":"root-namespace"}
 ----
-=to=Entity#9:class_foo
+=to=Entity#0:
 =labels=Array(3):
 14:root-namespace
 7:MEntity
-6:MClass
-=properties=JsonObject(6):
-{"kind":"class","visibility":"package","full_name":"Foo","name":"Foo","location":"%SOURCE_DIRECTORY%\/Foo.java:19,1--19,1","mdoc":["A class in the root namespace"]}
+7:MModule
+=properties=JsonObject(3):
+{"location":"%SOURCE_DIRECTORY%/Foo.java:1,1--1,1","name":"Foo","mdoc":["A class in the root namespace."]}
 
 
 Edge
-=type=9:BOUNDTYPE
+=type=10:INTRODUCES
 =properties=JsonObject(0):
 {}
 ----
@@ -169,22 +170,21 @@ Edge
 =labels=Array(3):
 14:root-namespace
 7:MEntity
-9:MClassDef
-=properties=JsonObject(5):
-{"location":"%SOURCE_DIRECTORY%\/Foo.java:19,1--19,1","is_intro":true,"name":"Foo","full_name":"Foo","mdoc":["A class in the root namespace"]}
+7:MModule
+=properties=JsonObject(3):
+{"location":"%SOURCE_DIRECTORY%/Foo.java:1,1--1,1","name":"Foo","mdoc":["A class in the root namespace."]}
 ----
-=to=Entity#0:
-=labels=Array(4):
+=to=Entity#9:class_foo
+=labels=Array(3):
 14:root-namespace
 7:MEntity
-5:MType
-10:MClassType
-=properties=JsonObject(2):
-{"name":"Foo","full_name":"Foo"}
+6:MClass
+=properties=JsonObject(5):
+{"kind":"class","visibility":"package","name":"Foo","location":"%SOURCE_DIRECTORY%/Foo.java:19,1--19,1","mdoc":["A class in the root namespace."]}
 
 
 Edge
-=type=6:MCLASS
+=type=7:DEFINES
 =properties=JsonObject(0):
 {}
 ----
@@ -192,17 +192,17 @@ Edge
 =labels=Array(3):
 14:root-namespace
 7:MEntity
-9:MClassDef
-=properties=JsonObject(5):
-{"location":"%SOURCE_DIRECTORY%\/Foo.java:19,1--19,1","is_intro":true,"name":"Foo","full_name":"Foo","mdoc":["A class in the root namespace"]}
+7:MModule
+=properties=JsonObject(3):
+{"location":"%SOURCE_DIRECTORY%/Foo.java:1,1--1,1","name":"Foo","mdoc":["A class in the root namespace."]}
 ----
-=to=Entity#9:class_foo
+=to=Entity#0:
 =labels=Array(3):
 14:root-namespace
 7:MEntity
-6:MClass
-=properties=JsonObject(6):
-{"kind":"class","visibility":"package","full_name":"Foo","name":"Foo","location":"%SOURCE_DIRECTORY%\/Foo.java:19,1--19,1","mdoc":["A class in the root namespace"]}
+9:MClassDef
+=properties=JsonObject(4):
+{"location":"%SOURCE_DIRECTORY%/Foo.java:19,1--19,1","is_intro":true,"name":"Foo","mdoc":["A class in the root namespace."]}
 
 
 ---===DONE===---