3c9fbe3d4beed734e6be03d335fb12313b55d57a jcasper Thu Jan 23 10:18:28 2014 -0800 Fixed regex for enum fields in .as files - should now match properly, refs #11394 diff --git src/test/buildTableDescriptions.pl src/test/buildTableDescriptions.pl index ab3cd78..fe30e75 100755 --- src/test/buildTableDescriptions.pl +++ src/test/buildTableDescriptions.pl @@ -178,31 +178,31 @@ my $as = ""; my $table = ""; my $object = ""; my $fields = ""; while () { $as .= $_; if (/^\s*\(/) { $gotLeftParen = 1; } if (/^\s*table\s+(\S+)[^\;]*$/i) { $table = $1; $object = ""; } elsif (/^\s*(object|simple)\s+(\S+)/ && !$gotLeftParen) { $object = $2; $table = ""; - } elsif (/^\s*enum\s*\([^\)]+\s*(\S+)\s*;/) { + } elsif (/^\s*enum\s*\([^\)]+\)\s*(\S+)\s*;/) { $fields .= "$1,"; } elsif (/^[^\"]+\s+(\S+)\s*;/) { $fields .= "$1,"; } elsif (/^\s*\)/) { if (($table eq "" && $object eq "") || $fields eq "") { die "Trouble parsing autoSql file $filename:\n$as"; } if ($table ne "") { if (defined $tableAS{$table}) { warn "Duplicate autoSql def for table $table (" . $tableAS{$table}->{filename} . " vs. $filename)"; } $tableAS{$table} = { fields => &simplifyFields($fields), autoSql => $as, tableName => $table,