Skip to content

Commit 8651e5b

Browse files
add byte alias
1 parent a9ee744 commit 8651e5b

12 files changed

Lines changed: 274 additions & 268 deletions

examples/locktime.cash

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
pragma cashscript ^0.6.0;
1+
pragma cashscript ^0.6.4;
22

33
// This is an experimental contract for a more "streaming" Mecenas experience
44
// Completely untested, just a concept
55
contract Mecenas(bytes4 initialBlock, int pledgePerBlock, bytes20 recipient, bytes20 funder) {
66
function receive(pubkey pk, sig s, int pledge) {
77
require(checkSig(s, pk));
8+
int m = date('asdasda');
89

910
int initial = int(initialBlock);
1011
require(tx.time >= initial);

examples/p2pkh.cash

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ pragma cashscript ^0.6.0;
22

33
contract P2PKH(bytes20 pkh) {
44
function spend(pubkey pk, sig s) {
5+
byte m = 0x01;
56
require(checkSig(s, pk));
67
require(hash160(pk) == pkh);
7-
require(hash160(pk) == pk);
8-
require(1 days == 24 hours);
8+
require(int(m) == 2);
99
}
1010
}

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@
9696
},
9797
"dependencies": {
9898
"antlr4ts": "^0.5.0-alpha.4",
99-
"cashc": "^0.6.3",
100-
"cashscript": "^0.6.3",
99+
"cashc": "0.6.4",
100+
"cashscript": "^0.6.4",
101101
"vscode-languageclient": "^7.0.0",
102102
"vscode-languageserver": "^7.0.0",
103103
"vscode-languageserver-textdocument": "^1.0.1"

src/CashscriptCompletionProvider.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ export default class CashscriptCompletionProvider implements vscode.CompletionIt
6969

7070
protected getVarCompletions():CompletionItem[]{
7171

72-
const re = /(int|bool|string|pubkey|sig|datasig|bytes|bytes[0-9]+)\s+(\w+)/g;
72+
const re = /(int|bool|string|pubkey|sig|datasig|byte|bytes|bytes[0-9]+)\s+(\w+)/g;
7373
const completions:CompletionItem[] = [];
7474
for(const m of this.text.matchAll(re)){
7575
completions.push({
@@ -199,7 +199,7 @@ export default class CashscriptCompletionProvider implements vscode.CompletionIt
199199
}
200200

201201
protected getTypesCompletions():CompletionItem[]{
202-
const words = ["int", "bool", "string", "bytes", "pubkey", "sig", "datasig", "true", "false", "date"]
202+
const words = ["int", "bool", "string", "byte", "bytes", "pubkey", "sig", "datasig", "true", "false", "date"]
203203
const completions = [];
204204
for (let i = 0; i < words.length; i++) {
205205
this.currentIndex += 1;

src/CashscriptHoverProvider.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ class CashscriptHoverProvider implements vscode.HoverProvider{
7878
*/
7979
getVariableType(variable:string, document:vscode.TextDocument){
8080
const text = document.getText();
81-
const matches = text.match(new RegExp(`\\b(int|bool|string|pubkey|sig|datasig|bytes\\d*)\\s+${variable}\\b`)); //regex still incomplete
81+
const matches = text.match(new RegExp(`\\b(int|bool|string|pubkey|sig|datasig|byte|bytes\\d*)\\s+${variable}\\b`)); //regex still incomplete
8282
if(!matches) return null;
8383
return matches[1];
8484
}

src/CashscriptLinter/grammar/CashScript.g4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ NumberLiteral
142142
;
143143

144144
Bytes
145-
: 'bytes' Bound?
145+
: 'bytes' Bound? | 'byte'
146146
;
147147

148148
Bound

src/CashscriptLinter/grammar/CashScriptLexer.interp

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

src/CashscriptLinter/grammar/CashScriptLexer.ts

Lines changed: 259 additions & 254 deletions
Large diffs are not rendered by default.

src/CashscriptLinter/grammar/CashScriptListener.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Generated from grammar/CashScript.g4 by ANTLR 4.9.0-SNAPSHOT
1+
// Generated from src/grammar/CashScript.g4 by ANTLR 4.9.0-SNAPSHOT
22

33

44
import { ParseTreeListener } from "antlr4ts/tree/ParseTreeListener";

src/CashscriptLinter/grammar/CashScriptParser.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Generated from grammar/CashScript.g4 by ANTLR 4.9.0-SNAPSHOT
1+
// Generated from src/grammar/CashScript.g4 by ANTLR 4.9.0-SNAPSHOT
22

33

44
import { ATN } from "antlr4ts/atn/ATN";

0 commit comments

Comments
 (0)