Fix #307. Invalid escape in string literals.

Author: dim-s

exts/jphp-zend-ext/src/main/tests/resources/ext/strings/ltrim_001.php

@@ -3,7 +3,7 @@
 --FILE--
 <?php
 $text = "\t\tThese are a few words :) ...  ";
-$binary = "\x09\Example string\x0A";
+$binary = "\x09Example string\x0A";
 $hello  = "Hello World";
 var_dump($text, $binary, $hello);
 

exts/jphp-zend-ext/src/main/tests/resources/ext/strings/rtrim_001.php

@@ -3,7 +3,7 @@
 --FILE--
 <?php
 $text = "\t\tThese are a few words :) ...  ";
-$binary = "\x09\Example string\x0A";
+$binary = "\x09Example string\x0A";
 $hello  = "Hello World";
 var_dump($text, $binary, $hello);
 

exts/jphp-zend-ext/src/main/tests/resources/ext/strings/trim_001.php

@@ -3,7 +3,7 @@
 --FILE--
 <?php
 $text   = "\t\tThese are a few words :) ...  ";
-$binary = "\x09\Example string\x0A";
+$binary = "\x09Example string\x0A";
 $hello  = "Hello World";
 var_dump($text, $binary, $hello);
 

jphp-core/src/org/develnext/jphp/core/tokenizer/Tokenizer.java

@@ -453,12 +453,14 @@ protected ValueExprToken readString(StringExprToken.Quote quote, int startPositi
                             break;
                         case 'x':
                             int t = i + 1;
+                            int cnt = 0;
                             for(int j = 1; j < 5; j++){
                                 t = i + j;
                                 if (t < codeLength){
                                     char digit = code.charAt(t);
                                     if (Character.isDigit(digit) || (digit >= 'A' && digit <= 'F') || (digit >= 'a' && digit <= 'f')){
-                                        // nop;
+                                        cnt++;
+                                        if (cnt == 3) break; // only \xhh
                                     } else {
                                         break;
                                     }
@@ -478,8 +480,12 @@ protected ValueExprToken readString(StringExprToken.Quote quote, int startPositi
                             break;
                         case '$':
                         case '"':
+                            slash = false;
+                            sb.append(ch); break;
+
                         default:
                             slash = false;
+                            sb.append("\\");
                             sb.append(ch); break;
                     }
                 } else {

jphp-core/tests/org/develnext/jphp/TokenizerTest.java

@@ -201,12 +201,21 @@ public void testMagicString() throws IOException {
 
         token = tokenizer.nextToken();
         assertTrue(token instanceof StringExprToken);
-        assertEquals(".{$foo}", ((StringExprToken) token).getValue());
+        assertEquals("\\.{$foo}", ((StringExprToken) token).getValue());
         assertEquals(1, ((StringExprToken) token).getSegments().size());
 
         StringExprToken.Segment segment = ((StringExprToken) token).getSegments().get(0);
-        assertEquals(1, segment.from);
-        assertEquals(7, segment.to);
+        assertEquals(2, segment.from);
+        assertEquals(8, segment.to);
+    }
+
+    @Test
+    public void testEscapeBug307() throws IOException {
+        Token token;
+        Tokenizer tokenizer = new Tokenizer(new Context("\"Ymd\\THis\\Z\""));
+        token = tokenizer.nextToken();
+        assertTrue(token instanceof StringExprToken);
+        assertEquals("Ymd\\THis\\Z", ((StringExprToken) token).getValue());
     }
 
     @Test

jphp-core/tests/resources/cast/array.php

@@ -21,18 +21,18 @@
     return 'fail_object';
 
 
-class Foo {
+class Xoo {
     protected $x = 20;
     private $y = 30;
     public $z = 40;
 }
-$foo = new Foo();
+$foo = new Xoo();
 $arr = (array)$foo;
 
 if ($arr["\x0*\x0x"] !== 20)
     return 'fail_object_protected';
 
-if ($arr["\x0\Foo\x0y"] !== 30)
+if ($arr["\x0Xoo\x0y"] !== 30)
     return 'fail_object_private';
 
 if ($arr['z'] !== 40)

jphp-core/tests/resources/ext/strings/ltrim_001.php

@@ -3,7 +3,7 @@
 --FILE--
 <?php
 $text = "\t\tThese are a few words :) ...  ";
-$binary = "\x09\Example string\x0A";
+$binary = "\x09Example string\x0A";
 $hello  = "Hello World";
 var_dump($text, $binary, $hello);
 

jphp-core/tests/resources/ext/strings/rtrim_001.php

@@ -3,7 +3,7 @@
 --FILE--
 <?php
 $text = "\t\tThese are a few words :) ...  ";
-$binary = "\x09\Example string\x0A";
+$binary = "\x09Example string\x0A";
 $hello  = "Hello World";
 var_dump($text, $binary, $hello);
 

jphp-core/tests/resources/ext/strings/trim_001.php

@@ -3,7 +3,7 @@
 --FILE--
 <?php
 $text   = "\t\tThese are a few words :) ...  ";
-$binary = "\x09\Example string\x0A";
+$binary = "\x09Example string\x0A";
 $hello  = "Hello World";
 var_dump($text, $binary, $hello);