Changeset 10079 for branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL/3.4/Util.cs

Timestamp:

10/22/13 19:23:48 (11 years ago)

Author:

gkronber

Message:

#2026 added the royal tree benchmark problem for genetic programming

File:

• branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL/3.4/Util.cs (modified) (1 diff)

branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL/3.4/Util.cs

@@ -26 +26 @@
 public class Util {
   // simplistic regex for formal parameters, any string of non-whitespace and not comma characters is allowed as a type name
+  // this has to be changed to allow for e.g., generic types (S<T0, T1>) and for expressions in actual parameters (max(x, 0) + 1))
   private static string refOrOutGroup = @"(?:(?<refOrOut>(out|ref))\s+)"; // "ref " | "out "
-  private static string typeGroup = @"(?:(?<type>[^ ,\f\n\r\t\v]*)\s+)";
-  private static string identGroup = @"(?<id>[\w]+)\s*";
+  private static string typeGroup = @"(?:(?<type>[^,]+)\s+)";
+  private static string identGroup = @"(?<id>[^,]+)\s*";
   private static Regex formalParameterExpr = new Regex(@"\s*,?\s*" + refOrOutGroup + "?" + typeGroup + "?" + identGroup, RegexOptions.ECMAScript);
   public static IEnumerable<TerminalNode.FieldDefinition> ExtractParameters(string formalParameterSrc) {