tests: fix model serialization tests

Signed-off-by: Alexandre Terrasa <alexandre@moz-code.org>

diff --git a/src/model/test_model_json.sav/test_classdefs_to_full_json.res b/src/model/test_model_json.sav/test_classdefs_to_full_json.res
index 404065b..96d1691 100644 (file)
--- a/src/model/test_model_json.sav/test_classdefs_to_full_json.res
+++ b/src/model/test_model_json.sav/test_classdefs_to_full_json.res
@@ -13,7 +13,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "interface"],
+       "modifiers": ["interface"],
        "location": {
                "column_end": 3,
                "column_start": 1,
@@ -79,7 +79,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "class"],
+       "modifiers": ["class"],
        "location": {
                "column_end": 3,
                "column_start": 1,
@@ -163,7 +163,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "class"],
+       "modifiers": ["class"],
        "location": {
                "column_end": 3,
                "column_start": 1,
@@ -235,7 +235,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "class"],
+       "modifiers": ["class"],
        "location": {
                "column_end": 14,
                "column_start": 1,
@@ -277,7 +277,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "class"],
+       "modifiers": ["class"],
        "location": {
                "column_end": 16,
                "column_start": 1,
@@ -319,7 +319,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "class"],
+       "modifiers": ["class"],
        "location": {
                "column_end": 17,
                "column_start": 1,
@@ -367,7 +367,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "abstract class"],
+       "modifiers": ["abstract class"],
        "location": {
                "column_end": 3,
                "column_start": 1,
@@ -467,7 +467,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "class"],
+       "modifiers": ["class"],
        "location": {
                "column_end": 3,
                "column_start": 1,
@@ -513,7 +513,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "class"],
+       "modifiers": ["class"],
        "location": {
                "column_end": 3,
                "column_start": 1,
@@ -559,7 +559,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "class"],
+       "modifiers": ["class"],
        "location": {
                "column_end": 3,
                "column_start": 1,
@@ -605,7 +605,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "abstract class"],
+       "modifiers": ["abstract class"],
        "location": {
                "column_end": 3,
                "column_start": 1,
@@ -705,7 +705,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "class"],
+       "modifiers": ["class"],
        "location": {
                "column_end": 3,
                "column_start": 1,
@@ -751,7 +751,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "class"],
+       "modifiers": ["class"],
        "location": {
                "column_end": 3,
                "column_start": 1,
@@ -843,7 +843,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "class"],
+       "modifiers": ["class"],
        "location": {
                "column_end": 3,
                "column_start": 1,
@@ -889,7 +889,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "class"],
+       "modifiers": ["class"],
        "location": {
                "column_end": 3,
                "column_start": 1,
@@ -1119,7 +1119,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "interface"],
+       "modifiers": ["interface"],
        "location": {
                "column_end": 3,
                "column_start": 1,
@@ -1167,7 +1167,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "interface"],
+       "modifiers": ["interface"],
        "location": {
                "column_end": 3,
                "column_start": 1,
@@ -1239,7 +1239,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "interface"],
+       "modifiers": ["interface"],
        "location": {
                "column_end": 3,
                "column_start": 1,
@@ -1302,7 +1302,7 @@
        "full_name": "test_prog$Starter",
        "mdoc": null,
        "visibility": "public",
-       "modifiers": ["public", "class"],
+       "modifiers": ["class"],
        "location": {
                "column_end": 3,
                "column_start": 1,
@@ -1341,7 +1341,7 @@
        "full_name": "test_prog$Sys",
        "mdoc": null,
        "visibility": "public",
-       "modifiers": ["public", "class"],
+       "modifiers": ["class"],
        "location": {
                "column_end": 13,
                "column_start": 1,

diff --git a/src/model/test_model_json.sav/test_classes_to_full_json.res b/src/model/test_model_json.sav/test_classes_to_full_json.res
index a267d33..19495e1 100644 (file)
--- a/src/model/test_model_json.sav/test_classes_to_full_json.res
+++ b/src/model/test_model_json.sav/test_classes_to_full_json.res
@@ -13,7 +13,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "interface"],
+       "modifiers": ["interface"],
        "location": {
                "column_end": 3,
                "column_start": 1,
@@ -70,7 +70,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "class"],
+       "modifiers": ["class"],
        "location": {
                "column_end": 3,
                "column_start": 1,
@@ -149,7 +149,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "class"],
+       "modifiers": ["class"],
        "location": {
                "column_end": 3,
                "column_start": 1,
@@ -220,7 +220,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "class"],
+       "modifiers": ["class"],
        "location": {
                "column_end": 14,
                "column_start": 1,
@@ -271,7 +271,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "class"],
+       "modifiers": ["class"],
        "location": {
                "column_end": 16,
                "column_start": 1,
@@ -322,7 +322,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "class"],
+       "modifiers": ["class"],
        "location": {
                "column_end": 17,
                "column_start": 1,
@@ -379,7 +379,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "abstract class"],
+       "modifiers": ["abstract class"],
        "location": {
                "column_end": 3,
                "column_start": 1,
@@ -468,7 +468,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "class"],
+       "modifiers": ["class"],
        "location": {
                "column_end": 3,
                "column_start": 1,
@@ -539,7 +539,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "class"],
+       "modifiers": ["class"],
        "location": {
                "column_end": 3,
                "column_start": 1,
@@ -610,7 +610,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "class"],
+       "modifiers": ["class"],
        "location": {
                "column_end": 3,
                "column_start": 1,
@@ -681,7 +681,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "abstract class"],
+       "modifiers": ["abstract class"],
        "location": {
                "column_end": 3,
                "column_start": 1,
@@ -770,7 +770,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "class"],
+       "modifiers": ["class"],
        "location": {
                "column_end": 3,
                "column_start": 1,
@@ -841,7 +841,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "class"],
+       "modifiers": ["class"],
        "location": {
                "column_end": 3,
                "column_start": 1,
@@ -920,7 +920,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "class"],
+       "modifiers": ["class"],
        "location": {
                "column_end": 3,
                "column_start": 1,
@@ -991,7 +991,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "class"],
+       "modifiers": ["class"],
        "location": {
                "column_end": 3,
                "column_start": 1,
@@ -1150,7 +1150,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "interface"],
+       "modifiers": ["interface"],
        "location": {
                "column_end": 3,
                "column_start": 1,
@@ -1205,7 +1205,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "interface"],
+       "modifiers": ["interface"],
        "location": {
                "column_end": 3,
                "column_start": 1,
@@ -1276,7 +1276,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "interface"],
+       "modifiers": ["interface"],
        "location": {
                "column_end": 3,
                "column_start": 1,
@@ -1338,7 +1338,7 @@
        "full_name": "test_prog::Starter",
        "mdoc": null,
        "visibility": "public",
-       "modifiers": ["public", "class"],
+       "modifiers": ["class"],
        "location": {
                "column_end": 3,
                "column_start": 1,
@@ -1384,7 +1384,7 @@
        "full_name": "test_prog::Sys",
        "mdoc": null,
        "visibility": "public",
-       "modifiers": ["public", "class"],
+       "modifiers": ["class"],
        "location": {
                "column_end": 13,
                "column_start": 1,

diff --git a/src/model/test_model_json.sav/test_propdefs_to_full_json.res b/src/model/test_model_json.sav/test_propdefs_to_full_json.res
index 167ec94..426bc6c 100644 (file)
--- a/src/model/test_model_json.sav/test_propdefs_to_full_json.res
+++ b/src/model/test_model_json.sav/test_propdefs_to_full_json.res
@@ -13,7 +13,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "type"],
+       "modifiers": ["type"],
        "location": {
                "column_end": 28,
                "column_start": 2,
@@ -63,7 +63,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "intern", "fun"],
+       "modifiers": ["intern", "fun"],
        "location": {
                "column_end": 37,
                "column_start": 2,
@@ -123,7 +123,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "fun"],
+       "modifiers": ["fun"],
        "location": {
                "column_end": 55,
                "column_start": 2,
@@ -174,7 +174,7 @@
        "full_name": "test_prog$Object$init",
        "mdoc": null,
        "visibility": "public",
-       "modifiers": ["public", "init"],
+       "modifiers": ["init"],
        "location": {
                "column_end": 3,
                "column_start": 1,
@@ -604,7 +604,7 @@
        "full_name": "test_prog$Int$unary -",
        "mdoc": null,
        "visibility": "public",
-       "modifiers": ["public", "intern", "fun"],
+       "modifiers": ["intern", "fun"],
        "location": {
                "column_end": 21,
                "column_start": 2,
@@ -649,7 +649,7 @@
        "full_name": "test_prog$Int$+",
        "mdoc": null,
        "visibility": "public",
-       "modifiers": ["public", "intern", "fun"],
+       "modifiers": ["intern", "fun"],
        "location": {
                "column_end": 29,
                "column_start": 2,
@@ -700,7 +700,7 @@
        "full_name": "test_prog$Int$-",
        "mdoc": null,
        "visibility": "public",
-       "modifiers": ["public", "intern", "fun"],
+       "modifiers": ["intern", "fun"],
        "location": {
                "column_end": 29,
                "column_start": 2,
@@ -751,7 +751,7 @@
        "full_name": "test_prog$Int$*",
        "mdoc": null,
        "visibility": "public",
-       "modifiers": ["public", "intern", "fun"],
+       "modifiers": ["intern", "fun"],
        "location": {
                "column_end": 29,
                "column_start": 2,
@@ -802,7 +802,7 @@
        "full_name": "test_prog$Int$/",
        "mdoc": null,
        "visibility": "public",
-       "modifiers": ["public", "intern", "fun"],
+       "modifiers": ["intern", "fun"],
        "location": {
                "column_end": 29,
                "column_start": 2,
@@ -853,7 +853,7 @@
        "full_name": "test_prog$Int$>",
        "mdoc": null,
        "visibility": "public",
-       "modifiers": ["public", "intern", "fun"],
+       "modifiers": ["intern", "fun"],
        "location": {
                "column_end": 30,
                "column_start": 2,
@@ -904,7 +904,7 @@
        "full_name": "test_prog$Int$to_f",
        "mdoc": null,
        "visibility": "public",
-       "modifiers": ["public", "intern", "fun"],
+       "modifiers": ["intern", "fun"],
        "location": {
                "column_end": 26,
                "column_start": 2,
@@ -949,7 +949,7 @@
        "full_name": "test_prog$Float$+",
        "mdoc": null,
        "visibility": "public",
-       "modifiers": ["public", "intern", "fun"],
+       "modifiers": ["intern", "fun"],
        "location": {
                "column_end": 33,
                "column_start": 2,
@@ -1000,7 +1000,7 @@
        "full_name": "test_prog$Float$-",
        "mdoc": null,
        "visibility": "public",
-       "modifiers": ["public", "intern", "fun"],
+       "modifiers": ["intern", "fun"],
        "location": {
                "column_end": 33,
                "column_start": 2,
@@ -1051,7 +1051,7 @@
        "full_name": "test_prog$Float$*",
        "mdoc": null,
        "visibility": "public",
-       "modifiers": ["public", "intern", "fun"],
+       "modifiers": ["intern", "fun"],
        "location": {
                "column_end": 33,
                "column_start": 2,
@@ -1102,7 +1102,7 @@
        "full_name": "test_prog$Float$/",
        "mdoc": null,
        "visibility": "public",
-       "modifiers": ["public", "intern", "fun"],
+       "modifiers": ["intern", "fun"],
        "location": {
                "column_end": 33,
                "column_start": 2,
@@ -1153,7 +1153,7 @@
        "full_name": "test_prog$Float$>",
        "mdoc": null,
        "visibility": "public",
-       "modifiers": ["public", "intern", "fun"],
+       "modifiers": ["intern", "fun"],
        "location": {
                "column_end": 32,
                "column_start": 2,
@@ -1244,7 +1244,7 @@
        "full_name": "test_prog$Career$strength_bonus",
        "mdoc": null,
        "visibility": "public",
-       "modifiers": ["public", "fun"],
+       "modifiers": ["fun"],
        "location": {
                "column_end": 24,
                "column_start": 2,
@@ -1378,7 +1378,7 @@
        "full_name": "test_prog$Career$endurance_bonus",
        "mdoc": null,
        "visibility": "public",
-       "modifiers": ["public", "fun"],
+       "modifiers": ["fun"],
        "location": {
                "column_end": 25,
                "column_start": 2,
@@ -1512,7 +1512,7 @@
        "full_name": "test_prog$Career$intelligence_bonus",
        "mdoc": null,
        "visibility": "public",
-       "modifiers": ["public", "fun"],
+       "modifiers": ["fun"],
        "location": {
                "column_end": 28,
                "column_start": 2,
@@ -1664,7 +1664,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "fun"],
+       "modifiers": ["fun"],
        "location": {
                "column_end": 23,
                "column_start": 2,
@@ -1825,7 +1825,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "fun"],
+       "modifiers": ["fun"],
        "location": {
                "column_end": 24,
                "column_start": 2,
@@ -1986,7 +1986,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "fun"],
+       "modifiers": ["fun"],
        "location": {
                "column_end": 27,
                "column_start": 2,
@@ -2147,7 +2147,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "fun"],
+       "modifiers": ["fun"],
        "location": {
                "column_end": 15,
                "column_start": 2,
@@ -2308,7 +2308,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "fun"],
+       "modifiers": ["fun"],
        "location": {
                "column_end": 47,
                "column_start": 2,
@@ -2362,7 +2362,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "fun"],
+       "modifiers": ["fun"],
        "location": {
                "column_end": 47,
                "column_start": 2,
@@ -2411,7 +2411,7 @@
        "full_name": "test_prog$Character$quit",
        "mdoc": null,
        "visibility": "public",
-       "modifiers": ["public", "fun"],
+       "modifiers": ["fun"],
        "location": {
                "column_end": 4,
                "column_start": 2,
@@ -2494,7 +2494,7 @@
        "full_name": "test_prog$Character$name",
        "mdoc": null,
        "visibility": "public",
-       "modifiers": ["public", "fun"],
+       "modifiers": ["fun"],
        "location": {
                "column_end": 17,
                "column_start": 2,
@@ -2628,7 +2628,7 @@
        "full_name": "test_prog$Character$age",
        "mdoc": null,
        "visibility": "public",
-       "modifiers": ["public", "fun"],
+       "modifiers": ["fun"],
        "location": {
                "column_end": 13,
                "column_start": 2,
@@ -2762,7 +2762,7 @@
        "full_name": "test_prog$Character$sex",
        "mdoc": null,
        "visibility": "public",
-       "modifiers": ["public", "fun"],
+       "modifiers": ["fun"],
        "location": {
                "column_end": 14,
                "column_start": 2,
@@ -2865,7 +2865,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "fun"],
+       "modifiers": ["fun"],
        "location": {
                "column_end": 4,
                "column_start": 2,
@@ -2919,7 +2919,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "fun"],
+       "modifiers": ["fun"],
        "location": {
                "column_end": 4,
                "column_start": 2,
@@ -2973,7 +2973,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "fun"],
+       "modifiers": ["fun"],
        "location": {
                "column_end": 4,
                "column_start": 2,
@@ -3027,7 +3027,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "fun"],
+       "modifiers": ["fun"],
        "location": {
                "column_end": 51,
                "column_start": 2,
@@ -3130,7 +3130,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "fun"],
+       "modifiers": ["fun"],
        "location": {
                "column_end": 29,
                "column_start": 2,
@@ -3242,7 +3242,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "abstract", "fun"],
+       "modifiers": ["abstract", "fun"],
        "location": {
                "column_end": 27,
                "column_start": 2,
@@ -3341,7 +3341,7 @@
        "full_name": "test_prog$Combatable$hit_points",
        "mdoc": null,
        "visibility": "public",
-       "modifiers": ["public", "abstract", "fun"],
+       "modifiers": ["abstract", "fun"],
        "location": {
                "column_end": 32,
                "column_start": 2,
@@ -3449,7 +3449,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "abstract", "fun"],
+       "modifiers": ["abstract", "fun"],
        "location": {
                "column_end": 64,
                "column_start": 2,
@@ -3515,7 +3515,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "abstract", "fun"],
+       "modifiers": ["abstract", "fun"],
        "location": {
                "column_end": 71,
                "column_start": 2,
@@ -3581,7 +3581,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "abstract", "fun"],
+       "modifiers": ["abstract", "fun"],
        "location": {
                "column_end": 38,
                "column_start": 2,
@@ -3641,7 +3641,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "fun"],
+       "modifiers": ["fun"],
        "location": {
                "column_end": 43,
                "column_start": 2,
@@ -3695,7 +3695,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "abstract", "fun"],
+       "modifiers": ["abstract", "fun"],
        "location": {
                "column_end": 51,
                "column_start": 2,
@@ -3749,7 +3749,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "abstract", "fun"],
+       "modifiers": ["abstract", "fun"],
        "location": {
                "column_end": 53,
                "column_start": 2,
@@ -3803,7 +3803,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "abstract", "fun"],
+       "modifiers": ["abstract", "fun"],
        "location": {
                "column_end": 27,
                "column_start": 2,
@@ -3855,7 +3855,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "abstract", "fun"],
+       "modifiers": ["abstract", "fun"],
        "location": {
                "column_end": 27,
                "column_start": 2,
@@ -3907,7 +3907,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "abstract", "fun"],
+       "modifiers": ["abstract", "fun"],
        "location": {
                "column_end": 26,
                "column_start": 2,
@@ -3950,7 +3950,7 @@
        "full_name": "test_prog$Starter$start",
        "mdoc": null,
        "visibility": "public",
-       "modifiers": ["public", "fun"],
+       "modifiers": ["fun"],
        "location": {
                "column_end": 17,
                "column_start": 2,
@@ -3993,7 +3993,7 @@
        "full_name": "test_prog$Sys$main",
        "mdoc": null,
        "visibility": "public",
-       "modifiers": ["public", "fun"],
+       "modifiers": ["fun"],
        "location": {
                "column_end": 13,
                "column_start": 1,

diff --git a/src/model/test_model_json.sav/test_props_to_full_json.res b/src/model/test_model_json.sav/test_props_to_full_json.res
index f3c8146..6757986 100644 (file)
--- a/src/model/test_model_json.sav/test_props_to_full_json.res
+++ b/src/model/test_model_json.sav/test_props_to_full_json.res
@@ -13,7 +13,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "type"],
+       "modifiers": ["type"],
        "location": {
                "column_end": 28,
                "column_start": 2,
@@ -58,7 +58,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "intern", "fun"],
+       "modifiers": ["intern", "fun"],
        "location": {
                "column_end": 37,
                "column_start": 2,
@@ -112,7 +112,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "fun"],
+       "modifiers": ["fun"],
        "location": {
                "column_end": 55,
                "column_start": 2,
@@ -157,7 +157,7 @@
        "full_name": "test_prog::Object::init",
        "mdoc": null,
        "visibility": "public",
-       "modifiers": ["public", "init"],
+       "modifiers": ["init"],
        "location": {
                "column_end": 3,
                "column_start": 1,
@@ -212,7 +212,7 @@
        "full_name": "test_prog::Int::unary -",
        "mdoc": null,
        "visibility": "public",
-       "modifiers": ["public", "intern", "fun"],
+       "modifiers": ["intern", "fun"],
        "location": {
                "column_end": 21,
                "column_start": 2,
@@ -251,7 +251,7 @@
        "full_name": "test_prog::Int::+",
        "mdoc": null,
        "visibility": "public",
-       "modifiers": ["public", "intern", "fun"],
+       "modifiers": ["intern", "fun"],
        "location": {
                "column_end": 29,
                "column_start": 2,
@@ -296,7 +296,7 @@
        "full_name": "test_prog::Int::-",
        "mdoc": null,
        "visibility": "public",
-       "modifiers": ["public", "intern", "fun"],
+       "modifiers": ["intern", "fun"],
        "location": {
                "column_end": 29,
                "column_start": 2,
@@ -341,7 +341,7 @@
        "full_name": "test_prog::Int::*",
        "mdoc": null,
        "visibility": "public",
-       "modifiers": ["public", "intern", "fun"],
+       "modifiers": ["intern", "fun"],
        "location": {
                "column_end": 29,
                "column_start": 2,
@@ -386,7 +386,7 @@
        "full_name": "test_prog::Int::/",
        "mdoc": null,
        "visibility": "public",
-       "modifiers": ["public", "intern", "fun"],
+       "modifiers": ["intern", "fun"],
        "location": {
                "column_end": 29,
                "column_start": 2,
@@ -431,7 +431,7 @@
        "full_name": "test_prog::Int::>",
        "mdoc": null,
        "visibility": "public",
-       "modifiers": ["public", "intern", "fun"],
+       "modifiers": ["intern", "fun"],
        "location": {
                "column_end": 30,
                "column_start": 2,
@@ -476,7 +476,7 @@
        "full_name": "test_prog::Int::to_f",
        "mdoc": null,
        "visibility": "public",
-       "modifiers": ["public", "intern", "fun"],
+       "modifiers": ["intern", "fun"],
        "location": {
                "column_end": 26,
                "column_start": 2,
@@ -515,7 +515,7 @@
        "full_name": "test_prog::Float::+",
        "mdoc": null,
        "visibility": "public",
-       "modifiers": ["public", "intern", "fun"],
+       "modifiers": ["intern", "fun"],
        "location": {
                "column_end": 33,
                "column_start": 2,
@@ -560,7 +560,7 @@
        "full_name": "test_prog::Float::-",
        "mdoc": null,
        "visibility": "public",
-       "modifiers": ["public", "intern", "fun"],
+       "modifiers": ["intern", "fun"],
        "location": {
                "column_end": 33,
                "column_start": 2,
@@ -605,7 +605,7 @@
        "full_name": "test_prog::Float::*",
        "mdoc": null,
        "visibility": "public",
-       "modifiers": ["public", "intern", "fun"],
+       "modifiers": ["intern", "fun"],
        "location": {
                "column_end": 33,
                "column_start": 2,
@@ -650,7 +650,7 @@
        "full_name": "test_prog::Float::/",
        "mdoc": null,
        "visibility": "public",
-       "modifiers": ["public", "intern", "fun"],
+       "modifiers": ["intern", "fun"],
        "location": {
                "column_end": 33,
                "column_start": 2,
@@ -695,7 +695,7 @@
        "full_name": "test_prog::Float::>",
        "mdoc": null,
        "visibility": "public",
-       "modifiers": ["public", "intern", "fun"],
+       "modifiers": ["intern", "fun"],
        "location": {
                "column_end": 32,
                "column_start": 2,
@@ -773,7 +773,7 @@
        "full_name": "test_prog::Career::strength_bonus",
        "mdoc": null,
        "visibility": "public",
-       "modifiers": ["public", "fun"],
+       "modifiers": ["fun"],
        "location": {
                "column_end": 24,
                "column_start": 2,
@@ -888,7 +888,7 @@
        "full_name": "test_prog::Career::endurance_bonus",
        "mdoc": null,
        "visibility": "public",
-       "modifiers": ["public", "fun"],
+       "modifiers": ["fun"],
        "location": {
                "column_end": 25,
                "column_start": 2,
@@ -1003,7 +1003,7 @@
        "full_name": "test_prog::Career::intelligence_bonus",
        "mdoc": null,
        "visibility": "public",
-       "modifiers": ["public", "fun"],
+       "modifiers": ["fun"],
        "location": {
                "column_end": 28,
                "column_start": 2,
@@ -1136,7 +1136,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "fun"],
+       "modifiers": ["fun"],
        "location": {
                "column_end": 23,
                "column_start": 2,
@@ -1278,7 +1278,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "fun"],
+       "modifiers": ["fun"],
        "location": {
                "column_end": 24,
                "column_start": 2,
@@ -1420,7 +1420,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "fun"],
+       "modifiers": ["fun"],
        "location": {
                "column_end": 27,
                "column_start": 2,
@@ -1562,7 +1562,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "fun"],
+       "modifiers": ["fun"],
        "location": {
                "column_end": 15,
                "column_start": 2,
@@ -1704,7 +1704,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "fun"],
+       "modifiers": ["fun"],
        "location": {
                "column_end": 47,
                "column_start": 2,
@@ -1752,7 +1752,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "fun"],
+       "modifiers": ["fun"],
        "location": {
                "column_end": 47,
                "column_start": 2,
@@ -1795,7 +1795,7 @@
        "full_name": "test_prog::Character::quit",
        "mdoc": null,
        "visibility": "public",
-       "modifiers": ["public", "fun"],
+       "modifiers": ["fun"],
        "location": {
                "column_end": 4,
                "column_start": 2,
@@ -1865,7 +1865,7 @@
        "full_name": "test_prog::Character::name",
        "mdoc": null,
        "visibility": "public",
-       "modifiers": ["public", "fun"],
+       "modifiers": ["fun"],
        "location": {
                "column_end": 17,
                "column_start": 2,
@@ -1980,7 +1980,7 @@
        "full_name": "test_prog::Character::age",
        "mdoc": null,
        "visibility": "public",
-       "modifiers": ["public", "fun"],
+       "modifiers": ["fun"],
        "location": {
                "column_end": 13,
                "column_start": 2,
@@ -2095,7 +2095,7 @@
        "full_name": "test_prog::Character::sex",
        "mdoc": null,
        "visibility": "public",
-       "modifiers": ["public", "fun"],
+       "modifiers": ["fun"],
        "location": {
                "column_end": 14,
                "column_start": 2,
@@ -2186,7 +2186,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "fun"],
+       "modifiers": ["fun"],
        "location": {
                "column_end": 4,
                "column_start": 2,
@@ -2234,7 +2234,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "fun"],
+       "modifiers": ["fun"],
        "location": {
                "column_end": 4,
                "column_start": 2,
@@ -2282,7 +2282,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "fun"],
+       "modifiers": ["fun"],
        "location": {
                "column_end": 4,
                "column_start": 2,
@@ -2330,7 +2330,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "fun"],
+       "modifiers": ["fun"],
        "location": {
                "column_end": 51,
                "column_start": 2,
@@ -2420,7 +2420,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "fun"],
+       "modifiers": ["fun"],
        "location": {
                "column_end": 29,
                "column_start": 2,
@@ -2520,7 +2520,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "abstract", "fun"],
+       "modifiers": ["abstract", "fun"],
        "location": {
                "column_end": 27,
                "column_start": 2,
@@ -2561,7 +2561,7 @@
        "full_name": "test_prog::Combatable::hit_points",
        "mdoc": null,
        "visibility": "public",
-       "modifiers": ["public", "abstract", "fun"],
+       "modifiers": ["abstract", "fun"],
        "location": {
                "column_end": 32,
                "column_start": 2,
@@ -2611,7 +2611,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "abstract", "fun"],
+       "modifiers": ["abstract", "fun"],
        "location": {
                "column_end": 64,
                "column_start": 2,
@@ -2671,7 +2671,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "abstract", "fun"],
+       "modifiers": ["abstract", "fun"],
        "location": {
                "column_end": 71,
                "column_start": 2,
@@ -2731,7 +2731,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "abstract", "fun"],
+       "modifiers": ["abstract", "fun"],
        "location": {
                "column_end": 38,
                "column_start": 2,
@@ -2785,7 +2785,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "fun"],
+       "modifiers": ["fun"],
        "location": {
                "column_end": 43,
                "column_start": 2,
@@ -2833,7 +2833,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "abstract", "fun"],
+       "modifiers": ["abstract", "fun"],
        "location": {
                "column_end": 51,
                "column_start": 2,
@@ -2881,7 +2881,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "abstract", "fun"],
+       "modifiers": ["abstract", "fun"],
        "location": {
                "column_end": 53,
                "column_start": 2,
@@ -2929,7 +2929,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "abstract", "fun"],
+       "modifiers": ["abstract", "fun"],
        "location": {
                "column_end": 27,
                "column_start": 2,
@@ -2975,7 +2975,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "abstract", "fun"],
+       "modifiers": ["abstract", "fun"],
        "location": {
                "column_end": 27,
                "column_start": 2,
@@ -3021,7 +3021,7 @@
                }
        },
        "visibility": "public",
-       "modifiers": ["public", "abstract", "fun"],
+       "modifiers": ["abstract", "fun"],
        "location": {
                "column_end": 26,
                "column_start": 2,
@@ -3058,7 +3058,7 @@
        "full_name": "test_prog::Starter::start",
        "mdoc": null,
        "visibility": "public",
-       "modifiers": ["public", "fun"],
+       "modifiers": ["fun"],
        "location": {
                "column_end": 17,
                "column_start": 2,
@@ -3095,7 +3095,7 @@
        "full_name": "test_prog::Sys::main",
        "mdoc": null,
        "visibility": "public",
-       "modifiers": ["public", "fun"],
+       "modifiers": ["fun"],
        "location": {
                "column_end": 13,
                "column_start": 1,