Andreas Tille pushed to branch upstream at Debian Med / examl
Commits:
e5ccf5f0 by Andreas Tille at 2018-06-08T13:10:40+02:00
New upstream version 3.0.21
- - - - -
2 changed files:
- parser/parsePartitions.c
- versionHeader/version.h
Changes:
=====================================
parser/parsePartitions.c
=====================================
--- a/parser/parsePartitions.c
+++ b/parser/parsePartitions.c
@@ -370,7 +370,15 @@ static int myGetline(char **lineptr, int *n, FILE *stream)
return p - *lineptr;
}
-
+static void nonContiguousError(analdef *adef)
+{
+ if(adef->compressPatterns == FALSE)
+ {
+ printf("\nError: You are not allowed to use interleaved partitions, that
is, assign non-contiguous sites\n");
+ printf("to the same partition model, when pattern compression is
disabled via the -c flag!\n\n");
+ exit(-1);
+ }
+}
void parsePartitions(analdef *adef, rawdata *rdta, tree *tr)
{
@@ -499,6 +507,7 @@ void parsePartitions(analdef *adef, rawdata *rdta, tree *tr)
if(*ch == ',')
{
upper = lower;
+ nonContiguousError(adef);
goto SINGLE_NUMBER;
}
@@ -542,6 +551,7 @@ void parsePartitions(analdef *adef, rawdata *rdta, tree *tr)
if(*ch == ',')
{
ch++;
+ nonContiguousError(adef);
goto numberPairs;
}
@@ -556,13 +566,8 @@ void parsePartitions(analdef *adef, rawdata *rdta, tree
*tr)
exit(-1);
}
- if(adef->compressPatterns == FALSE)
- {
- printf("\nError: You are not allowed to use interleaved
partitions, that is, assign non-contiguous sites\n");
- printf("to the same partition model, when pattern compression is
disabled via the -c flag!\n\n");
- exit(-1);
- }
-
+ nonContiguousError(adef);
+
l = 0;
while(isNum(*ch))
{
@@ -582,6 +587,7 @@ void parsePartitions(analdef *adef, rawdata *rdta, tree *tr)
if(*ch == ',')
{
ch++;
+ nonContiguousError(adef);
goto numberPairs;
}
}
=====================================
versionHeader/version.h
=====================================
--- a/versionHeader/version.h
+++ b/versionHeader/version.h
@@ -1,4 +1,4 @@
#define programName "ExaML"
-#define programVersion "3.0.20"
-#define programVersionInt 3020
-#define programDate "January 26 2018"
+#define programVersion "3.0.21"
+#define programVersionInt 3021
+#define programDate "May 29 2018"
View it on GitLab:
https://salsa.debian.org/med-team/examl/commit/e5ccf5f0d0a1b14399dd1cbc7cd5c71d6c78371d
--
View it on GitLab:
https://salsa.debian.org/med-team/examl/commit/e5ccf5f0d0a1b14399dd1cbc7cd5c71d6c78371d
You're receiving this email because of your account on salsa.debian.org.
_______________________________________________
debian-med-commit mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
