Skip to content

Commit a933595

Browse files
ArvolearArvolear
authored
Merge pull request #14 from distributed-lab/fix/grammar-typo
Update Grammar
2 parents 2b0ab23 + 00c9102 commit a933595

8 files changed

Lines changed: 37 additions & 37 deletions

File tree

‎circom-g4-grammar‎

‎package-lock.json‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@distributedlab/circom-parser",
33
"description": "Circom circuit parser built with ANTLR4",
4-
"version": "0.2.5",
4+
"version": "0.2.6",
55
"main": "dist/index.js",
66
"types": "dist/index.d.ts",
77
"files": [

‎src/generated/CircomParser.ts‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ export default class CircomParser extends Parser {
145145
public static readonly RULE_identifier = 35;
146146
public static readonly RULE_identifierList = 36;
147147
public static readonly RULE_simpleIdentifierList = 37;
148-
public static readonly RULE_idetifierAccess = 38;
148+
public static readonly RULE_identifierAccess = 38;
149149
public static readonly RULE_arrayDimension = 39;
150150
public static readonly RULE_identifierReferance = 40;
151151
public static readonly RULE_expressionOrString = 41;
@@ -338,7 +338,7 @@ export default class CircomParser extends Parser {
338338
"identifier",
339339
"identifierList",
340340
"simpleIdentifierList",
341-
"idetifierAccess",
341+
"identifierAccess",
342342
"arrayDimension",
343343
"identifierReferance",
344344
"expressionOrString",
@@ -2931,7 +2931,7 @@ export default class CircomParser extends Parser {
29312931
{
29322932
{
29332933
this.state = 568;
2934-
this.idetifierAccess();
2934+
this.identifierAccess();
29352935
}
29362936
}
29372937
}
@@ -3088,13 +3088,13 @@ export default class CircomParser extends Parser {
30883088
return localctx;
30893089
}
30903090
// @RuleVersion(0)
3091-
public idetifierAccess(): IdetifierAccessContext {
3092-
let localctx: IdetifierAccessContext = new IdetifierAccessContext(
3091+
public identifierAccess(): IdentifierAccessContext {
3092+
let localctx: IdentifierAccessContext = new IdentifierAccessContext(
30933093
this,
30943094
this._ctx,
30953095
this.state,
30963096
);
3097-
this.enterRule(localctx, 76, CircomParser.RULE_idetifierAccess);
3097+
this.enterRule(localctx, 76, CircomParser.RULE_identifierAccess);
30983098
try {
30993099
this.state = 602;
31003100
this._errHandler.sync(this);
@@ -6464,16 +6464,16 @@ export class IdentifierStatementContext extends ParserRuleContext {
64646464
public ID(): TerminalNode {
64656465
return this.getToken(CircomParser.ID, 0);
64666466
}
6467-
public idetifierAccess_list(): IdetifierAccessContext[] {
6467+
public identifierAccess_list(): IdentifierAccessContext[] {
64686468
return this.getTypedRuleContexts(
6469-
IdetifierAccessContext,
6470-
) as IdetifierAccessContext[];
6469+
IdentifierAccessContext,
6470+
) as IdentifierAccessContext[];
64716471
}
6472-
public idetifierAccess(i: number): IdetifierAccessContext {
6472+
public identifierAccess(i: number): IdentifierAccessContext {
64736473
return this.getTypedRuleContext(
6474-
IdetifierAccessContext,
6474+
IdentifierAccessContext,
64756475
i,
6476-
) as IdetifierAccessContext;
6476+
) as IdentifierAccessContext;
64776477
}
64786478
public get ruleIndex(): number {
64796479
return CircomParser.RULE_identifierStatement;
@@ -6632,7 +6632,7 @@ export class SimpleIdentifierListContext extends ParserRuleContext {
66326632
}
66336633
}
66346634

6635-
export class IdetifierAccessContext extends ParserRuleContext {
6635+
export class IdentifierAccessContext extends ParserRuleContext {
66366636
constructor(
66376637
parser?: CircomParser,
66386638
parent?: ParserRuleContext,
@@ -6654,22 +6654,22 @@ export class IdetifierAccessContext extends ParserRuleContext {
66546654
) as IdentifierReferanceContext;
66556655
}
66566656
public get ruleIndex(): number {
6657-
return CircomParser.RULE_idetifierAccess;
6657+
return CircomParser.RULE_identifierAccess;
66586658
}
66596659
public enterRule(listener: CircomParserListener): void {
6660-
if (listener.enterIdetifierAccess) {
6661-
listener.enterIdetifierAccess(this);
6660+
if (listener.enterIdentifierAccess) {
6661+
listener.enterIdentifierAccess(this);
66626662
}
66636663
}
66646664
public exitRule(listener: CircomParserListener): void {
6665-
if (listener.exitIdetifierAccess) {
6666-
listener.exitIdetifierAccess(this);
6665+
if (listener.exitIdentifierAccess) {
6666+
listener.exitIdentifierAccess(this);
66676667
}
66686668
}
66696669
// @Override
66706670
public accept<Result>(visitor: CircomParserVisitor<Result>): Result {
6671-
if (visitor.visitIdetifierAccess) {
6672-
return visitor.visitIdetifierAccess(this);
6671+
if (visitor.visitIdentifierAccess) {
6672+
return visitor.visitIdentifierAccess(this);
66736673
} else {
66746674
return visitor.visitChildren(this);
66756675
}

‎src/generated/CircomParserListener.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ import { IdentifierStatementContext } from "./CircomParser";
6565
import { IdentifierContext } from "./CircomParser";
6666
import { IdentifierListContext } from "./CircomParser";
6767
import { SimpleIdentifierListContext } from "./CircomParser";
68-
import { IdetifierAccessContext } from "./CircomParser";
68+
import { IdentifierAccessContext } from "./CircomParser";
6969
import { ArrayDimensionContext } from "./CircomParser";
7070
import { IdentifierReferanceContext } from "./CircomParser";
7171
import { ExpressionOrStringContext } from "./CircomParser";
@@ -797,15 +797,15 @@ export default class CircomParserListener extends ParseTreeListener {
797797
*/
798798
exitSimpleIdentifierList?: (ctx: SimpleIdentifierListContext) => void;
799799
/**
800-
* Enter a parse tree produced by `CircomParser.idetifierAccess`.
800+
* Enter a parse tree produced by `CircomParser.identifierAccess`.
801801
* @param ctx the parse tree
802802
*/
803-
enterIdetifierAccess?: (ctx: IdetifierAccessContext) => void;
803+
enterIdentifierAccess?: (ctx: IdentifierAccessContext) => void;
804804
/**
805-
* Exit a parse tree produced by `CircomParser.idetifierAccess`.
805+
* Exit a parse tree produced by `CircomParser.identifierAccess`.
806806
* @param ctx the parse tree
807807
*/
808-
exitIdetifierAccess?: (ctx: IdetifierAccessContext) => void;
808+
exitIdentifierAccess?: (ctx: IdentifierAccessContext) => void;
809809
/**
810810
* Enter a parse tree produced by `CircomParser.arrayDimension`.
811811
* @param ctx the parse tree

‎src/generated/CircomParserVisitor.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ import { IdentifierStatementContext } from "./CircomParser";
6565
import { IdentifierContext } from "./CircomParser";
6666
import { IdentifierListContext } from "./CircomParser";
6767
import { SimpleIdentifierListContext } from "./CircomParser";
68-
import { IdetifierAccessContext } from "./CircomParser";
68+
import { IdentifierAccessContext } from "./CircomParser";
6969
import { ArrayDimensionContext } from "./CircomParser";
7070
import { IdentifierReferanceContext } from "./CircomParser";
7171
import { ExpressionOrStringContext } from "./CircomParser";
@@ -512,11 +512,11 @@ export default class CircomParserVisitor<
512512
*/
513513
visitSimpleIdentifierList?: (ctx: SimpleIdentifierListContext) => Result;
514514
/**
515-
* Visit a parse tree produced by `CircomParser.idetifierAccess`.
515+
* Visit a parse tree produced by `CircomParser.identifierAccess`.
516516
* @param ctx the parse tree
517517
* @return the visitor result
518518
*/
519-
visitIdetifierAccess?: (ctx: IdetifierAccessContext) => Result;
519+
visitIdentifierAccess?: (ctx: IdentifierAccessContext) => Result;
520520
/**
521521
* Visit a parse tree produced by `CircomParser.arrayDimension`.
522522
* @param ctx the parse tree

‎src/utils/ExpressionHelper.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ class ExpressionVisitor extends ExtendedCircomVisitor<CircomValueType | null> {
120120
visitPIdentifierStatement = (
121121
ctx: PIdentifierStatementContext,
122122
): CircomValueType | null => {
123-
if (ctx.identifierStatement().idetifierAccess_list().length == 0) {
123+
if (ctx.identifierStatement().identifierAccess_list().length == 0) {
124124
const variableValue =
125125
this.variableContext[ctx.identifierStatement().ID().getText()];
126126

@@ -138,7 +138,7 @@ class ExpressionVisitor extends ExtendedCircomVisitor<CircomValueType | null> {
138138

139139
const reference = ctx
140140
.identifierStatement()
141-
.idetifierAccess_list()
141+
.identifierAccess_list()
142142
.map((access) => access.getText())
143143
.join("");
144144

‎test/mocks/CircomTemplateInputsVisitor.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ export class CircomTemplateInputsVisitor extends CircomVisitor<void> {
333333

334334
const identifierStatement = primaryExpression.identifierStatement();
335335

336-
if (identifierStatement.idetifierAccess_list().length > 0) {
336+
if (identifierStatement.identifierAccess_list().length > 0) {
337337
this.errors.push({
338338
type: ErrorType.ComplexAccessNotSupported,
339339
context: ctx,
@@ -384,7 +384,7 @@ export class CircomTemplateInputsVisitor extends CircomVisitor<void> {
384384
) => {
385385
const identifierStatement = ctx.identifierStatement();
386386

387-
if (identifierStatement.idetifierAccess_list().length > 0) {
387+
if (identifierStatement.identifierAccess_list().length > 0) {
388388
this.errors.push({
389389
type: ErrorType.ComplexAccessNotSupported,
390390
context: ctx,
@@ -518,7 +518,7 @@ export class CircomTemplateInputsVisitor extends CircomVisitor<void> {
518518
visitSubsIcnDecOperation = (ctx: SubsIcnDecOperationContext) => {
519519
const identifierStatement = ctx.identifierStatement();
520520

521-
if (identifierStatement.idetifierAccess_list().length > 0) {
521+
if (identifierStatement.identifierAccess_list().length > 0) {
522522
this.errors.push({
523523
type: ErrorType.ComplexAccessNotSupported,
524524
context: ctx,

0 commit comments

Comments
 (0)