From 85c34e81ec4ad0d25cfabc35a6d168e9a0d57390 Mon Sep 17 00:00:00 2001 From: Vortana Say Date: Thu, 31 Aug 2017 09:38:11 -0500 Subject: [PATCH] add support Camel Case for key to avoid crash --- src/main/java/com/squareup/phrase/Phrase.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/squareup/phrase/Phrase.java b/src/main/java/com/squareup/phrase/Phrase.java index f642797..87ee563 100644 --- a/src/main/java/com/squareup/phrase/Phrase.java +++ b/src/main/java/com/squareup/phrase/Phrase.java @@ -255,7 +255,7 @@ private Token token(Token prev) { char nextChar = lookahead(); if (nextChar == '{') { return leftCurlyBracket(prev); - } else if (nextChar >= 'a' && nextChar <= 'z') { + } else if ((nextChar >= 'a' && nextChar <= 'z') || (nextChar >= 'A' && nextChar <= 'Z')) { return key(prev); } else { throw new IllegalArgumentException( @@ -273,7 +273,7 @@ private KeyToken key(Token prev) { // Consume the opening '{'. consume(); - while ((curChar >= 'a' && curChar <= 'z') || curChar == '_') { + while ((curChar >= 'a' && curChar <= 'z') || (curChar >= 'A' && curChar <= 'Z') || curChar == '_') { sb.append(curChar); consume(); }