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

Rename ExpressionParser.versionOf() to versionFor()

Browse Source
This commit is contained in:
Zafar Khaja 2014-10-24 10:34:31 +03:00
parent 33f6125943
commit ea68756f5e
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
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)); return gte(versionFor(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)).and(lt(versionOf(major + 1))); return gte(versionFor(major, minor)).and(lt(versionFor(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))); return gte(versionFor(major, minor, patch)).and(lt(versionFor(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)).and(lt(versionOf(major + 1))); return gte(versionFor(major)).and(lt(versionFor(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)).and(lt(versionOf(major, minor + 1))); return gte(versionFor(major, minor)).and(lt(versionFor(major, minor + 1)));
} }
/** /**
@ -333,7 +333,7 @@ public class ExpressionParser implements Parser<Expression> {
tokens.consume(); tokens.consume();
patch = intOf(consumeNextToken(NUMERIC).lexeme); patch = intOf(consumeNextToken(NUMERIC).lexeme);
} }
return versionOf(major, minor, patch); return versionFor(major, minor, patch);
} }
/** /**
@ -366,8 +366,8 @@ public class ExpressionParser implements Parser<Expression> {
* @param major the major version number * @param major the major version number
* @return the version for the specified major version * @return the version for the specified major version
*/ */
private Version versionOf(int major) { private Version versionFor(int major) {
return versionOf(major, 0, 0); return versionFor(major, 0, 0);
} }
/** /**
@ -378,8 +378,8 @@ public class ExpressionParser implements Parser<Expression> {
* @param minor the minor version number * @param minor the minor version number
* @return the version for the specified major and minor versions * @return the version for the specified major and minor versions
*/ */
private Version versionOf(int major, int minor) { private Version versionFor(int major, int minor) {
return versionOf(major, minor, 0); return versionFor(major, minor, 0);
} }
/** /**
@ -391,7 +391,7 @@ public class ExpressionParser implements Parser<Expression> {
* @param patch the patch version number * @param patch the patch version number
* @return the version for the specified major, minor and patch versions * @return the version for the specified major, minor and patch versions
*/ */
private Version versionOf(int major, int minor, int patch) { private Version versionFor(int major, int minor, int patch) {
return Version.forIntegers(major, minor, patch); return Version.forIntegers(major, minor, patch);
} }