From 4369c0bb1d0a3d51b15feae2d2d7c65a420bb050 Mon Sep 17 00:00:00 2001 From: Johannes Mey <johannes.mey@tu-dresden.de> Date: Wed, 1 Jan 2020 21:02:38 +0100 Subject: [PATCH] allow static inner classes as component types --- src/main/jastadd/RelAst.parser | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/jastadd/RelAst.parser b/src/main/jastadd/RelAst.parser index f043efd..c6aad99 100644 --- a/src/main/jastadd/RelAst.parser +++ b/src/main/jastadd/RelAst.parser @@ -34,9 +34,16 @@ SimpleTypeUse s_type_use = ID {: return new SimpleTypeUse(ID); :} ; +ArrayList inner_type_use + = ID + | inner_type_use DOT ID + ; + TypeUse type_use = - s_type_use.u {: return u; :} - | parameterized_type_use.p {: return p; :} +// s_type_use.u {: return u; :} +// | + parameterized_type_use.p {: return p; :} + | inner_type_use.p {: return new SimpleTypeUse((String)p.stream().map( x -> ((Symbol)x).value.toString()).collect(java.util.stream.Collectors.joining("."))); :} ; ParameterizedTypeUse parameterized_type_use = ID LT type_use_list.l GT {: return new ParameterizedTypeUse(ID, l); :} -- GitLab