Update JSON parsing code to support Read inputs

Changelog: changed

src/idoc/ir.inko

@@ -6,25 +6,16 @@ import std.clone (Clone)
 import std.cmp (Compare, Ordering)
 import std.fs.file (ReadOnlyFile)
 import std.fs.path (Path)
+import std.io (Read)
 import std.json (Error, ErrorKind, PullParser)
 import std.range (InclusiveRange)
 import std.sync (Channel)
 
 let META = '$meta.json'
 
-fn read_file(path: Path) -> Result[ByteArray, Error] {
-  let bytes = ByteArray.new
-
-  try ReadOnlyFile.new(path).then(fn (f) { f.read_all(bytes) }).map_error(
-    fn (e) { Error(kind: ErrorKind.Read(e), offset: 0) },
-  )
-
-  Result.Ok(bytes)
-}
-
 # Parses a stream of bytes into an `InclusiveRange`.
-fn parse_range(
-  parser: mut PullParser,
+fn parse_range[T: mut + Read](
+  parser: mut PullParser[T],
   range: mut InclusiveRange,
 ) -> Result[Nil, Error] {
   try parser.object(fn (o) {
@@ -70,8 +61,8 @@ class Location {
     Location(InclusiveRange.new(1, 1), InclusiveRange.new(1, 1))
   }
 
-  fn static parse(
-    parser: mut PullParser,
+  fn static parse[T: mut + Read](
+    parser: mut PullParser[T],
     location: mut Location,
   ) -> Result[Nil, Error] {
     try parser.object(fn (o) {
@@ -164,8 +155,11 @@ class Module {
       traits: [],
     )
 
-    let bytes = try read_file(path)
-    let parser = PullParser.new(bytes)
+    let file = try ReadOnlyFile.new(path).map_error(fn (e) {
+      Error(kind: ErrorKind.Read(e), offset: 0)
+    })
+
+    let parser = PullParser.new(file)
 
     try parser.object(fn (o) {
       o.string('name', fn (v) { mod.name = v })
@@ -225,8 +219,10 @@ class Metadata {
 
   fn static parse(directory: ref Path) -> Result[Metadata, Error] {
     let path = directory.join(META)
-    let bytes = try read_file(path)
-    let parser = PullParser.new(bytes)
+    let file = try ReadOnlyFile.new(path).map_error(fn (e) {
+      Error(kind: ErrorKind.Read(e), offset: 0)
+    })
+    let parser = PullParser.new(file)
     let meta = Metadata(readme: Markdown.new)
 
     try parser.object(fn (o) {
@@ -256,7 +252,9 @@ class Constant {
   # The documentation of the symbol.
   let @documentation: Markdown
 
-  fn static parse(parser: mut PullParser) -> Result[Constant, Error] {
+  fn static parse[T: mut + Read](
+    parser: mut PullParser[T],
+  ) -> Result[Constant, Error] {
     let val = Constant(
       name: '',
       location: Location.default,
@@ -332,7 +330,9 @@ class Field {
   # The documentation of the symbol.
   let @documentation: Markdown
 
-  fn static parse(parser: mut PullParser) -> Result[Field, Error] {
+  fn static parse[T: mut + Read](
+    parser: mut PullParser[T],
+  ) -> Result[Field, Error] {
     let val = Field(
       name: '',
       location: Location.default,
@@ -381,7 +381,9 @@ class Constructor {
   # The documentation of the symbol.
   let @documentation: Markdown
 
-  fn static parse(parser: mut PullParser) -> Result[Constructor, Error] {
+  fn static parse[T: mut + Read](
+    parser: mut PullParser[T],
+  ) -> Result[Constructor, Error] {
     let val = Constructor(
       name: '',
       location: Location.default,
@@ -436,7 +438,9 @@ class Method {
   # The documentation of the symbol.
   let @documentation: Markdown
 
-  fn static parse(parser: mut PullParser) -> Result[Method, Error] {
+  fn static parse[T: mut + Read](
+    parser: mut PullParser[T],
+  ) -> Result[Method, Error] {
     let val = Method(
       name: '',
       file: ''.to_path,
@@ -578,7 +582,9 @@ class Implementation {
   # A boolean indicating if the implemented trait is public or not.
   let @public: Bool
 
-  fn static parse(parser: mut PullParser) -> Result[Implementation, Error] {
+  fn static parse[T: mut + Read](
+    parser: mut PullParser[T],
+  ) -> Result[Implementation, Error] {
     let imp = Implementation(module: '', name: '', type: '', public: false)
 
     try parser.object(fn (o) {
@@ -642,7 +648,9 @@ class Class {
   # The traits implemented by this class.
   let @implemented_traits: Array[Implementation]
 
-  fn static parse(parser: mut PullParser) -> Result[Class, Error] {
+  fn static parse[T: mut + Read](
+    parser: mut PullParser[T],
+  ) -> Result[Class, Error] {
     let val = Class(
       name: '',
       location: Location.default,
@@ -762,7 +770,9 @@ class Trait {
   # The implementations of this trait.
   let @implementations: Array[Implementation]
 
-  fn static parse(parser: mut PullParser) -> Result[Trait, Error] {
+  fn static parse[T: mut + Read](
+    parser: mut PullParser[T],
+  ) -> Result[Trait, Error] {
     let val = Trait(
       name: '',
       location: Location.default,

src/idoc/markdown.inko

@@ -2,6 +2,7 @@ import builder.html
 import idoc.html (adjust_headings)
 import markdown
 import std.clone (Clone)
+import std.io (Read)
 import std.json
 import wobsite.markdown (SyntaxHighlight)
 
@@ -13,7 +14,9 @@ class Markdown {
     Markdown(markdown.Document.new)
   }
 
-  fn static parse(parser: mut json.PullParser) -> Result[Markdown, json.Error] {
+  fn static parse[T: mut + Read](
+    parser: mut json.PullParser[T],
+  ) -> Result[Markdown, json.Error] {
     let start = try parser.start_of_next_value
 
     parser.string.then(fn (md) {

test/idoc/test_ir.inko

@@ -2,6 +2,7 @@ import idoc.ir
 import idoc.markdown (Markdown)
 import markdown
 import std.cmp (Ordering)
+import std.io (Buffer)
 import std.json (PullParser)
 import std.range (InclusiveRange)
 import std.sync (Channel)
@@ -11,6 +12,10 @@ fn two_paragraphs -> Markdown {
   Markdown(markdown.Document.parse('first\n\nsecond').get)
 }
 
+fn pull(input: String) -> PullParser[Buffer[String]] {
+  PullParser.new(Buffer.new(input))
+}
+
 fn empty_class(kind: ir.ClassKind) -> ir.Class {
   ir.Class(
     name: 'A',
@@ -29,7 +34,7 @@ fn empty_class(kind: ir.ClassKind) -> ir.Class {
 
 fn pub tests(t: mut Tests) {
   t.test('parse_range', fn (t) {
-    let parser = PullParser.new('{"start":2,"end":3}')
+    let parser = pull('{"start":2,"end":3}')
     let range = InclusiveRange.new(2, 3)
     let res = ir.parse_range(parser, range)
 
@@ -46,7 +51,7 @@ fn pub tests(t: mut Tests) {
   })
 
   t.ok('Location.parse', fn (t) {
-    let parser = PullParser.new(
+    let parser = pull(
       '{ "lines": { "start": 1, "end": 2 }, "columns": { "start": 3, "end": 4 } }',
     )
 
@@ -233,7 +238,7 @@ fn pub tests(t: mut Tests) {
   })
 
   t.ok('Constant.parse', fn (t) {
-    let parser = PullParser.new(
+    let parser = pull(
       '
       {
         "name": "A",
@@ -359,7 +364,7 @@ fn pub tests(t: mut Tests) {
   })
 
   t.ok('Field.parse', fn (t) {
-    let parser = PullParser.new(
+    let parser = pull(
       '
       {
         "name": "foo",
@@ -406,7 +411,7 @@ fn pub tests(t: mut Tests) {
   })
 
   t.ok('Constructor.parse', fn (t) {
-    let parser = PullParser.new(
+    let parser = pull(
       '
       {
         "name": "A",
@@ -450,7 +455,7 @@ fn pub tests(t: mut Tests) {
   })
 
   t.ok('Method.parse', fn (t) {
-    let parser = PullParser.new(
+    let parser = pull(
       '
       {
         "name": "foo",
@@ -636,7 +641,7 @@ fn pub tests(t: mut Tests) {
   })
 
   t.ok('Implementation.parse', fn (t) {
-    let parser = PullParser.new(
+    let parser = pull(
       '
       {
         "module": "std.foo",
@@ -683,7 +688,7 @@ fn pub tests(t: mut Tests) {
   })
 
   t.ok('Class.parse', fn (t) {
-    let parser = PullParser.new(
+    let parser = pull(
       '
       {
         "name": "A",
@@ -949,7 +954,7 @@ fn pub tests(t: mut Tests) {
   })
 
   t.ok('Trait.parse', fn (t) {
-    let parser = PullParser.new(
+    let parser = pull(
       '
       {
         "name": "A",

test/idoc/test_markdown.inko

@@ -1,15 +1,20 @@
 import idoc.markdown (Markdown)
 import markdown
+import std.io (Buffer)
 import std.json (Json, PullParser)
 import std.test (Tests)
 
+fn pull(input: String) -> PullParser[Buffer[String]] {
+  PullParser.new(Buffer.new(input))
+}
+
 fn parse(string: String) -> Markdown {
-  Markdown.parse(PullParser.new(Json.String(string).to_string)).get
+  Markdown.parse(pull(Json.String(string).to_string)).get
 }
 
 fn pub tests(t: mut Tests) {
   t.ok('Markdown.parse', fn (t) {
-    let parser = PullParser.new('"hello **world**"')
+    let parser = pull('"hello **world**"')
     let md = try Markdown.parse(parser)
 
     t.equal(