laumann/ani - Change ZKAOPMCHBGP7J7NQB233AQJQDX6TBD7REPLF3KN3EIKZK6TZZMBQC

change: Implement decoding of edits, atoms, positions, among others

Created by laumann on October 31, 2022

ZKAOPMCHBGP7J7NQB233AQJQDX6TBD7REPLF3KN3EIKZK6TZZMBQC

Dependencies

In channels

main

Change contents

Replacement in vertex.h at line 7 [3.33]
B:BD[3.124] → [3.124:158]
```
typedef uint64_t change_position;
```
[3.124]
[3.158]
```
typedef uint64_t changepos;
```
Insertion in vertex.h at line 21 [3.33]
[2.17]
[2.17]
```
	Hash change;
	changepos pos;
```

Insertion in vertex.h at line 24 [3.33]

[2.29]

[3.416]


typedef struct {
	size_t len;
	Position first; /* Reserve space for the first Position, most changes appear to have just one */
	Position *entries;
} Positionlist;

Replacement in vertex.h at line 36 [3.33]

∅:D[2.47] → [3.555:621]

B:BD[3.555] → [3.555:621]

	void *change;
	change_position start, end; /* line identifier */

[2.47]

[2.48]

	Hash change;
	changepos start, end; /* line identifier */

Insertion in hunk.h at line 6 [3.664]

[2.109]

	unsigned int line; /* This is defined as usize, but it's probably better as a u64 */

Replacement in hunk.h at line 30 [3.664]
∅:D[2.210] → [3.1015:1031]
B:BD[3.1015] → [3.1015:1031]
```
	uint64_t atom;
```
[2.210]
[2.211]
```
	Atom change;
	Local local;
	str encoding;
```
Replacement in hunk.h at line 47 [3.664]
∅:D[2.371] → [3.1263:1272]
B:BD[3.1263] → [3.1263:1272]
```
	} hunk;
```
[2.371]
[2.372]
```
	};
```

Insertion in hunk.h at line 50 [3.664]

[3.1276]

[2.385]

typedef struct {
	size_t len;
	Basehunk *entries;
} Hunklist;

Insertion in hunk.h at line 56 [3.664]
[2.435]
[3.1332]
```
void hunk_hunklistinit(Hunklist *, size_t);
```

Insertion in hunk.c at line 5 [3.1372]

[2.457]

[3.1413]

#include "scaffold.h"
#include "hash.h"
#include "vertex.h"
#include "atom.h"

Insertion in hunk.c at line 44 [3.1372]

[3.2149]

}
void
hunk_hunklistinit(Hunklist *hunklist, size_t len)
{
	hunklist->len = len;
	hunklist->entries = xmalloc(sizeof(Basehunk) * len);

Insertion in hash.h at line 19 [4.31]
[4.288]
[2.580]
```
void hashprintln(Hash *);
```

Insertion in hash.c at line 11 [4.360]

[4.445]

[2.626]

hashprintln(Hash *hash)
{
	hashprint(hash);
	printf("\n");
}
void

Replacement in hash.c at line 29 [4.360]
∅:D[2.692] → [5.132:159]
B:BD[5.132] → [5.132:159]
```
		printf("%s\n", b32hash);
```
[2.692]
[4.666]
```
		printf("%s", b32hash);
```
Insertion in change.h at line 73 [6.80]
[2.2374]
[2.2374]
```
	uint8_t *metadata;
	Hunklist hunks;
```

Insertion in change.c at line 15 [6.1047]

[4.836]

[6.1192]

#include "vertex.h"
#include "atom.h"
#include "hunk.h"

Deletion in change.c at line 21 [6.1047]
B:BD[3.2152] → [3.2152:2208]
```
#include "atom.h"
#include "vertex.h"
#include "hunk.h"
```
Replacement in change.c at line 22 [6.1047]
B:BD[7.1] → [7.1:6]
```
void
```
[7.1]
[7.6]
```
static void
```
Replacement in change.c at line 155 [6.1047]
B:BD[8.1] → [8.1:6]
```
void
```
[8.1]
[2.2510]
```
static void
```

Replacement in change.c at line 169 [6.1047]

B:BD[8.371] → [8.371:514]

			memcpy(target->entries[i].bytes, binstat->buf,
			       BLAKE3_BYTES);
			binstat->buf += BLAKE3_BYTES;
			binstat->avail -= BLAKE3_BYTES;

[8.371]

[8.514]

			bincode_getbytes(
				binstat, target->entries[i].bytes, BLAKE3_BYTES
			);

Replacement in change.c at line 182 [6.1047]
B:BD[3.2252] → [3.2252:2257]
B:BD[3.2257] → [2.2619:2660]
```
void
change_decode_position(Bincode *binstat)
```
[3.2252]
[3.2311]
```
static void
change_decode_position(Bincode *binstat, Position *pos)
```
Deletion in change.c at line 185 [6.1047]
B:BD[3.2313] → [2.2661:2722]
∅:D[2.2722] → [3.2380:2381]
B:BD[3.2380] → [3.2380:2381]
```
	uint64_t changepos; /* FIXME this should be its own type */
```

Replacement in change.c at line 186 [6.1047]

B:BD[3.2412] → [2.2723:2736]

∅:D[2.2736] → [3.2432:2509]

B:BD[3.2432] → [3.2432:2509]

		Hash hash;
		hash.variant = (uint8_t)bincode_getu32(binstat);
		switch (hash.variant) {

[3.2412]

[3.2509]

		pos->change.variant = (uint8_t)bincode_getu32(binstat);
		switch (pos->change.variant) {
		case HASH_BLAKE3:
			bincode_getbytes(
				binstat, (uint8_t *)&pos->change.bytes,
				BLAKE3_BYTES
			);
			break;

Insertion in change.c at line 196 [6.1047]

[3.2537]

		default:
			abort();
		}
	}
	pos->pos = bincode_getu64(binstat);
}
static void
change_decode_vertex(Bincode *binstat, Vertex *v)
{
	Hash *hash;
	hash = &v->change;
	uint8_t ishash = bincode_getu8(binstat);
	if (ishash) {
		hash->variant = (uint8_t)bincode_getu32(binstat);
		switch (hash->variant) {

Replacement in change.c at line 216 [6.1047]

B:BD[3.2578] → [3.2578:2627]

				binstat, (uint8_t *)hash.bytes, BLAKE3_BYTES

[3.2578]

[3.2627]

				binstat, (uint8_t *)hash->bytes, BLAKE3_BYTES

Insertion in change.c at line 219 [6.1047]
[3.2643]
[3.2643]
```
		case HASH_NONE:
			break;
```

Replacement in change.c at line 224 [6.1047]

B:BD[3.2670] → [2.2737:2757]

		hashprint(&hash);

[3.2670]

[3.2691]

	}
	v->start = bincode_getu64(binstat);
	v->end = bincode_getu64(binstat);
	if (ishash) {
		printf("V(Some(");
		hashprint(hash);
		printf(")[%lu:%lu])\n", v->start, v->end);
	} else {
		printf("V(None)\n");

Deletion in change.c at line 234 [6.1047]

B:BD[3.2694] → [2.2758:2841]

	changepos = bincode_getu64(binstat);
	printf("ChangePosition(%lu)\n", changepos);

Replacement in change.c at line 236 [6.1047]
B:BD[3.2792] → [3.2792:2797]
B:BD[3.2797] → [2.2842:2882]
```
void
change_decode_newedge(Bincode *binstat)
```
[3.2792]
[3.2850]
```
static void
change_decode_introducedby(Bincode *binstat, Hash *hash)
```
Replacement in change.c at line 239 [6.1047]
B:BD[3.2852] → [3.2852:2877]
```
	uint8_t previous, flag;
```
[3.2852]
[3.2877]
```
	uint8_t ishash;
```

Replacement in change.c at line 241 [6.1047]

B:BD[3.2878] → [3.2878:3053]

	dump_buf("newedge", binstat->buf, binstat->avail);
	previous = bincode_getu8(binstat);
	flag = bincode_getu8(binstat);
	printf("previous = %u, flag = %u\n", previous, flag);

[3.2878]

[3.3053]

	ishash = bincode_getu8(binstat);
	if (ishash) {
		hash->variant = (uint8_t)bincode_getu32(binstat);
		switch (hash->variant) {
		case HASH_BLAKE3:
			bincode_getbytes(
				binstat, (uint8_t *)hash->bytes, BLAKE3_BYTES
			);
			break;
		case HASH_NONE:
			break;
		default:
			abort();
		}
		printf("introduced_by: ");
		if (ishash) {
			printf("Some(");
			hashprint(hash);
			printf(")\n");
		} else {
			printf("None\n");
		}
	}
}
static void
change_decode_newedge(Bincode *binstat, Edge *edge)
{
	edge->previous = bincode_getu8(binstat);
	edge->flag = bincode_getu8(binstat);
	printf("previous = %u, flag = %u\n", edge->previous, edge->flag);

Replacement in change.c at line 272 [6.1047]

B:BD[3.3113] → [3.3113:3192]

	/* from: Position<Change = Option<Hash>> */
	change_decode_position(binstat);

[3.3113]

[3.3192]


	change_decode_position(binstat, &edge->from);
	change_decode_vertex(binstat, &edge->to);
	change_decode_introducedby(binstat, &edge->introducedby);
}
static void
change_decode_positionlist(Bincode *binstat, Positionlist *poslist)
{
	size_t len;
	int i;

Replacement in change.c at line 286 [6.1047]

B:BD[3.3193] → [3.3193:3261]

	/* to: V(Some(HASH)[range?]) */
	/* introduced_by: Option<Hash> */

[3.3193]

[3.3261]

	poslist->len = len = bincode_getu64(binstat);
	if (len > 1)
		poslist->entries = xmalloc(sizeof(Position) * (len - 1));
	if (len > 0) {
		change_decode_position(binstat, &poslist->first);
		for (i = 0; i < len - 1; i++)
			change_decode_position(binstat, &poslist->entries[i]);
	}

Replacement in change.c at line 296 [6.1047]
B:BD[3.3264] → [3.3264:3269]
B:BD[3.3269] → [2.2883:2920]
```
void
change_decode_atom(Bincode *binstat)
```
[3.3264]
[3.3319]
```
static void
change_decode_newvertex(Bincode *binstat, Newvertex *newvertex)
```

Replacement in change.c at line 299 [6.1047]

B:BD[3.3321] → [3.3321:3342]

	uint64_t edges_len;

[3.3321]

[3.3342]

	/* Fields: upcontext: Vec<Position>, downcontext: Vec<Position>, flag, start, end: ChangePosition, inode: Position */
	printf("Decoding Newvertex\n");
	change_decode_positionlist(binstat, &newvertex->upcontext);
	change_decode_positionlist(binstat, &newvertex->downcontext);
	newvertex->flag = bincode_getu8(binstat);
	newvertex->start = bincode_getu64(binstat);
	newvertex->end = bincode_getu64(binstat);
	change_decode_position(binstat, &newvertex->inode);
}
static void
change_decode_atom(Bincode *binstat, Atom *atom)
{

Replacement in change.c at line 318 [6.1047]

B:BD[3.3387] → [3.3387:3439]

	case 0: /* NewVertex<Option<Hash>> */
		/* TODO */

[3.3387]

[3.3439]

	case 0:
		atom->atomtype = NEW_VERTEX;
		change_decode_newvertex(binstat, &atom->newvertex);

Replacement in change.c at line 324 [6.1047]

B:BD[3.3481] → [3.3481:3674]

		edges_len = bincode_getu64(binstat);
		printf("EdgeMap (%lu elements)\n", edges_len);
		for (i = 0; i < edges_len; i++) {
			change_decode_newedge(binstat);
			break; /* FIXME remove this */

[3.3481]

[3.3674]

		atom->atomtype = EDGE_MAP;
		atom->edgemap.edges.len = bincode_getu64(binstat);
		atom->edgemap.edges.entries =
			xmalloc(sizeof(Edge) * atom->edgemap.edges.len);
		printf("EdgeMap (%lu elements)\n", atom->edgemap.edges.len);
		for (i = 0; i < atom->edgemap.edges.len; i++) {
			change_decode_newedge(
				binstat, &atom->edgemap.edges.entries[i]
			);

Insertion in change.c at line 334 [6.1047]

[3.3678]

		/* inode */
		change_decode_position(binstat, &atom->edgemap.inode);

Deletion in change.c at line 337 [6.1047]
B:BD[3.3679] → [3.3679:3721]
```
		/* A Position<Change = Option<Hash>> */
```

Insertion in change.c at line 340 [6.1047]

[3.3751]

	}
}
static void
change_decode_local(Bincode *binstat, Local *local)
{
	uint64_t len;
	len = bincode_getu64(binstat);
	local->path = bincode_getstr(binstat, len);
	local->line = bincode_getu64(binstat);
}
static void
change_decode_encoding(Bincode *binstat, char **encoding)
{
	/* This is an optional field - basically just an Option<String> */
	if (bincode_getu8(binstat)) {
		uint64_t len = bincode_getu64(binstat);
		*encoding = bincode_getstr(binstat, len);

Replacement in change.c at line 366 [6.1047]
B:BD[3.3797] → [3.3797:3802]
B:BD[3.3802] → [2.2921:2959]
```
void
change_decode_hunks(Bincode *binstat)
```
[3.3797]
[3.3853]
```
static void
change_decode_hunks(Bincode *binstat, Hashed *hashed)
```
Insertion in change.c at line 373 [6.1047]
[3.3911]
[3.3911]
```
	hunk_hunklistinit(&hashed->hunks, len);
```

Replacement in change.c at line 376 [6.1047]

B:BD[3.3940] → [2.2960:3012]

∅:D[2.3012] → [3.3998:4062]

B:BD[3.3998] → [3.3998:4062]

		basehunktype hunk_type = bincode_getu32(binstat);
		printf("%d. %s\n", i + 1, hunk_basehunk_type_str(hunk_type));

[3.3940]

[3.4062]

		Basehunk *bhunk = &hashed->hunks.entries[i];
		bhunk->hunktype = bincode_getu32(binstat);
		/* printf("%d. %s\n", i + 1, hunk_basehunk_type_str(bhunk->hunktype)); */

Replacement in change.c at line 380 [6.1047]
B:BD[3.4063] → [3.4063:4086]
```
		switch (hunk_type) {
```
[3.4063]
[3.4086]
```
		switch (bhunk->hunktype) {
```

Replacement in change.c at line 382 [6.1047]

B:BD[3.4099] → [3.4099:4304]

			printf("Edit. change: Atom, local: Local, encoding: Option<Encoding>\n"
			);
			change_decode_atom(binstat); /* the change field */
			/* change_decode_local */
			/* change_decode_encoding (maybe) */

[3.4099]

[3.4304]

			/* An edit is a (1) Atom (2) Local (3) Option<Encoding> */
			change_decode_atom(
				binstat, &bhunk->edit.change
			); /* the change field */
			change_decode_local(binstat, &bhunk->edit.local);
			change_decode_encoding(binstat, &bhunk->edit.encoding);
			printf("%d. Edit in %s:%d\n", i + 1,
			       bhunk->edit.local.path, bhunk->edit.local.line);

Replacement in change.c at line 398 [6.1047]

B:BD[3.4491] → [3.4491:4531]

				hunk_basehunk_type_str(hunk_type));

[3.4491]

[8.604]

				hunk_basehunk_type_str(bhunk->hunktype));

Deletion in change.c at line 401 [6.1047]

B:BD[8.620] → [3.4532:4599]

		break; /* FIXME: Remove once full Hunk parsing is implemented */

Replacement in change.c at line 407 [6.1047]
B:BD[7.1079] → [7.1079:1083]
```
int
```
[7.1079]
[9.985]
```
static int
```
Deletion in change.c at line 449 [6.1047]
B:BD[10.81] → [11.48:92]
```
	/* dump_buf("hashed", buf, hashed_len); */
```

Replacement in change.c at line 501 [6.1047]

B:BD[12.76] → [3.4600:4675]

∅:D[3.4675] → [12.128:179]

B:BD[12.128] → [12.128:179]

		uint8_t *bytes = xmalloc(len);
		bincode_getbytes(&binstat, bytes, len);
		dump_buf("metadata", bytes, len);
		free(bytes);

[12.76]

[12.179]

		hashed->metadata = xmalloc(len);
		bincode_getbytes(&binstat, hashed->metadata, len);

Deletion in change.c at line 505 [6.1047]
B:BD[12.183] → [11.848:894]
```
	dump_buf("buf", binstat.buf, binstat.avail);
```
Replacement in change.c at line 506 [6.1047]
B:BD[12.278] → [3.4676:4708]
```
	change_decode_hunks(&binstat);
```
[12.278]
[12.278]
```
	change_decode_hunks(&binstat, hashed);
```

Replacement in change.c at line 606 [6.1047]

B:BD[11.2072] → [2.3345:3391]

		hashprint(&hashed.dependencies.entries[i]);

[11.2072]

[11.2119]

		hashprintln(&hashed.dependencies.entries[i]);

Replacement in change.c at line 610 [6.1047]

B:BD[11.2185] → [2.3440:3484]

		hashprint(&hashed.extraknown.entries[i]);

[11.2185]

[11.2231]

		hashprintln(&hashed.extraknown.entries[i]);

Replacement in atom.h at line 16 [3.5021]

B:BD[2.4340] → [2.4340:4401]

	Hash upcontext; /* FIXME Option<Hash> */
	Hash downcontext;

[2.4340]

[3.5342]

	uint8_t previous;
	uint8_t flag;
	Position from;
	Vertex to;
	Hash introducedby; /* FIXME Should be Option */
} Edge;
typedef struct {
	size_t len;
	Edge *entries;
} Edgelist;
typedef struct {
	Positionlist upcontext;
	Positionlist downcontext;

Replacement in atom.h at line 34 [3.5021]

B:BD[3.5446] → [3.5446:5530]

	/* FIXME inode: Position<Option<Hash>> = struct { change: Option<Hash>, pos:  } */

[3.5446]

[2.4402]

	Position inode;

Insertion in atom.h at line 38 [3.5021]
[2.4433]
[2.4433]
```
	Edgelist edges;
	Position inode;
```

change: Implement decoding of edits, atoms, positions, among others

Dependencies

In channels

Change contents

Replacement in vertex.h at line 7 [3.33]

Insertion in vertex.h at line 21 [3.33]

Insertion in vertex.h at line 24 [3.33]

Replacement in vertex.h at line 36 [3.33]

Insertion in hunk.h at line 6 [3.664]

Replacement in hunk.h at line 30 [3.664]

Replacement in hunk.h at line 47 [3.664]

Insertion in hunk.h at line 50 [3.664]

Insertion in hunk.h at line 56 [3.664]

Insertion in hunk.c at line 5 [3.1372]

Insertion in hunk.c at line 44 [3.1372]

Insertion in hash.h at line 19 [4.31]

Insertion in hash.c at line 11 [4.360]

Replacement in hash.c at line 29 [4.360]

Insertion in change.h at line 73 [6.80]

Insertion in change.c at line 15 [6.1047]

Deletion in change.c at line 21 [6.1047]

Replacement in change.c at line 22 [6.1047]

Replacement in change.c at line 155 [6.1047]

Replacement in change.c at line 169 [6.1047]

Replacement in change.c at line 182 [6.1047]

Deletion in change.c at line 185 [6.1047]

Replacement in change.c at line 186 [6.1047]

Insertion in change.c at line 196 [6.1047]

Replacement in change.c at line 216 [6.1047]

Insertion in change.c at line 219 [6.1047]

Replacement in change.c at line 224 [6.1047]

Deletion in change.c at line 234 [6.1047]

Replacement in change.c at line 236 [6.1047]

Replacement in change.c at line 239 [6.1047]

Replacement in change.c at line 241 [6.1047]

Replacement in change.c at line 272 [6.1047]

Replacement in change.c at line 286 [6.1047]

Replacement in change.c at line 296 [6.1047]

Replacement in change.c at line 299 [6.1047]

Replacement in change.c at line 318 [6.1047]

Replacement in change.c at line 324 [6.1047]

Insertion in change.c at line 334 [6.1047]

Deletion in change.c at line 337 [6.1047]

Insertion in change.c at line 340 [6.1047]

Replacement in change.c at line 366 [6.1047]

Insertion in change.c at line 373 [6.1047]

Replacement in change.c at line 376 [6.1047]

Replacement in change.c at line 380 [6.1047]

Replacement in change.c at line 382 [6.1047]

Replacement in change.c at line 398 [6.1047]

Deletion in change.c at line 401 [6.1047]

Replacement in change.c at line 407 [6.1047]

Deletion in change.c at line 449 [6.1047]

Replacement in change.c at line 501 [6.1047]

Deletion in change.c at line 505 [6.1047]

Replacement in change.c at line 506 [6.1047]

Replacement in change.c at line 606 [6.1047]

Replacement in change.c at line 610 [6.1047]

Replacement in atom.h at line 16 [3.5021]

Replacement in atom.h at line 34 [3.5021]

Insertion in atom.h at line 38 [3.5021]