From 37d02f5ad9ab56a4d22d0ea065401dc1f6fa42dd Mon Sep 17 00:00:00 2001
From: Victor <melnikukr@mail.ru>
Date: Sat, 18 Apr 2015 16:41:41 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B0=D1=80=D1=81=D0=B8=D0=BD=D0=B3=20?=
 =?UTF-8?q?=D1=82=D0=B5=D0=BA=D1=81=D1=82=D0=B0=20=D0=B2=20=D0=BE=D0=B4?=
 =?UTF-8?q?=D0=B8=D0=BD=D0=B0=D1=80=D0=BD=D1=8B=D1=85=20=D0=BA=D0=B0=D0=B2?=
 =?UTF-8?q?=D1=8B=D1=87=D0=BA=D0=B0=D1=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/annimon/everlastingsummer/Lexer.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/com/annimon/everlastingsummer/Lexer.java b/src/com/annimon/everlastingsummer/Lexer.java
index e49a2ec..02c330c 100644
--- a/src/com/annimon/everlastingsummer/Lexer.java
+++ b/src/com/annimon/everlastingsummer/Lexer.java
@@ -73,6 +73,7 @@ public final class Lexer {
     
     private TokenizeState state;
     private int pos;
+    private char textStartChar;
 
     private enum TokenizeState {
         DEFAULT, NUMBER, OPERATOR, WORD, TEXT, COMMENT
@@ -119,8 +120,9 @@ public final class Lexer {
             // Число
             buffer.append(ch);
             state = TokenizeState.NUMBER;
-        } else if (ch == '"') {
-            // Текст в "кавычках"
+        } else if (ch == '"' || ch == '\'') {
+            // Текст в "кавычках" или 'одинарных'
+            textStartChar = ch;
             state = TokenizeState.TEXT;
         } else if (ch == '#') {
             clearBuffer();
@@ -160,7 +162,7 @@ public final class Lexer {
     }
     
     private void tokenizeText(char ch) {
-        if (ch == '"') {
+        if (ch == textStartChar) {
             final int len = buffer.length();
             // Добавляем токен, если не было экранирования символа кавычки.
             if (len == 0 ||
@@ -170,7 +172,7 @@ public final class Lexer {
             }
             // Экранируем символ кавычки.
             if (len > 0) {
-                buffer.setCharAt(len - 1, '\"');
+                buffer.setCharAt(len - 1, textStartChar);
                 return;
             }
         }