Skip to content

Commit a77d873

Browse files
committed
Protonet fixes and docs
1 parent 2e7db49 commit a77d873

File tree

3 files changed

+36
-5
lines changed

3 files changed

+36
-5
lines changed

convex-cli/GENESIS.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,26 @@ alias convex="java -jar ~/convex.jar"
4040
### Upload keystore
4141

4242

43+
44+
45+
### Managing with screen
46+
47+
Start screen session
48+
49+
```
50+
screen
51+
```
52+
53+
Run peer
54+
55+
```
56+
convex peer start
57+
```
58+
59+
Detach with Ctrl-a + Ctrl-d
60+
61+
Back to screen with:
62+
63+
```
64+
screen -r
65+
```

convex-core/src/main/java/convex/core/cvm/ops/Invoke.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,11 @@ public Context execute(Context context) {
102102
// Specific check for an error so we can add stack trace info
103103
if (ctx.isError()) {
104104
// getError()must be non-null at this point
105-
106-
ctx.getError().addTrace("In expression: "+RT.print(this));
105+
try {
106+
ctx.getError().addTrace("In expression: "+RT.print(this));
107+
} catch (Exception e) {
108+
ctx.getError().addTrace("TRACE FAILED");
109+
}
107110
}
108111

109112
return ctx;

convex-core/src/main/java/convex/core/lang/impl/MultiFn.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,15 @@ public boolean printInternal(BlobBuilder bb, long limit) {
5353
AVector<AClosure<T>> fns=getFunctions();
5454
for (long i=0; i<num; i++) {
5555
if (i>0) bb.append(' ');
56-
bb.append('(');
5756
AClosure<?> fn=Fn.ensureFunction(fns.get(i));
58-
if (!fn.printInternal(bb,limit)) return false;;
59-
bb.append(')');
57+
if (fn==null) {
58+
bb.append("nil");
59+
if (!bb.check(limit)) return false;
60+
} else {
61+
bb.append('(');
62+
if (!fn.printInternal(bb,limit)) return false;
63+
bb.append(')');
64+
}
6065
}
6166
return bb.check(limit);
6267
}

0 commit comments

Comments
 (0)