Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ziglang/zig
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 33fa87a9d8ff
Choose a base ref
...
head repository: ziglang/zig
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ef3111be236f
Choose a head ref
  • 3 commits
  • 4 files changed
  • 1 contributor

Commits on May 4, 2018

  1. Add json decoder

     - streaming json decoder
     - dynamic tree/value decoder
    tiehuis committed May 4, 2018
    Copy the full SHA
    0afc6a9 View commit details
  2. Copy the full SHA
    f174726 View commit details
  3. Copy the full SHA
    ef3111b View commit details
Showing with 3,249 additions and 0 deletions.
  1. +1 −0 CMakeLists.txt
  2. +2 −0 std/index.zig
  3. +1,304 −0 std/json.zig
  4. +1,942 −0 std/json_test.zig
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -454,6 +454,7 @@ set(ZIG_STD_FILES
"heap.zig"
"index.zig"
"io.zig"
"json.zig"
"linked_list.zig"
"macho.zig"
"math/acos.zig"
2 changes: 2 additions & 0 deletions std/index.zig
Original file line number Diff line number Diff line change
@@ -23,6 +23,7 @@ pub const fmt = @import("fmt/index.zig");
pub const hash = @import("hash/index.zig");
pub const heap = @import("heap.zig");
pub const io = @import("io.zig");
pub const json = @import("json.zig");
pub const macho = @import("macho.zig");
pub const math = @import("math/index.zig");
pub const mem = @import("mem.zig");
@@ -56,6 +57,7 @@ test "std" {
_ = @import("fmt/index.zig");
_ = @import("hash/index.zig");
_ = @import("io.zig");
_ = @import("json.zig");
_ = @import("macho.zig");
_ = @import("math/index.zig");
_ = @import("mem.zig");
1,304 changes: 1,304 additions & 0 deletions std/json.zig

Large diffs are not rendered by default.

1,942 changes: 1,942 additions & 0 deletions std/json_test.zig

Large diffs are not rendered by default.