Skip to content

Commit 90c6bd0

Browse files
kshitijckshitijc
authored
Update antlr4-python3-runtime to 4.9.2 (#51)
Update `antlr4-python3-runtime` to `v4.9.2`, and include generated grammar files.
1 parent 5a0f0fb commit 90c6bd0

22 files changed

+3531
-1213
lines changed

‎.github/CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
<h3>New features since last release</h3>
44

5+
* Rebuilds the grammar using ANTLR `v4.9.2`
6+
[(#51)](https://github.com/XanaduAI/blackbird/pull/51)
7+
58
<h3>Improvements</h3>
69

710
<h3>Breaking changes</h3>

‎.readthedocs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ build:
44
image: latest
55

66
python:
7-
version: 3.6
7+
version: 3.8
88

99
# Don't build any extra formats
1010
formats:
11-
- none
11+
- none

‎blackbird_cpp/blackbird.interp

Lines changed: 60 additions & 7 deletions
Large diffs are not rendered by default.

‎blackbird_cpp/blackbird.tokens

Lines changed: 95 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -4,65 +4,104 @@ TIMES=3
44
DIVIDE=4
55
PWR=5
66
ASSIGN=6
7-
INT=7
8-
FLOAT=8
9-
COMPLEX=9
10-
STR=10
11-
BOOL=11
12-
SEQUENCE=12
13-
PI=13
14-
NEWLINE=14
15-
TAB=15
16-
SPACE=16
17-
WITH=17
18-
SQRT=18
19-
SIN=19
20-
COS=20
21-
EXP=21
22-
PERIOD=22
23-
COMMA=23
24-
COLON=24
25-
QUOTE=25
26-
LBRAC=26
27-
RBRAC=27
28-
LSQBRAC=28
29-
RSQBRAC=29
30-
APPLY=30
31-
TYPE_ARRAY=31
32-
TYPE_FLOAT=32
33-
TYPE_COMPLEX=33
34-
TYPE_INT=34
35-
TYPE_STR=35
36-
TYPE_BOOL=36
37-
MEASURE=37
38-
NAME=38
39-
DEVICE=39
40-
COMMENT=40
41-
ANY=41
7+
FOR=7
8+
IN=8
9+
INT=9
10+
FLOAT=10
11+
COMPLEX=11
12+
STR=12
13+
BOOL=13
14+
SEQUENCE=14
15+
PI=15
16+
NEWLINE=16
17+
TAB=17
18+
SPACE=18
19+
PROGNAME=19
20+
VERSION=20
21+
TARGET=21
22+
PROGTYPE=22
23+
INCLUDE=23
24+
SQRT=24
25+
SIN=25
26+
COS=26
27+
TAN=27
28+
ARCSIN=28
29+
ARCCOS=29
30+
ARCTAN=30
31+
SINH=31
32+
COSH=32
33+
TANH=33
34+
ARCSINH=34
35+
ARCCOSH=35
36+
ARCTANH=36
37+
EXP=37
38+
LOG=38
39+
PERIOD=39
40+
COMMA=40
41+
COLON=41
42+
QUOTE=42
43+
LBRAC=43
44+
RBRAC=44
45+
LSQBRAC=45
46+
RSQBRAC=46
47+
LBRACE=47
48+
RBRACE=48
49+
APPLY=49
50+
TYPE_ARRAY=50
51+
TYPE_FLOAT=51
52+
TYPE_COMPLEX=52
53+
TYPE_INT=53
54+
TYPE_STR=54
55+
TYPE_BOOL=55
56+
REGREF=56
57+
MEASURE=57
58+
NAME=58
59+
DEVICE=59
60+
COMMENT=60
61+
ANY=61
4262
'+'=1
4363
'-'=2
4464
'*'=3
4565
'/'=4
4666
'**'=5
4767
'='=6
48-
'pi'=13
49-
'with'=17
50-
'sqrt'=18
51-
'sin'=19
52-
'cos'=20
53-
'exp'=21
54-
'.'=22
55-
','=23
56-
':'=24
57-
'"'=25
58-
'('=26
59-
')'=27
60-
'['=28
61-
']'=29
62-
'|'=30
63-
'array'=31
64-
'float'=32
65-
'complex'=33
66-
'int'=34
67-
'str'=35
68-
'bool'=36
68+
'for'=7
69+
'in'=8
70+
'pi'=15
71+
'name'=19
72+
'version'=20
73+
'target'=21
74+
'type'=22
75+
'include'=23
76+
'sqrt'=24
77+
'sin'=25
78+
'cos'=26
79+
'tan'=27
80+
'arcsin'=28
81+
'arccos'=29
82+
'arctan'=30
83+
'sinh'=31
84+
'cosh'=32
85+
'tanh'=33
86+
'arcsinh'=34
87+
'arccosh'=35
88+
'arctanh'=36
89+
'exp'=37
90+
'log'=38
91+
'.'=39
92+
','=40
93+
':'=41
94+
'"'=42
95+
'('=43
96+
')'=44
97+
'['=45
98+
']'=46
99+
'{'=47
100+
'}'=48
101+
'|'=49
102+
'array'=50
103+
'float'=51
104+
'complex'=52
105+
'int'=53
106+
'str'=54
107+
'bool'=55

‎blackbird_cpp/blackbirdBaseVisitor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
// Generated from blackbird.g4 by ANTLR 4.7.1
2+
// Generated from blackbird.g4 by ANTLR 4.9.2
33

44

55
#include "blackbirdBaseVisitor.h"

‎blackbird_cpp/blackbirdBaseVisitor.h

Lines changed: 70 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
// Generated from blackbird.g4 by ANTLR 4.7.1
2+
// Generated from blackbird.g4 by ANTLR 4.9.2
33

44
#pragma once
55

@@ -19,7 +19,47 @@ class blackbirdBaseVisitor : public blackbirdVisitor {
1919
return visitChildren(ctx);
2020
}
2121

22-
virtual antlrcpp::Any visitVarblock(blackbirdParser::VarblockContext *ctx) override {
22+
virtual antlrcpp::Any visitMetadatablock(blackbirdParser::MetadatablockContext *ctx) override {
23+
return visitChildren(ctx);
24+
}
25+
26+
virtual antlrcpp::Any visitDeclarename(blackbirdParser::DeclarenameContext *ctx) override {
27+
return visitChildren(ctx);
28+
}
29+
30+
virtual antlrcpp::Any visitProgramname(blackbirdParser::ProgramnameContext *ctx) override {
31+
return visitChildren(ctx);
32+
}
33+
34+
virtual antlrcpp::Any visitVersion(blackbirdParser::VersionContext *ctx) override {
35+
return visitChildren(ctx);
36+
}
37+
38+
virtual antlrcpp::Any visitVersionnumber(blackbirdParser::VersionnumberContext *ctx) override {
39+
return visitChildren(ctx);
40+
}
41+
42+
virtual antlrcpp::Any visitTarget(blackbirdParser::TargetContext *ctx) override {
43+
return visitChildren(ctx);
44+
}
45+
46+
virtual antlrcpp::Any visitDevice(blackbirdParser::DeviceContext *ctx) override {
47+
return visitChildren(ctx);
48+
}
49+
50+
virtual antlrcpp::Any visitDeclaretype(blackbirdParser::DeclaretypeContext *ctx) override {
51+
return visitChildren(ctx);
52+
}
53+
54+
virtual antlrcpp::Any visitProgramtype(blackbirdParser::ProgramtypeContext *ctx) override {
55+
return visitChildren(ctx);
56+
}
57+
58+
virtual antlrcpp::Any visitInclude(blackbirdParser::IncludeContext *ctx) override {
59+
return visitChildren(ctx);
60+
}
61+
62+
virtual antlrcpp::Any visitProgram(blackbirdParser::ProgramContext *ctx) override {
2363
return visitChildren(ctx);
2464
}
2565

@@ -35,31 +75,31 @@ class blackbirdBaseVisitor : public blackbirdVisitor {
3575
return visitChildren(ctx);
3676
}
3777

38-
virtual antlrcpp::Any visitVartype(blackbirdParser::VartypeContext *ctx) override {
78+
virtual antlrcpp::Any visitInvalid(blackbirdParser::InvalidContext *ctx) override {
3979
return visitChildren(ctx);
4080
}
4181

42-
virtual antlrcpp::Any visitNonnumeric(blackbirdParser::NonnumericContext *ctx) override {
82+
virtual antlrcpp::Any visitReserved(blackbirdParser::ReservedContext *ctx) override {
4383
return visitChildren(ctx);
4484
}
4585

46-
virtual antlrcpp::Any visitShape(blackbirdParser::ShapeContext *ctx) override {
86+
virtual antlrcpp::Any visitVartype(blackbirdParser::VartypeContext *ctx) override {
4787
return visitChildren(ctx);
4888
}
4989

50-
virtual antlrcpp::Any visitArrayval(blackbirdParser::ArrayvalContext *ctx) override {
90+
virtual antlrcpp::Any visitNonnumeric(blackbirdParser::NonnumericContext *ctx) override {
5191
return visitChildren(ctx);
5292
}
5393

54-
virtual antlrcpp::Any visitArrayrow(blackbirdParser::ArrayrowContext *ctx) override {
94+
virtual antlrcpp::Any visitShape(blackbirdParser::ShapeContext *ctx) override {
5595
return visitChildren(ctx);
5696
}
5797

58-
virtual antlrcpp::Any visitProgram(blackbirdParser::ProgramContext *ctx) override {
98+
virtual antlrcpp::Any visitArrayval(blackbirdParser::ArrayvalContext *ctx) override {
5999
return visitChildren(ctx);
60100
}
61101

62-
virtual antlrcpp::Any visitDevice(blackbirdParser::DeviceContext *ctx) override {
102+
virtual antlrcpp::Any visitArrayrow(blackbirdParser::ArrayrowContext *ctx) override {
63103
return visitChildren(ctx);
64104
}
65105

@@ -75,6 +115,10 @@ class blackbirdBaseVisitor : public blackbirdVisitor {
75115
return visitChildren(ctx);
76116
}
77117

118+
virtual antlrcpp::Any visitForloop(blackbirdParser::ForloopContext *ctx) override {
119+
return visitChildren(ctx);
120+
}
121+
78122
virtual antlrcpp::Any visitArguments(blackbirdParser::ArgumentsContext *ctx) override {
79123
return visitChildren(ctx);
80124
}
@@ -87,7 +131,15 @@ class blackbirdBaseVisitor : public blackbirdVisitor {
87131
return visitChildren(ctx);
88132
}
89133

90-
virtual antlrcpp::Any visitModes(blackbirdParser::ModesContext *ctx) override {
134+
virtual antlrcpp::Any visitVallist(blackbirdParser::VallistContext *ctx) override {
135+
return visitChildren(ctx);
136+
}
137+
138+
virtual antlrcpp::Any visitRangeval(blackbirdParser::RangevalContext *ctx) override {
139+
return visitChildren(ctx);
140+
}
141+
142+
virtual antlrcpp::Any visitParameterLabel(blackbirdParser::ParameterLabelContext *ctx) override {
91143
return visitChildren(ctx);
92144
}
93145

@@ -111,6 +163,10 @@ class blackbirdBaseVisitor : public blackbirdVisitor {
111163
return visitChildren(ctx);
112164
}
113165

166+
virtual antlrcpp::Any visitArrayIdxLabel(blackbirdParser::ArrayIdxLabelContext *ctx) override {
167+
return visitChildren(ctx);
168+
}
169+
114170
virtual antlrcpp::Any visitMulLabel(blackbirdParser::MulLabelContext *ctx) override {
115171
return visitChildren(ctx);
116172
}
@@ -123,6 +179,10 @@ class blackbirdBaseVisitor : public blackbirdVisitor {
123179
return visitChildren(ctx);
124180
}
125181

182+
virtual antlrcpp::Any visitParameter(blackbirdParser::ParameterContext *ctx) override {
183+
return visitChildren(ctx);
184+
}
185+
126186
virtual antlrcpp::Any visitNumber(blackbirdParser::NumberContext *ctx) override {
127187
return visitChildren(ctx);
128188
}

0 commit comments

Comments
 (0)