Merge pull request #2 from Enkora/php74fixes

N-12043 php7.4 issues: coffeescript compiler is broken

Author: ArtemGoutsoul

composer.json

@@ -13,7 +13,7 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0"
+        "php": ">=7.0.0"
     },
     "autoload": {
         "psr-0": {

src/CoffeeScript/Lexer.php

@@ -292,7 +292,8 @@ static function t_canonical($token)
 
       return $token;
     }
-    else if (is_numeric($token))
+
+    if (is_numeric($token))
     {
       $token = substr(Parser::tokenName($token), 3);
     }
@@ -316,7 +317,7 @@ function __construct($code, $options)
       $code = "\n{$code}";
     }
 
-    $code = preg_replace(self::$TRAILING_SPACES, '', str_replace("\r", '', $code));
+    $code = rtrim(str_replace("\r", '', $code));
 
     $options = array_merge(array(
       'indent'  => 0,
@@ -357,7 +358,7 @@ function balanced_string($str, $end)
         continue;
       }
 
-      switch ($letter = $str{$i})
+      switch ($letter = $str[$i])
       {
       case '\\':
         ++$continue_count;
@@ -443,7 +444,7 @@ function heredoc_token()
     }
 
     $heredoc = $match[0];
-    $quote = $heredoc{0};
+    $quote = $heredoc[0];
     $doc = $this->sanitize_heredoc($match[2], array('quote' => $quote, 'indent' => NULL));
 
     if ($quote === '"' && strpos($doc, '#{') !== FALSE)
@@ -469,7 +470,7 @@ function heregex_token($match)
       $re = preg_replace(self::$HEREGEX_OMIT, '', $body);
       $re = preg_replace('/\//', '\\/', $re);
 
-      if (preg_match('/^\*/', $re))
+      if (strpos($re, "*") === 0)
       {
         $this->error('regular expressions cannot begin with `*`');
       }
@@ -651,9 +652,9 @@ function interpolate_string($str, array $options = array()) // #{0}
     $pi = 0;
     $i = -1;
 
-    while ( isset($str{++$i}) )
+    while ( isset($str[++$i]) )
     {
-      $letter = $str{$i};
+      $letter = $str[$i];
 
       if ($letter === '\\')
       {
@@ -731,8 +732,7 @@ function interpolate_string($str, array $options = array()) // #{0}
       $this->token('(', '(');
     }
 
-    for ($i = 0; $i < count($tokens); $i++)
-    {
+    foreach ($tokens as $i => $iValue) {
       list($tag, $value) = $tokens[$i];
 
       if ($i)
@@ -760,7 +760,7 @@ function interpolate_string($str, array $options = array()) // #{0}
 
   function js_token()
   {
-    if ( ! ($this->chunk{0} === '`' && preg_match(self::$JSTOKEN, $this->chunk, $match)))
+    if ( ! ($this->chunk[0] === '`' && preg_match(self::$JSTOKEN, $this->chunk, $match)))
     {
       return 0;
     }
@@ -841,7 +841,7 @@ function literal_token()
     }
     else
     {
-      $value = $this->chunk{0};
+      $value = $this->chunk[0];
     }
 
     $tag = t($value);
@@ -888,7 +888,7 @@ function literal_token()
     {
       $tag = t('SHIFT');
     }
-    else if (in_array($value, self::$LOGIC) || $value === '?' && (isset($prev['spaced']) && $prev['spaced']))
+    else if (in_array($value, self::$LOGIC) || ($value === '?' && (isset($prev['spaced']) && $prev['spaced'])))
     {
       $tag = t('LOGIC');
     }
@@ -979,7 +979,7 @@ function number_token()
     {
       $this->error("radix prefix '$number' must be lowercase");
     }
-    else if (preg_match('/E/', $number) && ! preg_match('/^0x/', $number))
+    else if (strpos($number, "E") !== false && strpos($number, "0x") !== 0)
     {
       $this->error("exponential notation '$number' must be indicated with a lowercase 'e'");
     }
@@ -1077,7 +1077,7 @@ function pair($tag)
 
   function regex_token()
   {
-    if ($this->chunk{0} !== '/')
+    if ($this->chunk[0] !== '/')
     {
       return 0;
     }
@@ -1094,7 +1094,7 @@ function regex_token()
 
     if ($prev)
     {
-      if (in_array($prev[0], t((isset($prev['spaced']) && $prev['spaced']) ? 
+      if (in_array($prev[0], t((isset($prev['spaced']) && $prev['spaced']) ?
         self::$NOT_REGEX : self::$NOT_SPACED_REGEX)))
       {
         return 0;
@@ -1168,7 +1168,7 @@ function sanitize_heredoc($doc, array $options)
 
   function string_token()
   {
-    switch ($this->chunk{0})
+    switch ($this->chunk[0])
     {
     case "'":
       if ( ! preg_match(self::$SIMPLESTR, $this->chunk, $match))
@@ -1222,12 +1222,14 @@ function tag($index = 0, $tag = NULL)
   {
     $token = & last($this->tokens, $index);
 
+    if (!$token) $token = [];
+
     if ( ! is_null($tag))
     {
       $token[0] = $tag;
     }
 
-    return $token[0];
+    return $token[0] ?? null;
   }
 
   function tag_parameters()
@@ -1286,7 +1288,7 @@ function tokenize()
   {
     while ( ($this->chunk = substr($this->code, $this->index)) != FALSE )
     {
-      $types = array('identifier', 'comment', 'whitespace', 'line', 'heredoc', 
+      $types = array('identifier', 'comment', 'whitespace', 'line', 'heredoc',
         'string', 'number', 'regex', 'js', 'literal');
 
       foreach ($types as $type)
@@ -1319,12 +1321,14 @@ function value($index = 0, $value = NULL)
   {
     $token = & last($this->tokens, $index);
 
+    if (!$token) $token = [];
+
     if ( ! is_null($value))
     {
       $token[1] = $value;
     }
 
-    return $token[1];
+    return $token[1] ?? null;
   }
 
   function unfinished()
@@ -1337,7 +1341,7 @@ function unfinished()
 
   function whitespace_token()
   {
-    if ( ! (preg_match(self::$WHITESPACE, $this->chunk, $match) || ($nline = ($this->chunk{0} === "\n"))))
+    if ( ! (preg_match(self::$WHITESPACE, $this->chunk, $match) || ($nline = ($this->chunk[0] === "\n"))))
     {
       return 0;
     }

src/CoffeeScript/Parser.php

@@ -3014,7 +3014,7 @@ function yy_r186(){ $this->_retvalue = yy('Op', $this->yystack[$this->yyidx + -1
 #line 3014 "/var/www/coffeescript-php/grammar.php"
 #line 294 "/var/www/coffeescript-php/grammar.y"
     function yy_r192(){
-  if ($this->yystack[$this->yyidx + -1]->minor{0} === '!') {
+  if ($this->yystack[$this->yyidx + -1]->minor[0] === '!') {
     $this->_retvalue = yy('Op', substr($this->yystack[$this->yyidx + -1]->minor, 1), $this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor);
     $this->_retvalue = $this->_retvalue->invert();
   }

src/CoffeeScript/Scope.php

@@ -98,7 +98,7 @@ function declared_variables()
     {
       if ($v['type'] === 'var')
       {
-        if ($v['name']{0} === '_')
+        if ($v['name'][0] === '_')
         {
           $temp_vars[] = $v['name'];
         }

tests/cases/strict.coffee

@@ -41,11 +41,11 @@ test "octal escape sequences prohibited", ->
   strict    '"_\\1_"'
   strict    '"\\\\\\1"'
   strictOk  '"\\0"'
-  eq "\x00", "\0"
+  eq "\x00", "\\0"
   strictOk  '"\\08"'
-  eq "\x008", "\08"
+  eq "\x008", "\\08"
   strictOk  '"\\0\\8"'
-  eq "\x008", "\0\8"
+  eq "\x008", "\\0\\8"
   strictOk  '"\\8"'
   eq "8", "\8"
   strictOk  '"\\\\1"'