Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ggj][ast] feat: support negative numeric literals #343

Merged
merged 5 commits into from
Sep 26, 2020
Merged

[ggj][ast] feat: support negative numeric literals #343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e4f7374
fix!: refactor field into MethodArgument, add enum/msg flags
miraleung Sep 22, 2020
6489625
feat: partial isAssignableFrom VaporRef support, enable full-name typ…
miraleung Sep 23, 2020
fb565b6
feat: support negative numeric literals
miraleung Sep 24, 2020
655e74a
Merge branch 'master' into gp/g2
miraleung Sep 26, 2020
d11e0cb
Merge branch 'master' into gp/g2
miraleung Sep 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions src/main/java/com/google/api/generator/engine/lexicon/Literal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,14 @@ public class Literal {
private static final String BOOLEAN_FALSE = "false";
private static final String NULL_VALUE = "null";

private static final Pattern INTEGER_PATTERN = Pattern.compile("^[0-9]+$");
private static final Pattern LONG_PATTERN = Pattern.compile("^[0-9]+[Ll]?$");
private static final Pattern INTEGER_PATTERN = Pattern.compile("^\\-?[0-9]+$");
private static final Pattern LONG_PATTERN = Pattern.compile("^\\-?[0-9]+[Ll]?$");
private static final Pattern FLOAT_PATTERN =
Pattern.compile("^[0-9]+([fF]|(\\.(([0-9]+[fF])|[fF])))?$");
Pattern.compile("^\\-?[0-9]+([fF]|(\\.(([0-9]+[fF])|[fF])))?$");
private static final Pattern DOUBLE_PATTERN_ONE =
Pattern.compile("^[0-9]+(\\.[0-9]+)?(\\.?[eE]\\-?[0-9]+)$");
private static final Pattern DOUBLE_PATTERN_TWO = Pattern.compile("^\\d*\\.\\d+$|^\\d+\\.\\d*$");
Pattern.compile("^\\-?[0-9]+(\\.[0-9]+)?(\\.?[eE]\\-?[0-9]+)$");
private static final Pattern DOUBLE_PATTERN_TWO =
Pattern.compile("^\\-?\\d*\\.\\d+$|^\\d+\\.\\d*$");

public static boolean isBooleanLiteral(String str) {
return str.equals(BOOLEAN_TRUE) || str.equals(BOOLEAN_FALSE);
Expand Down
6 changes: 6 additions & 0 deletions src/test/java/com/google/api/generator/engine/lexicon/LiteralTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ public void nullLDetected() {
public void integerDetected() {
assertThat(Literal.isIntegerLiteral("a123")).isFalse();
assertThat(Literal.isIntegerLiteral("123")).isTrue();
assertThat(Literal.isIntegerLiteral("-123")).isTrue();
assertThat(Literal.isIntegerLiteral("123L")).isFalse();
assertThat(Literal.isIntegerLiteral("123r")).isFalse();
assertThat(Literal.isIntegerLiteral("123e2")).isFalse();
Expand All @@ -47,6 +48,7 @@ public void longDetected() {
assertThat(Literal.isLongLiteral("123")).isTrue();
assertThat(Literal.isLongLiteral("123L")).isTrue();
assertThat(Literal.isLongLiteral("123l")).isTrue();
assertThat(Literal.isLongLiteral("-123l")).isTrue();
assertThat(Literal.isLongLiteral("123e")).isFalse();
}

Expand All @@ -58,6 +60,7 @@ public void floatDetected() {
assertThat(Literal.isFloatLiteral("0.01")).isFalse();
assertThat(Literal.isFloatLiteral(".01")).isFalse();
assertThat(Literal.isFloatLiteral("123.f")).isTrue();
assertThat(Literal.isFloatLiteral("-123.f")).isTrue();
assertThat(Literal.isFloatLiteral("123.F")).isTrue();
assertThat(Literal.isFloatLiteral("123.234F")).isTrue();
assertThat(Literal.isFloatLiteral("123.234Fe-3")).isFalse();
Expand All @@ -69,11 +72,14 @@ public void doubleDetected() {
assertThat(Literal.isDoubleLiteral("123")).isTrue();
assertThat(Literal.isDoubleLiteral("0.01")).isTrue();
assertThat(Literal.isDoubleLiteral(".01")).isTrue();
assertThat(Literal.isDoubleLiteral("-.01")).isTrue();
assertThat(Literal.isDoubleLiteral("123.0")).isTrue();
assertThat(Literal.isDoubleLiteral("-123.0")).isTrue();
assertThat(Literal.isDoubleLiteral("123f")).isTrue();
assertThat(Literal.isDoubleLiteral("123E-2")).isTrue();
assertThat(Literal.isDoubleLiteral("123.134E-2")).isTrue();
assertThat(Literal.isDoubleLiteral("123.E-2")).isTrue();
assertThat(Literal.isDoubleLiteral("-123.E-2")).isTrue();
assertThat(Literal.isDoubleLiteral("123e2")).isTrue();
assertThat(Literal.isDoubleLiteral("123e")).isFalse();
assertThat(Literal.isDoubleLiteral("123E-")).isFalse();
Expand Down