CHANGELOG.md

@@ -1,8 +1,3 @@
-## v1.0.8
-
-- Parse number as floating-point if it doesn't fit in integer; trying hard to
-  use integer when possible though to not lose precision
-
 ## v1.0.7
 
-- Removing slashes which escape quotes inside strings
+- Removing slashes which escape quotes inside strings

jzon.inc.php

@@ -6,44 +6,29 @@ if(!defined('JZON_VERSION'))
   define('JZON_EXT_VERSION', phpversion('jzon'));
 }
 
-function jzon_show_position(int $p, string $in, int $context_lines = 5) : string
+function jzon_show_position($p, $in, $context_chars)
 {
-  $out = array();
-  $lines = explode("\n", $in);
-  foreach($lines as $line_idx => $line)
-  {
-    //normalizing tabs by converting them to spaces
-    $out[] = str_replace("\t", "    ", $line);
-    $left = $p - (strlen($line) + 1/*taking into account \n*/);
-    if($left <= 0)
-    {
-      $arrow = '';
-      //let's take into account tabs
-      for($i=0;$i<$p;++$i)
-        $arrow .= ($line[$i] === "\t" ? '----' : '-');
-      $arrow .= '^';
+  $pre = str_replace("\n", '', jzon_get_past_input($p, $in, $context_chars));
+  $c = str_repeat('-', max(0, strlen($pre) - 1));
 
-      $out[] = $arrow;
-      break;
-    }
-    $p = $left;
-  }
-  if(count($out) > $context_lines)
-    $out = array_slice($out, -$context_lines);
+  return $pre . str_replace("\n", '', jzon_get_upcoming_input($p, $in, $context_chars)) . "\n" . $c . "^";
+}
 
-  //let's add line numbers
-  end($out);
-  //let's find out the maximum leading zeros for line numbers
-  $fmt_num = (int)round(log10(key($out)))+1;
-  foreach($out as $idx => $line)
-    $out[$idx] = sprintf('%0'.$fmt_num.'d', ($idx+1)) . ' ' . $line;
+function jzon_get_past_input($c, $in, $context_chars)
+{
+  $past = substr($in, 0, $c+1);
+  return (strlen($past) > $context_chars ? '...' : '') . substr($past, -$context_chars);
+}
 
-  return implode("\n", $out);
+function jzon_get_upcoming_input($c, $in, $context_chars)
+{
+  $next = substr($in, $c+1);
+  return substr($next, 0, $context_chars) . (strlen($next) > $context_chars ? '...' : '');
 }
 
 class jzonParser
 {
-  const ERR_CONTEXT_LINES = 5;
+  const ERR_CONTEXT_CHARS = 200;
 
   private $in;
   private $len;
@@ -101,9 +86,9 @@ class jzonParser
   private function _error($error)
   {
     if($this->c < $this->len)
-      throw new Exception("Parse error: $error\n" . jzon_show_position($this->c, $this->in, self::ERR_CONTEXT_LINES));
+      throw new Exception("Parse error: $error\n" . jzon_show_position($this->c, $this->in, self::ERR_CONTEXT_CHARS));
     else
-      throw new Exception("Parse error: $error\n" . jzon_show_position($this->len-1, $this->in, self::ERR_CONTEXT_LINES));
+      throw new Exception("Parse error: $error\n" . jzon_show_position($this->len-1, $this->in, self::ERR_CONTEXT_CHARS));
   }
 
   private function skip_whitespace()
@@ -352,13 +337,13 @@ class jzonParser
     else
       $this->_error("'null' expected");
   }
+
 }
 
-function jzon_parse($str, ?int &$parser = null) : array
+function jzon_parse($str)
 {
   //NOTE: using super fast built-in implementation and making a gracefull fallback to a slower and
   //      more relaxed implementation
-  $parser = 1;
   $res = json_decode($str, true);
   if(is_array($res))
     return $res;
@@ -366,15 +351,13 @@ function jzon_parse($str, ?int &$parser = null) : array
   //NOTE: only allowing extension implementation if versions match
   if(defined('JZON_EXT_VERSION') && JZON_EXT_VERSION === JZON_VERSION)
   {
-    $parser = 2;
     list($ok, $err, $err_pos, $res) = jzon_parse_c($str);
     if(!$ok)
-      throw new Exception($err . "\n" . jzon_show_position($err_pos, $str, jzonParser::ERR_CONTEXT_LINES));
+      throw new Exception($err . "\n" . jzon_show_position($err_pos, $str, jzonParser::ERR_CONTEXT_CHARS));
     return $res;
   }
   else
   {
-    $parser = 3;
     $p = new jzonParser($str);
     $res = $p->parse();
     return $res;