basis: ERROR: changes.

[factor.git] / basis / json / reader / reader.factor

diff --git a/basis/json/reader/reader.factor b/basis/json/reader/reader.factor
index 742d8773f568f54452e83a7d136e672b31db649c..4fc83930bac87a2aa7172a466770c8f13daeeb8a 100644 (file)
--- a/basis/json/reader/reader.factor
+++ b/basis/json/reader/reader.factor
@@ -22,7 +22,7 @@ ERROR: not-a-json-number string ;
     ] dip ;
 
 : json-expect ( token stream -- )
-    [ dup length ] [ stream-read ] bi* = [ json-error ] unless ; inline
+    [ dup length ] [ stream-read ] bi* = [ throw-json-error ] unless ; inline
 
 DEFER: (read-json-string)
 
@@ -54,7 +54,7 @@ DEFER: (read-json-string)
         { CHAR: t [ CHAR: \t ] }
         { CHAR: u [ over read-json-escape-unicode ] }
         [ ]
-    } case [ suffix! (read-json-string) ] [ json-error ] if* ;
+    } case [ suffix! (read-json-string) ] [ throw-json-error ] if* ;
 
 : (read-json-string) ( stream accum -- accum )
     { sbuf } declare
@@ -72,7 +72,7 @@ DEFER: (read-json-string)
     [ length 1 - ] keep [ nth-unsafe ] [ shorten ] 2bi ; inline
 
 : check-length ( seq n -- seq )
-    [ dup length ] [ >= ] bi* [ json-error ] unless ; inline
+    [ dup length ] [ >= ] bi* [ throw-json-error ] unless ; inline
 
 : v-over-push ( accum -- accum )
     { vector } declare 2 check-length