Simplify the preprocessor formula regexes

Author: ibbem

src/main/java/org/variantsync/diffdetective/feature/AbstractingFormulaExtractor.java

@@ -44,21 +44,14 @@ public AbstractingFormulaExtractor(Pattern annotationPattern) {
     public Node extractFormula(final String text) throws UnparseableFormulaException {
         final Matcher matcher = annotationPattern.matcher(text);
 
-        // Retrieve the formula from the macro line
-        String fm;
-        if (matcher.find()) {
-            if (matcher.group(3) != null) {
-                fm = matcher.group(3);
-            } else {
-                fm = matcher.group(4);
-            }
-        } else {
+        // Match the formula from the macro line
+        if (!matcher.find()) {
             throw new UnparseableFormulaException("Could not extract formula from line \"" + text + "\".");
         }
 
         // abstract complex formulas (e.g., if they contain arithmetics or macro calls)
         try {
-            return abstractFormula(fm);
+            return abstractFormula(matcher.group(2));
         } catch (UncheckedUnParseableFormulaException e) {
             throw e.inner();
         } catch (Exception e) {

src/main/java/org/variantsync/diffdetective/feature/cpp/CPPDiffLineFormulaExtractor.java

@@ -24,7 +24,7 @@
  */
 public class CPPDiffLineFormulaExtractor extends AbstractingFormulaExtractor {
     // ^[+-]?\s*#\s*(if|ifdef|ifndef|elif)(\s+(.*)|\((.*)\))$
-    private static final String CPP_ANNOTATION_REGEX = "^[+-]?\\s*#\\s*(if|ifdef|ifndef|elif)(\\s+(.*)|(\\(.*\\)))$";
+    private static final String CPP_ANNOTATION_REGEX = "^[+-]?\\s*#\\s*(if|ifdef|ifndef|elif)([\\s(].*)$";
     private static final Pattern CPP_ANNOTATION_PATTERN = Pattern.compile(CPP_ANNOTATION_REGEX);
 
     public CPPDiffLineFormulaExtractor() {

src/main/java/org/variantsync/diffdetective/feature/jpp/JPPDiffLineFormulaExtractor.java

@@ -21,7 +21,7 @@
  * @author Alexander Schultheiß
  */
 public class JPPDiffLineFormulaExtractor extends AbstractingFormulaExtractor {
-    private static final String JPP_ANNOTATION_REGEX = "^[+-]?\\s*//\\s*#\\s*(if|elif)(\\s+(.*)|(\\(.*\\)))$";
+    private static final String JPP_ANNOTATION_REGEX = "^[+-]?\\s*//\\s*#\\s*(if|elif)([\\s(].*)$";
     private static final Pattern JPP_ANNOTATION_PATTERN = Pattern.compile(JPP_ANNOTATION_REGEX);
 
     public JPPDiffLineFormulaExtractor() {