Skip to content

Json reader improvements #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Abtin-Molavi wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Json reader improvements #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
bffe13b
added counter
Abtin-Molavi Oct 21, 2020
cb537fb
Merge branch 'master' of git://github.com/factor/factor into json-rea…
Abtin-Molavi Oct 21, 2020
38ad20f
removed old first-json-object word
Abtin-Molavi Oct 21, 2020
cf7f4f3
added tests
Abtin-Molavi Oct 22, 2020
6bc2c02
cleaning up namespace
Abtin-Molavi Oct 23, 2020
ebb29be
spacing
Abtin-Molavi Oct 23, 2020
fa6fed1
minor comment revision
Abtin-Molavi Oct 23, 2020
79357c0
one more formatting change
Abtin-Molavi Oct 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion basis/json/reader/reader-tests.factor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,4 +84,11 @@ ${ { 0xabcd } >string } [ " \"\\uaBCd\" " json> ] unit-test
[ "<!doctype html>\n<html>\n<head>\n " json> ]
[ not-a-json-number? ] must-fail-with

{ H{ } } [ "" json> ] unit-test
! unclosed objects and mismatched brackets are not allowed
[ "[\"a\",
4
,1," json> ] must-fail

[ "[]]]" json> ] must-fail

[ "{[: \"x\"}" json> ] must-fail
18 changes: 10 additions & 8 deletions basis/json/reader/reader.factor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ IN: json.reader

ERROR: not-a-json-number string ;

SYMBOL: counter

: json-number ( char stream -- num char )
[ 1string ] [ "\s\t\r\n,:}]" swap stream-read-until ] bi*
[
Expand Down Expand Up @@ -109,9 +111,9 @@ DEFER: (read-json-string)
{ object vector object } declare
{
{ CHAR: \" [ over read-json-string suffix! ] }
{ CHAR: [ [ json-open-array ] }
{ CHAR: [ [ 1 counter +@ json-open-array ] }
{ CHAR: , [ v-over-push ] }
{ CHAR: ] [ json-close-array ] }
{ CHAR: ] [ -1 counter +@ json-close-array ] }
{ CHAR: { [ json-open-hash ] }
{ CHAR: : [ v-pick-push ] }
{ CHAR: } [ json-close-hash ] }
Expand All @@ -128,10 +130,10 @@ DEFER: (read-json-string)
: json-read-input ( stream -- objects )
V{ } clone over '[ _ stream-read1 ] [ scan ] while* nip ;

! If there are no json objects, return an empty hashtable
! This happens for empty files.
: first-json-object ( objects -- obj )
[ H{ } clone ] [ first ] if-empty ;

! A properly formed JSON input should contain exactly one object with balanced brackets.
: get-json-object ( objects -- obj )
dup length 1 = counter get 0 = and [ first ] [ json-error ] if ;

PRIVATE>

Expand All @@ -141,7 +143,7 @@ PRIVATE>
GENERIC: json> ( string -- object )

M: string json>
[ read-json-objects first-json-object ] with-string-reader ;
[ 0 counter [ read-json-objects get-json-object ] with-variable ] with-string-reader ;

: path>json ( path -- json )
utf8 [ read-json-objects first-json-object ] with-file-reader ;
utf8 [ 0 counter [ read-json-objects get-json-object ] with-variable ] with-file-reader ;