From e947ae01d5d404275e93f5f6a484069db2b2ea69 Mon Sep 17 00:00:00 2001
From: Victor <melnikukr@mail.ru>
Date: Thu, 18 Feb 2016 22:02:37 +0200
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B0=D1=80=D1=81=D0=B8=D0=BD=D0=B3=20?=
 =?UTF-8?q?=D1=8D=D0=BA=D1=80=D0=B0=D0=BD=D0=B8=D1=80=D0=BE=D0=B2=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=BD=D1=8B=D1=85=20=D1=81=D0=B8=D0=BC=D0=B2=D0=BE=D0=BB?=
 =?UTF-8?q?=D0=BE=D0=B2=20=D0=B2=20=D1=81=D1=82=D1=80=D0=BE=D0=BA=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 program.own                               |  4 +++-
 src/com/annimon/ownlang/parser/Lexer.java | 27 +++++++++++++++++++++--
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/program.own b/program.own
index 356be51..274fb6a 100644
--- a/program.own
+++ b/program.own
@@ -238,4 +238,6 @@ println `extended word variable`
 
 // Operator overloading
 def `::`(v1, v2) = string(v1) + string(v2)
-println 1 :: 2 :: 3
\ No newline at end of file
+println 1 :: 2 :: 3
+
+println "\u042a"
\ No newline at end of file
diff --git a/src/com/annimon/ownlang/parser/Lexer.java b/src/com/annimon/ownlang/parser/Lexer.java
index c93a86e..f3c8c53 100644
--- a/src/com/annimon/ownlang/parser/Lexer.java
+++ b/src/com/annimon/ownlang/parser/Lexer.java
@@ -150,7 +150,7 @@ public final class Lexer {
     private void tokenizeHexNumber() {
         clearBuffer();
         char current = peek(0);
-        while (Character.isDigit(current) || isHexNumber(current)) {
+        while (isHexNumber(current)) {
             buffer.append(current);
             current = next();
         }
@@ -158,7 +158,9 @@ public final class Lexer {
     }
 
     private static boolean isHexNumber(char current) {
-        return "abcdef".indexOf(Character.toLowerCase(current)) != -1;
+        return Character.isDigit(current)
+                || ('a' <= current && current <= 'f')
+                || ('A' <= current && current <= 'F');
     }
     
     private void tokenizeOperator() {
@@ -236,7 +238,28 @@ public final class Lexer {
                     case 'b': current = next(); buffer.append('\b'); continue;
                     case 'f': current = next(); buffer.append('\f'); continue;
                     case 'n': current = next(); buffer.append('\n'); continue;
+                    case 'r': current = next(); buffer.append('\r'); continue;
                     case 't': current = next(); buffer.append('\t'); continue;
+                    case 'u': // http://docs.oracle.com/javase/specs/jls/se8/html/jls-3.html#jls-3.3
+                        int rollbackPosition = pos;
+                        while (current == 'u') current = next();
+                        int escapedValue = 0;
+                        for (int i = 12; i >= 0 && escapedValue != -1; i -= 4) {
+                            if (isHexNumber(current)) {
+                                escapedValue |= (Character.digit(current, 16) << i);
+                            } else {
+                                escapedValue = -1;
+                            }
+                            current = next();
+                        }
+                        if (escapedValue >= 0) {
+                            buffer.append((char) escapedValue);
+                        } else {
+                            // rollback
+                            buffer.append("\\u");
+                            pos = rollbackPosition;
+                        }
+                        continue;
                 }
                 buffer.append('\\');
                 continue;