error recovery for the duplicate enum

Author: borisbat

src/parser/ds2_parser.cpp

@@ -324,6 +324,7 @@ union DAS2_YYSTYPE
     AnnotationList *                faList;
     MakeStruct *                    pMakeStruct;
     Enumeration *                   pEnum;
+    Enumeration *                   pEnumList;
     EnumPair *                      pEnumPair;
     Structure *                     pStructure;
     Function *                      pFuncDecl;

src/parser/ds2_parser.hpp

@@ -2064,7 +2064,7 @@ Nonterminals, with rules where they appear
     commas (395)
         on left: 642 643
         on right: 643 646 660 737 738
-    enum_list <pEnum> (396)
+    enum_list <pEnumList> (396)
         on left: 644 645 646
         on right: 646 668
     optional_public_or_private_alias <b> (397)

src/parser/ds2_parser.output

@@ -144,6 +144,7 @@
     AnnotationList *                faList;
     MakeStruct *                    pMakeStruct;
     Enumeration *                   pEnum;
+    Enumeration *                   pEnumList;
     EnumPair *                      pEnumPair;
     Structure *                     pStructure;
     Function *                      pFuncDecl;
@@ -166,7 +167,8 @@
 %destructor { delete $$; } <fa>
 %destructor { delete $$; } <faList>
 %destructor { delete $$; } <pMakeStruct>
-%destructor { if ( $$->use_count()==1 ) delete $$; } <pEnum>
+%destructor { $$->delRef(); } <pEnum>
+%destructor { delete $$; } <pEnumList>
 %destructor { delete $$; } <pEnumPair>
 %destructor { delete $$; } <pCapt>
 %destructor { delete $$; } <pCaptList>
@@ -453,7 +455,7 @@
 
 %type <i>                   copy_or_move_or_clone
 
-%type <pEnum>               enum_list
+%type <pEnumList>           enum_list
 %type <pEnumPair>           enum_expression
 
 %type <pExpression>         expr

src/parser/ds2_parser.ypp

@@ -328,6 +328,7 @@ union DAS_YYSTYPE
     AnnotationList *                faList;
     MakeStruct *                    pMakeStruct;
     Enumeration *                   pEnum;
+    Enumeration *                   pEnumList;
     Structure *                     pStructure;
     Function *                      pFuncDecl;
     CaptureEntry *                  pCapt;

src/parser/ds_parser.cpp

@@ -2105,7 +2105,7 @@ Nonterminals, with rules where they appear
     $@41 (401)
         on left: 661
         on right: 662
-    enum_list <pEnum> (402)
+    enum_list <pEnumList> (402)
         on left: 663 664 665 666
         on right: 664 665 666 683 686
     optional_public_or_private_alias <b> (403)

src/parser/ds_parser.hpp

@@ -125,6 +125,7 @@
     AnnotationList *                faList;
     MakeStruct *                    pMakeStruct;
     Enumeration *                   pEnum;
+    Enumeration *                   pEnumList;
     Structure *                     pStructure;
     Function *                      pFuncDecl;
     CaptureEntry *                  pCapt;
@@ -146,7 +147,8 @@
 %destructor { delete $$; } <fa>
 %destructor { delete $$; } <faList>
 %destructor { delete $$; } <pMakeStruct>
-%destructor { if ( $$->use_count()==1 ) delete $$; } <pEnum>
+%destructor { $$->delRef(); } <pEnum>
+%destructor { delete $$; } <pEnumList>
 %destructor { delete $$; } <pCapt>
 %destructor { delete $$; } <pCaptList>
 %destructor { delete $$.firstType; delete $$.secondType; } <aTypePair>
@@ -443,7 +445,7 @@
 
 %type <i>               copy_or_move_or_clone
 
-%type <pEnum>           enum_list
+%type <pEnumList>       enum_list
 
 %type <pExpression>     expr
 %type <pExpression>     expr_mtag

src/parser/ds_parser.output

@@ -490,6 +490,10 @@ namespace das {
     }
 
     void ast_enumDeclaration (  yyscan_t scanner, AnnotationList * annL, const LineInfo & atannL, bool pubE, Enumeration * pEnum, Enumeration * pE, Type ebt ) {
+        if ( !pEnum->module ) {
+            pEnum->delRef();
+            return;
+        }
         pEnum->baseType = ebt;
         pEnum->isPrivate = !pubE;
         pEnum->list = das::move(pE->list);