fixed negative functional group count bug in Shorthand2020 and Goslin…

… grammar
lifs-tools · Apr 11, 2022 · 9cc1da0 · 9cc1da0
1 parent 777045e
commit 9cc1da0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/parser/GoslinParserEventHandler.cpp b/src/parser/GoslinParserEventHandler.cpp
@@ -589,8 +589,8 @@ void GoslinParserEventHandler::add_carbon(TreeNode *node) {
 
 void GoslinParserEventHandler::add_hydroxyl(TreeNode *node) {
     int num_h = atoi(node->get_text().c_str());
-
     if (sp_regular_lcb()) num_h -= 1;
+    if (num_h <= 0) return;
 
     FunctionalGroup* functional_group = KnownFunctionalGroups::get_functional_group("OH");
     functional_group->count = num_h;

diff --git a/src/parser/ShorthandParserEventHandler.cpp b/src/parser/ShorthandParserEventHandler.cpp
@@ -661,6 +661,10 @@ void ShorthandParserEventHandler::add_functional_group(TreeNode *node){
         set_lipid_level(STRUCTURE_DEFINED);
     }
 
+    if (fg_cnt <= 0){
+        return;
+    }
+
     FunctionalGroup *functional_group = 0;
     try {
         functional_group = KnownFunctionalGroups::get_functional_group(fg_name);