dorkbox/Version
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Overload ExpressionParser.versionOf() for convenience

Browse Source
This commit is contained in:
Zafar Khaja 2014-10-21 23:19:24 +03:00
parent 370bc2b33a
commit 33f6125943
1 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/main/java/com/github/zafarkhaja/semver/expr/ExpressionParser.java
View File

@ -230,16 +230,16 @@ public class ExpressionParser implements Parser<Expression> {
consumeNextToken(TILDE); consumeNextToken(TILDE);
int major = intOf(consumeNextToken(NUMERIC).lexeme); int major = intOf(consumeNextToken(NUMERIC).lexeme);
if (!tokens.positiveLookahead(DOT)) { if (!tokens.positiveLookahead(DOT)) {
return gte(versionOf(major, 0, 0)); return gte(versionOf(major));
} }
consumeNextToken(DOT); consumeNextToken(DOT);
int minor = intOf(consumeNextToken(NUMERIC).lexeme); int minor = intOf(consumeNextToken(NUMERIC).lexeme);
if (!tokens.positiveLookahead(DOT)) { if (!tokens.positiveLookahead(DOT)) {
return gte(versionOf(major, minor, 0)).and(lt(versionOf(major + 1, 0, 0))); return gte(versionOf(major, minor)).and(lt(versionOf(major + 1)));
} }
consumeNextToken(DOT); consumeNextToken(DOT);
int patch = intOf(consumeNextToken(NUMERIC).lexeme); int patch = intOf(consumeNextToken(NUMERIC).lexeme);
return gte(versionOf(major, minor, patch)).and(lt(versionOf(major, minor + 1, 0))); return gte(versionOf(major, minor, patch)).and(lt(versionOf(major, minor + 1)));
} }
/** /**
@ -271,12 +271,12 @@ public class ExpressionParser implements Parser<Expression> {
consumeNextToken(DOT); consumeNextToken(DOT);
if (tokens.positiveLookahead(STAR)) { if (tokens.positiveLookahead(STAR)) {
tokens.consume(); tokens.consume();
return gte(versionOf(major, 0, 0)).and(lt(versionOf(major + 1, 0, 0))); return gte(versionOf(major)).and(lt(versionOf(major + 1)));
} }
int minor = intOf(consumeNextToken(NUMERIC).lexeme); int minor = intOf(consumeNextToken(NUMERIC).lexeme);
consumeNextToken(DOT); consumeNextToken(DOT);
consumeNextToken(STAR); consumeNextToken(STAR);
return gte(versionOf(major, minor, 0)).and(lt(versionOf(major, minor + 1, 0))); return gte(versionOf(major, minor)).and(lt(versionOf(major, minor + 1)));
} }
/** /**
@ -361,12 +361,35 @@ public class ExpressionParser implements Parser<Expression> {
} }
/** /**
* Creates a {@code Version} instance for the specified integers. * Creates a {@code Version} instance for the specified major version.
*
* @param major the major version number
* @return the version for the specified major version
*/
private Version versionOf(int major) {
return versionOf(major, 0, 0);
}
/**
* Creates a {@code Version} instance for
* the specified major and minor versions.
*
* @param major the major version number
* @param minor the minor version number
* @return the version for the specified major and minor versions
*/
private Version versionOf(int major, int minor) {
return versionOf(major, minor, 0);
}
/**
* Creates a {@code Version} instance for the
* specified major, minor and patch versions.
* *
* @param major the major version number * @param major the major version number
* @param minor the minor version number * @param minor the minor version number
* @param patch the patch version number * @param patch the patch version number
* @return the version for the specified integers * @return the version for the specified major, minor and patch versions
*/ */
private Version versionOf(int major, int minor, int patch) { private Version versionOf(int major, int minor, int patch) {
return Version.forIntegers(major, minor, patch); return Version.forIntegers(major, minor, patch);