Commit Graph

2444 Commits

Author SHA1 Message Date
ljedrz
34f5ab782a refactor: introduce a helper ConstraintSet object
Signed-off-by: ljedrz <ljedrz@gmail.com>
2021-03-11 13:40:15 +01:00
bors[bot]
c47ab84b1b
Merge #755
755: Bump reqwest from 0.11.1 to 0.11.2 r=collinc97 a=dependabot-preview[bot]

Bumps [reqwest](https://github.com/seanmonstar/reqwest) from 0.11.1 to 0.11.2.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/seanmonstar/reqwest/releases">reqwest's releases</a>.</em></p>
<blockquote>
<h2>v0.11.2</h2>
<ul>
<li>Add <code>CookieStore</code> trait to customize the type that stores and retrieves cookies for a session.</li>
<li>Add <code>cookie::Jar</code> as a default <code>CookieStore</code>, easing creating some session cookies before creating the <code>Client</code>.</li>
<li>Add <code>ClientBuilder::http2_adaptive_window()</code> option to configure an adaptive HTTP2 flow control behavior.</li>
<li>Add <code>ClientBuilder::http2_max_frame_size()</code> option to adjust the maximum HTTP2 frame size that can be received.</li>
<li>Implement <code>IntoUrl</code> for <code>String</code>, making it more convenient to create requests with <code>format!</code>.</li>
</ul>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/seanmonstar/reqwest/blob/master/CHANGELOG.md">reqwest's changelog</a>.</em></p>
<blockquote>
<h2>v0.11.2</h2>
<ul>
<li>Add <code>CookieStore</code> trait to customize the type that stores and retrieves cookies for a session.</li>
<li>Add <code>cookie::Jar</code> as a default <code>CookieStore</code>, easing creating some session cookies before creating the <code>Client</code>.</li>
<li>Add <code>ClientBuilder::http2_adaptive_window()</code> option to configure an adaptive HTTP2 flow control behavior.</li>
<li>Add <code>ClientBuilder::http2_max_frame_size()</code> option to adjust the maximum HTTP2 frame size that can be received.</li>
<li>Implement <code>IntoUrl</code> for <code>String</code>, making it more convenient to create requests with <code>format!</code>.</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="80999a8963"><code>80999a8</code></a> v0.11.2</li>
<li><a href="12d7905520"><code>12d7905</code></a> Add <code>CookieStore</code> trait and expose default <code>Jar</code> (<a href="https://github-redirect.dependabot.com/seanmonstar/reqwest/issues/1203">#1203</a>)</li>
<li><a href="2414042269"><code>2414042</code></a> replace match ... { } with matches! macro where possible (<a href="https://github-redirect.dependabot.com/seanmonstar/reqwest/issues/1208">#1208</a>)</li>
<li><a href="a856638316"><code>a856638</code></a> Check format to all rs files under src (<a href="https://github-redirect.dependabot.com/seanmonstar/reqwest/issues/1188">#1188</a>)</li>
<li><a href="9fa58e316d"><code>9fa58e3</code></a> Implement IntoUrl for String (<a href="https://github-redirect.dependabot.com/seanmonstar/reqwest/issues/1201">#1201</a>)</li>
<li><a href="ff2381e61e"><code>ff2381e</code></a> Add http2_adaptive_window and htt2_max_frame_size from hyper (<a href="https://github-redirect.dependabot.com/seanmonstar/reqwest/issues/1194">#1194</a>)</li>
<li><a href="6ac97dc3aa"><code>6ac97dc</code></a> Add minimal versions check for nightly CI job (<a href="https://github-redirect.dependabot.com/seanmonstar/reqwest/issues/1197">#1197</a>)</li>
<li><a href="61a955c821"><code>61a955c</code></a> Bump mime to current version (<a href="https://github-redirect.dependabot.com/seanmonstar/reqwest/issues/1196">#1196</a>)</li>
<li><a href="dabb878f32"><code>dabb878</code></a> update native-tls to v0.2.7 (<a href="https://github-redirect.dependabot.com/seanmonstar/reqwest/issues/1183">#1183</a>)</li>
<li>See full diff in <a href="https://github.com/seanmonstar/reqwest/compare/v0.11.1...v0.11.2">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=reqwest&package-manager=cargo&previous-version=0.11.1&new-version=0.11.2)](https://dependabot.com/compatibility-score/?dependency-name=reqwest&package-manager=cargo&previous-version=0.11.1&new-version=0.11.2)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
- `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language
- `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language
- `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language
- `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language
- `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme

Additionally, you can set the following in your Dependabot [dashboard](https://app.dependabot.com):
- Update frequency (including time of day and day of week)
- Pull request limits (per update run and/or open at any time)
- Out-of-range updates (receive only lockfile updates, if desired)
- Security updates (receive only security updates, if desired)



</details>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2021-03-10 21:16:05 +00:00
bors[bot]
9a62585c07
Merge #757
757: Readd executable parser r=collinc97 a=Protryon

To install the parser do: `$ cargo install --path . --example parser` within the `<leo repo>/parser` directory. Executable is called `parser`.

Co-authored-by: Protryon <max.bruce12@gmail.com>
2021-03-10 20:54:32 +00:00
gluax
476307fffc there could be more instances where expressions might need to be matched 2021-03-10 13:27:06 -05:00
Protryon
b28f8db4f5 flatten asg-passes 2021-03-10 09:57:27 -08:00
Protryon
823f113149 update asg version in constant-folding 2021-03-10 09:35:11 -08:00
Protryon
0f977707a9 fmt 2021-03-10 09:35:11 -08:00
Protryon
9156068801 constant folding 2021-03-10 09:35:11 -08:00
gluax
8e0ebd386a comment out replacing of self in circuit function input... not sure 2021-03-10 12:22:56 -05:00
gluax
9f126613d0 Self words replaced, still need to error for self/Self outside circuits 2021-03-10 12:11:54 -05:00
Protryon
4d6c44a021 readd executable parser 2021-03-10 04:23:46 -08:00
dependabot-preview[bot]
d0c7fa65c0
Bump reqwest from 0.11.1 to 0.11.2
Bumps [reqwest](https://github.com/seanmonstar/reqwest) from 0.11.1 to 0.11.2.
- [Release notes](https://github.com/seanmonstar/reqwest/releases)
- [Changelog](https://github.com/seanmonstar/reqwest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/seanmonstar/reqwest/compare/v0.11.1...v0.11.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-03-10 10:48:41 +00:00
Collin Chin
d4ed69830a
Merge pull request #754 from AleoHQ/fix/parser-benchmark
Fix parser benchmark
2021-03-09 19:04:06 -08:00
collin
eb15f247be fix parser benchmark 2021-03-09 16:18:47 -08:00
gluax
51c20ff07f fix some reducer bugs, still more to implement/make function better 2021-03-09 18:46:45 -05:00
gluax
78ae6f1f12 merge master 2021-03-09 16:13:43 -05:00
gluax
af5a708f8c reconstruction 2021-03-09 15:56:35 -05:00
Collin Chin
2e92538454
Merge pull request #741 from AleoHQ/dependabot/cargo/serde-1.0.124
Bump serde from 1.0.123 to 1.0.124
2021-03-08 19:03:50 -08:00
dependabot-preview[bot]
ddae016737
Bump serde from 1.0.123 to 1.0.124
Bumps [serde](https://github.com/serde-rs/serde) from 1.0.123 to 1.0.124.
- [Release notes](https://github.com/serde-rs/serde/releases)
- [Commits](https://github.com/serde-rs/serde/compare/v1.0.123...v1.0.124)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-03-09 02:27:22 +00:00
Collin Chin
ace4147db7
Merge pull request #744 from AleoHQ/dependabot/cargo/indexmap-1.6.2
Bump indexmap from 1.6.1 to 1.6.2
2021-03-08 18:25:51 -08:00
Collin Chin
110fbdd6a6
Merge pull request #692 from AleoHQ/console-assert-error
[CLI] Changes compiler error message for console.assert
2021-03-08 17:50:53 -08:00
collin
c8d1125ad9 Merge branch 'console-assert-error' of https://github.com/AleoHQ/leo into console-assert-error 2021-03-08 17:30:13 -08:00
collin
5ab289a922 cargo clippy 2021-03-08 17:28:57 -08:00
bors[bot]
ea69e0b4b6
Merge #743
743: Bump self_update from 0.25.0 to 0.26.0 r=collinc97 a=dependabot-preview[bot]

Bumps [self_update](https://github.com/jaemk/self_update) from 0.25.0 to 0.26.0.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/jaemk/self_update/blob/master/CHANGELOG.md">self_update's changelog</a>.</em></p>
<blockquote>
<h2>[0.26.0]</h2>
<h3>Added</h3>
<h3>Changed</h3>
<ul>
<li>Clean up dangling temporary directories on Windows.</li>
</ul>
<h3>Removed</h3>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li>See full diff in <a href="https://github.com/jaemk/self_update/commits">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=self_update&package-manager=cargo&previous-version=0.25.0&new-version=0.26.0)](https://dependabot.com/compatibility-score/?dependency-name=self_update&package-manager=cargo&previous-version=0.25.0&new-version=0.26.0)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
- `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language
- `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language
- `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language
- `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language
- `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme

Additionally, you can set the following in your Dependabot [dashboard](https://app.dependabot.com):
- Update frequency (including time of day and day of week)
- Pull request limits (per update run and/or open at any time)
- Out-of-range updates (receive only lockfile updates, if desired)
- Security updates (receive only security updates, if desired)



</details>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2021-03-09 01:05:09 +00:00
dependabot-preview[bot]
c764020b4e
Bump indexmap from 1.6.1 to 1.6.2
Bumps [indexmap](https://github.com/bluss/indexmap) from 1.6.1 to 1.6.2.
- [Release notes](https://github.com/bluss/indexmap/releases)
- [Commits](https://github.com/bluss/indexmap/compare/1.6.1...1.6.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-03-09 00:46:13 +00:00
bors[bot]
c2434919da
Merge #742
742: Bump num-bigint from 0.3.1 to 0.4.0 r=collinc97 a=dependabot-preview[bot]

Bumps [num-bigint](https://github.com/rust-num/num-bigint) from 0.3.1 to 0.4.0.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/rust-num/num-bigint/blob/master/RELEASES.md">num-bigint's changelog</a>.</em></p>
<blockquote>
<h1>Release 0.4.0 (2021-03-05)</h1>
<h3>Breaking Changes</h3>
<ul>
<li>Updated public dependences on <a href="https://github-redirect.dependabot.com/rust-num/num-bigint/pull/194">arbitrary, quickcheck</a>, and <a href="https://github-redirect.dependabot.com/rust-num/num-bigint/pull/185">rand</a>:
<ul>
<li><code>arbitrary</code> support has been updated to 1.0, requiring Rust 1.40.</li>
<li><code>quickcheck</code> support has been updated to 1.0, requiring Rust 1.46.</li>
<li><code>rand</code> support has been updated to 0.8, requiring Rust 1.36.</li>
</ul>
</li>
<li><a href="https://github-redirect.dependabot.com/rust-num/num-bigint/pull/195"><code>Debug</code> now shows plain numeric values for <code>BigInt</code> and <code>BigUint</code></a>,
rather than the raw list of internal digits.</li>
</ul>
<p><strong>Contributors</strong>: <a href="https://github.com/cuviper"><code>@cuviper</code></a>, <a href="https://github.com/Gelbpunkt"><code>@Gelbpunkt</code></a></p>
<h1>Release 0.3.2 (2021-03-04)</h1>
<ul>
<li><a href="https://github-redirect.dependabot.com/rust-num/num-bigint/pull/175">The new <code>BigUint</code> methods <code>count_ones</code> and <code>trailing_ones</code></a> return the
number of <code>1</code> bits in the entire value or just its least-significant tail,
respectively.</li>
<li><a href="https://github-redirect.dependabot.com/rust-num/num-bigint/pull/183">The new <code>BigInt</code> and <code>BigUint</code> methods <code>bit</code> and <code>set_bit</code></a> will read
and write individual bits of the value. For negative <code>BigInt</code>, bits are
determined as if they were in the two's complement representation.</li>
<li><a href="https://github-redirect.dependabot.com/rust-num/num-bigint/pull/187">The <code>from_radix_le</code> and <code>from_radix_be</code> methods</a> now accept empty
buffers to represent zero.</li>
<li><a href="https://github-redirect.dependabot.com/rust-num/num-bigint/pull/192"><code>BigInt</code> and <code>BigUint</code> can now iterate digits as <code>u32</code> or <code>u64</code></a>,
regardless of the actual internal digit size.</li>
</ul>
<p><strong>Contributors</strong>: <a href="https://github.com/BartMassey"><code>@BartMassey</code></a>, <a href="https://github.com/cuviper"><code>@cuviper</code></a>, <a href="https://github.com/janmarthedal"><code>@janmarthedal</code></a>, <a href="https://github.com/sebastianv89"><code>@sebastianv89</code></a>, <a href="https://github.com/Speedy37"><code>@Speedy37</code></a></p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="d1e4498cbc"><code>d1e4498</code></a> Merge <a href="https://github-redirect.dependabot.com/rust-num/num-bigint/issues/197">#197</a></li>
<li><a href="4b7c9d78c5"><code>4b7c9d7</code></a> Fix clippy::needless_range_loop</li>
<li><a href="a49c0acc48"><code>a49c0ac</code></a> Release 0.4.0</li>
<li><a href="7c40fded5d"><code>7c40fde</code></a> Merge <a href="https://github-redirect.dependabot.com/rust-num/num-bigint/issues/194">#194</a> <a href="https://github-redirect.dependabot.com/rust-num/num-bigint/issues/195">#195</a></li>
<li><a href="96cf255572"><code>96cf255</code></a> Update to arbitrary-1 and quickcheck-1</li>
<li><a href="60637c55c3"><code>60637c5</code></a> Merge <a href="https://github-redirect.dependabot.com/rust-num/num-bigint/issues/185">#185</a></li>
<li><a href="4247abe601"><code>4247abe</code></a> implement xorshift* for benchmarking</li>
<li><a href="998d4cb559"><code>998d4cb</code></a> seed tests with u64 for platform consistency</li>
<li><a href="46aa21283a"><code>46aa212</code></a> Bump to 0.4.0-pre</li>
<li><a href="63a89672f6"><code>63a8967</code></a> Update for rand's MSRV 1.36</li>
<li>Additional commits viewable in <a href="https://github.com/rust-num/num-bigint/compare/num-bigint-0.3.1...num-bigint-0.4.0">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=num-bigint&package-manager=cargo&previous-version=0.3.1&new-version=0.4.0)](https://dependabot.com/compatibility-score/?dependency-name=num-bigint&package-manager=cargo&previous-version=0.3.1&new-version=0.4.0)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
- `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language
- `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language
- `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language
- `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language
- `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme

Additionally, you can set the following in your Dependabot [dashboard](https://app.dependabot.com):
- Update frequency (including time of day and day of week)
- Pull request limits (per update run and/or open at any time)
- Out-of-range updates (receive only lockfile updates, if desired)
- Security updates (receive only security updates, if desired)



</details>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2021-03-09 00:22:13 +00:00
Collin Chin
a18b757ff4
Merge branch 'master' into console-assert-error 2021-03-08 16:20:46 -08:00
collin
64cc9fa9c9 remove unsafe unwrap 2021-03-08 16:18:24 -08:00
dependabot-preview[bot]
ab5da38aa0
Bump num-bigint from 0.3.1 to 0.4.0
Bumps [num-bigint](https://github.com/rust-num/num-bigint) from 0.3.1 to 0.4.0.
- [Release notes](https://github.com/rust-num/num-bigint/releases)
- [Changelog](https://github.com/rust-num/num-bigint/blob/master/RELEASES.md)
- [Commits](https://github.com/rust-num/num-bigint/compare/num-bigint-0.3.1...num-bigint-0.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-03-08 23:39:44 +00:00
Collin Chin
b0e3b6b22a
Merge pull request #707 from AleoHQ/tokenizer
Parser Rewrite
2021-03-08 15:38:04 -08:00
Protryon
a4f2101aaf remove if from ternary expression 2021-03-08 14:45:38 -08:00
dependabot-preview[bot]
2ffdd839af
Bump self_update from 0.25.0 to 0.26.0
Bumps [self_update](https://github.com/jaemk/self_update) from 0.25.0 to 0.26.0.
- [Release notes](https://github.com/jaemk/self_update/releases)
- [Changelog](https://github.com/jaemk/self_update/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jaemk/self_update/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-03-08 11:00:36 +00:00
howardwu
9252534122 Update README 2021-03-07 12:31:40 -08:00
Protryon
2a616eb13d absolute path for parser tests 2021-03-07 10:17:33 -08:00
Protryon
b60affc40b fix ci test 2021-03-07 07:20:08 -08:00
Protryon
a6bf66f864 fix tests 2021-03-07 06:48:02 -08:00
Protryon
1f49d8bc44 Merge branch 'tokenizer' of github.com:AleoHQ/leo into tokenizer 2021-03-07 06:27:57 -08:00
Protryon
f5187fc872 fix some failing tests 2021-03-07 06:27:42 -08:00
collin
7cc331f219 fix formatting error 2021-03-05 16:11:39 -08:00
collin
76afaf6167 add comments to parser tokenizer 2021-03-05 15:01:43 -08:00
collin
ef91489829 add comments to parser types 2021-03-05 14:43:27 -08:00
collin
7caf53bb31 add comments to parser statements 2021-03-05 14:38:40 -08:00
collin
01e2a13170 add comments to parser file 2021-03-05 14:26:59 -08:00
collin
4fada913fb add comments to parser expression 2021-03-05 14:09:14 -08:00
Protryon
f86e03f4b7 fix spans for comments 2021-03-05 09:53:06 -08:00
Protryon
d14a3a666b format 2021-03-05 09:23:38 -08:00
Protryon
e492950106 fix package names 2021-03-05 09:16:49 -08:00
collin
ed41a55c47 add comments to context 2021-03-04 16:47:41 -08:00
collin
d7d84c0ea7 fix test build issues. parser errors on dash + number names 2021-03-04 15:58:00 -08:00
collin
10ecc6e6e2 merge master and fix build issues 2021-03-04 14:11:17 -08:00